[arch-commits] Commit in tftp-hpa/repos (5 files)

[Tobias Powalowski]

    Date: Sunday, March 1, 2009 @ 16:32:28
  Author: tpowa
Revision: 28699

Merged revisions 28698 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/tftp-hpa/trunk

........
  r28698 | tpowa | 2009-03-01 22:31:51 +0100 (So, 01 M?\195?\164r 2009) | 1 line
  
  upgpkg: tftp-hpa 5.0-1
........

Added:
  tftp-hpa/repos/extra-x86_64/tftpd.conf
    (from rev 28698, tftp-hpa/trunk/tftpd.conf)
  tftp-hpa/repos/extra-x86_64/tftpd.rc
    (from rev 28698, tftp-hpa/trunk/tftpd.rc)
Modified:
  tftp-hpa/repos/extra-x86_64/	(properties)
  tftp-hpa/repos/extra-x86_64/PKGBUILD
Deleted:
  tftp-hpa/repos/extra-x86_64/tftpd

------------+
 PKGBUILD   |   14 ++++++++------
 tftpd      |   35 -----------------------------------
 tftpd.conf |    4 ++++
 tftpd.rc   |   38 ++++++++++++++++++++++++++++++++++++++
 4 files changed, 50 insertions(+), 41 deletions(-)


Property changes on: tftp-hpa/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /tftp-hpa/trunk:1-26950
   + /tftp-hpa/trunk:1-28698

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-03-01 21:31:51 UTC (rev 28698)
+++ extra-x86_64/PKGBUILD	2009-03-01 21:32:28 UTC (rev 28699)
@@ -2,16 +2,14 @@
 # Maintainer: dorphell <dorphell at archlinux.org>
 # Contributor: Jose Javier  <jojapa at terra.es>
 pkgname=tftp-hpa
-pkgver=0.49
+pkgver=5.0
 pkgrel=1
 pkgdesc="official tftp server"
 arch=('i686' 'x86_64')
-depends=('tcp_wrappers')
+depends=('tcp_wrappers' 'termcap-compat')
 conflicts=('netkit-tftp')
-source=(http://www.kernel.org/pub/software/network/tftp/$pkgname-$pkgver.tar.gz tftpd)
+source=(http://www.kernel.org/pub/software/network/tftp/$pkgname-$pkgver.tar.gz tftpd.rc tftpd.conf)
 url="http://www.kernel.org/pub/software/network/tftp/"
-md5sums=('321d27e46c3a2795cf7b033c56fbf657'
-         '9b9919cdd8ef3bccb3c3f3531054a6ed')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -20,6 +18,10 @@
   make INSTALLROOT="${pkgdir}" install || return 1
   install -d "${pkgdir}/etc/rc.d"
   install -d "${pkgdir}/var/tftpboot"
-  install -m755 "${srcdir}/tftpd" "${pkgdir}/etc/rc.d/" || return 1
+  install -m755 "${srcdir}/tftpd.rc" "${pkgdir}/etc/rc.d/tftpd" || return 1
+  install -D -m644 "${srcdir}/tftpd.conf" "${pkgdir}/etc/conf.d/tftpd" || return 1
   rm "${pkgdir}/usr/share/man/man8/tftpd.8"
 }
+md5sums=('1ae813a94670f0d8c294aafa9f5ecf65'
+         'a974d02526f19222146c8e3d3b598871'
+         '414a79dc891bced056d99a9bb790fc9e')

Deleted: extra-x86_64/tftpd
===================================================================
--- extra-x86_64/tftpd	2009-03-01 21:31:51 UTC (rev 28698)
+++ extra-x86_64/tftpd	2009-03-01 21:32:28 UTC (rev 28699)
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/in.tftpd`
-case "$1" in
-  start)
-    stat_busy "Starting TFTPD"
-    [ -z "$PID" ] && /usr/sbin/in.tftpd -l -s /var/tftpboot
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon in.tftpd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping TFTPD"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon in.tftpd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0

Copied: tftp-hpa/repos/extra-x86_64/tftpd.conf (from rev 28698, tftp-hpa/trunk/tftpd.conf)
===================================================================
--- extra-x86_64/tftpd.conf	                        (rev 0)
+++ extra-x86_64/tftpd.conf	2009-03-01 21:32:28 UTC (rev 28699)
@@ -0,0 +1,4 @@
+#
+# Parameters to be passed to TFTPD
+#
+TFTPD_ARGS="-l -s /var/tftpboot" 

Copied: tftp-hpa/repos/extra-x86_64/tftpd.rc (from rev 28698, tftp-hpa/trunk/tftpd.rc)
===================================================================
--- extra-x86_64/tftpd.rc	                        (rev 0)
+++ extra-x86_64/tftpd.rc	2009-03-01 21:32:28 UTC (rev 28699)
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+TFTPD_ARGS=
+[ -f /etc/conf.d/tftpd ] && . /etc/conf.d/tftpd
+
+PID=$(pidof -o %PPID /usr/sbin/in.tftpd)
+case "$1" in
+  start)
+    stat_busy "Starting TFTPD"
+    [ -z "$PID" ] && /usr/sbin/in.tftpd ${TFTPD_ARGS}
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      add_daemon in.tftpd
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping TFTPD"
+    [ ! -z "$PID" ]  && kill $PID &> /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm_daemon in.tftpd
+      stat_done
+    fi
+    ;;
+  restart)
+    $0 stop
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"  
+esac
+exit 0