Date: Friday, September 21, 2012 @ 11:33:26 Author: thomas Revision: 166908
tftp-hpa: + Change default tftp location to /srv/tftp + Add systemd tftpd.socket Added: tftp-hpa/trunk/tftpd.service tftp-hpa/trunk/tftpd.socket Modified: tftp-hpa/trunk/PKGBUILD tftp-hpa/trunk/tftpd.conf ---------------+ PKGBUILD | 25 ++++++++++++++++--------- tftpd.conf | 2 +- tftpd.service | 8 ++++++++ tftpd.socket | 5 +++++ 4 files changed, 30 insertions(+), 10 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-09-21 14:30:04 UTC (rev 166907) +++ PKGBUILD 2012-09-21 15:33:26 UTC (rev 166908) @@ -3,10 +3,10 @@ # Contributor: Jose Javier <[email protected]> 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 @@ 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 @@ 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') Modified: tftpd.conf =================================================================== --- tftpd.conf 2012-09-21 14:30:04 UTC (rev 166907) +++ tftpd.conf 2012-09-21 15:33:26 UTC (rev 166908) @@ -1,4 +1,4 @@ # # Parameters to be passed to TFTPD # -TFTPD_ARGS="-l -s /var/tftpboot" +TFTPD_ARGS="-l -s /srv/tftp/" Added: tftpd.service =================================================================== --- tftpd.service (rev 0) +++ tftpd.service 2012-09-21 15:33:26 UTC (rev 166908) @@ -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 Added: tftpd.socket =================================================================== --- tftpd.socket (rev 0) +++ tftpd.socket 2012-09-21 15:33:26 UTC (rev 166908) @@ -0,0 +1,5 @@ +[Socket] +ListenDatagram=69 + +[Install] +WantedBy=sockets.target
