[arch-commits] Commit in tftp-hpa/trunk (PKGBUILD tftpd.conf tftpd.rc tftpd.service)

[Eric Bélanger]

    Date: Friday, May 31, 2013 @ 07:41:30
  Author: eric
Revision: 186769

upgpkg: tftp-hpa 5.2-4

Move files to /usr/bin, Remove initscripts daemon

Modified:
  tftp-hpa/trunk/PKGBUILD
  tftp-hpa/trunk/tftpd.service
Deleted:
  tftp-hpa/trunk/tftpd.conf
  tftp-hpa/trunk/tftpd.rc

---------------+
 PKGBUILD      |   24 ++++++++++--------------
 tftpd.conf    |    4 ----
 tftpd.rc      |   38 --------------------------------------
 tftpd.service |    2 +-
 4 files changed, 11 insertions(+), 57 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-31 05:28:19 UTC (rev 186768)
+++ PKGBUILD	2013-05-31 05:41:30 UTC (rev 186769)
@@ -3,44 +3,40 @@
 # Contributor: Jose Javier  <jojapa at terra.es>
 pkgname=tftp-hpa
 pkgver=5.2
-pkgrel=3
+pkgrel=4
 pkgdesc="Official tftp server"
 arch=('i686' 'x86_64')
 url="http://www.kernel.org/pub/software/network/tftp/tftp-hpa/"
 license=('BSD')
 depends=('readline>=6.0.00')
 conflicts=('netkit-tftp')
-backup=('etc/conf.d/tftpd')
 source=(http://www.kernel.org/pub/software/network/tftp/tftp-hpa/$pkgname-$pkgver.tar.gz 
-       tftpd.rc 
-       tftpd.conf 
        LICENSE
        tftpd.service
        tftpd.socket
        tftp-hpa-0.49-fortify-strcpy-crash.patch)
 md5sums=('3de3038e7c2bf6fc5d496825893ac8e7'
-         '83fbb6f52205d95951a3c059e5351ca2'
-         'f41f484f94e91175e9183e872a2bff3b'
          '6ce21e27b6fdc1a1adf85c81e42aeecf'
-         '165b98f814f74568635a720e674d7f18'
+         'ffeac33192eac4c526657b6789cace21'
          'a23369ea33be8b4a5427ec2cfc5373dd'
          '22e8629ef19bc276a102c5d4d284c1bd')
 
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+prepare() {
+  cd ${pkgname}-${pkgver}
   # fix #28103
   patch -Np1 -i ../tftp-hpa-0.49-fortify-strcpy-crash.patch
-  ./configure --prefix=/usr --mandir=/usr/share/man --without-tcpwrappers 
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  ./configure --prefix=/usr --mandir=/usr/share/man --sbindir=/usr/bin --without-tcpwrappers 
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}" 
+  cd ${pkgname}-${pkgver}
   make INSTALLROOT="${pkgdir}" install
-  install -d "${pkgdir}/etc/rc.d"
   install -d "${pkgdir}/srv/tftp"
-  install -m755 "${srcdir}/tftpd.rc" "${pkgdir}/etc/rc.d/tftpd"
-  install -D -m644 "${srcdir}/tftpd.conf" "${pkgdir}/etc/conf.d/tftpd"
   install -D -m655 "${srcdir}/tftpd.service" "${pkgdir}/usr/lib/systemd/system/tftpd.service"
   install -D -m655 "${srcdir}/tftpd.socket" "${pkgdir}/usr/lib/systemd/system/tftpd.socket"
   install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"

Deleted: tftpd.conf
===================================================================
--- tftpd.conf	2013-05-31 05:28:19 UTC (rev 186768)
+++ tftpd.conf	2013-05-31 05:41:30 UTC (rev 186769)
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to TFTPD
-#
-TFTPD_ARGS="-l -s /srv/tftp/"

Deleted: tftpd.rc
===================================================================
--- tftpd.rc	2013-05-31 05:28:19 UTC (rev 186768)
+++ tftpd.rc	2013-05-31 05:41:30 UTC (rev 186769)
@@ -1,38 +0,0 @@
-#!/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 tftpd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping TFTPD"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon tftpd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0

Modified: tftpd.service
===================================================================
--- tftpd.service	2013-05-31 05:28:19 UTC (rev 186768)
+++ tftpd.service	2013-05-31 05:41:30 UTC (rev 186769)
@@ -2,7 +2,7 @@
 Description=hpa's original TFTP daemon
 
 [Service]
-ExecStart=/usr/sbin/in.tftpd -s /srv/tftp/
+ExecStart=/usr/bin/in.tftpd -s /srv/tftp/
 StandardInput=socket
 StandardOutput=inherit
 StandardError=journal