Sun Sep 23 01:11:08 PDT 2012

4 files changed, 31 insertions, 11 deletions

diff --git a/extra/tftp-hpa/PKGBUILD b/extra/tftp-hpa/PKGBUILD
index 6f33be75b..97e98dc0d 100644
--- a/extra/tftp-hpa/PKGBUILD
+++ b/extra/tftp-hpa/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 151760 2012-03-02 09:20:56Z tpowa $
+# $Id: PKGBUILD 166932 2012-09-22 13:11:31Z thomas $
 # Maintainer: dorphell <dorphell@archlinux.org>
 # Contributor: Jose Javier  <jojapa@terra.es>
 pkgname=tftp-hpa
 pkgver=5.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Official tftp server"
 arch=('i686' 'x86_64')
-url="http://www.kernel.org/pub/software/network/tftp/"
+url="http://www.kernel.org/pub/software/network/tftp/tftp-hpa/"
 license=('BSD')
 depends=('readline>=6.0.00')
 conflicts=('netkit-tftp')
@@ -15,7 +15,16 @@ source=(http://www.kernel.org/pub/software/network/tftp/tftp-hpa/$pkgname-$pkgve
        tftpd.rc 
        tftpd.conf 
        LICENSE
+       tftpd.service
+       tftpd.socket
        tftp-hpa-0.49-fortify-strcpy-crash.patch)
+md5sums=('3de3038e7c2bf6fc5d496825893ac8e7'
+         '83fbb6f52205d95951a3c059e5351ca2'
+         'f41f484f94e91175e9183e872a2bff3b'
+         '6ce21e27b6fdc1a1adf85c81e42aeecf'
+         '165b98f814f74568635a720e674d7f18'
+         'a23369ea33be8b4a5427ec2cfc5373dd'
+         '22e8629ef19bc276a102c5d4d284c1bd')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -29,14 +38,12 @@ package() {
   cd "${srcdir}/${pkgname}-${pkgver}" 
   make INSTALLROOT="${pkgdir}" install
   install -d "${pkgdir}/etc/rc.d"
-  install -d "${pkgdir}/var/tftpboot"
+  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"
-  rm "${pkgdir}/usr/share/man/man8/tftpd.8"
+  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"
+  # Remove conflict with iputils
+  rm "${pkgdir}/usr/share/man/man8/tftpd.8"  
 }
-md5sums=('3de3038e7c2bf6fc5d496825893ac8e7'
-         '83fbb6f52205d95951a3c059e5351ca2'
-         '414a79dc891bced056d99a9bb790fc9e'
-         '6ce21e27b6fdc1a1adf85c81e42aeecf'
-         '22e8629ef19bc276a102c5d4d284c1bd')
diff --git a/extra/tftp-hpa/tftpd.conf b/extra/tftp-hpa/tftpd.conf
index 4705cc3a9..a4329f608 100644
--- a/extra/tftp-hpa/tftpd.conf
+++ b/extra/tftp-hpa/tftpd.conf
@@ -1,4 +1,4 @@
 #
 # Parameters to be passed to TFTPD
 #
-TFTPD_ARGS="-l -s /var/tftpboot" 
+TFTPD_ARGS="-l -s /srv/tftp/"
diff --git a/extra/tftp-hpa/tftpd.service b/extra/tftp-hpa/tftpd.service
new file mode 100644
index 000000000..62562343d
--- /dev/null
+++ b/extra/tftp-hpa/tftpd.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=hpa's original TFTP daemon
+
+[Service]
+ExecStart=/usr/sbin/in.tftpd -s /srv/tftp/
+StandardInput=socket
+StandardOutput=inherit
+StandardError=journal
diff --git a/extra/tftp-hpa/tftpd.socket b/extra/tftp-hpa/tftpd.socket
new file mode 100644
index 000000000..0315ed608
--- /dev/null
+++ b/extra/tftp-hpa/tftpd.socket
@@ -0,0 +1,5 @@
+[Socket]
+ListenDatagram=69
+
+[Install]
+WantedBy=sockets.target