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

[Anatol Pomozov]

    Date: Saturday, May 2, 2015 @ 02:55:45
  Author: anatolik
Revision: 238330

upgpkg: tftp-hpa 5.2-5

Add possibility to customize service via /etc/conf.d/tftpd (uses systemd EnvironmentFile option).
Fix systemd warning, it does not like executable bit on service/socket files.

Added:
  tftp-hpa/trunk/tftpd.conf
  tftp-hpa/trunk/tftpd.install
Modified:
  tftp-hpa/trunk/PKGBUILD
  tftp-hpa/trunk/tftpd.service
  tftp-hpa/trunk/tftpd.socket

---------------+
 PKGBUILD      |   17 +++++++++++------
 tftpd.conf    |    1 +
 tftpd.install |    6 ++++++
 tftpd.service |   11 +++++++----
 tftpd.socket  |    4 ++++
 5 files changed, 29 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-05-01 19:53:11 UTC (rev 238329)
+++ PKGBUILD	2015-05-02 00:55:45 UTC (rev 238330)
@@ -1,24 +1,28 @@
 # $Id$
 # Maintainer: dorphell <dorphell at archlinux.org>
 # Contributor: Jose Javier  <jojapa at terra.es>
+
 pkgname=tftp-hpa
 pkgver=5.2
-pkgrel=4
+pkgrel=5
 pkgdesc="Official tftp server"
 arch=('i686' 'x86_64')
 url="http://www.kernel.org/pub/software/network/tftp/tftp-hpa/"
 license=('BSD')
+backup=('etc/conf.d/tftpd')
+install='tftpd.install'
 depends=('readline>=6.0.00')
-conflicts=('netkit-tftp')
 source=(http://www.kernel.org/pub/software/network/tftp/tftp-hpa/$pkgname-$pkgver.tar.gz 
        LICENSE
+       tftpd.conf
        tftpd.service
        tftpd.socket
        tftp-hpa-0.49-fortify-strcpy-crash.patch)
 md5sums=('3de3038e7c2bf6fc5d496825893ac8e7'
          '6ce21e27b6fdc1a1adf85c81e42aeecf'
-         'ffeac33192eac4c526657b6789cace21'
-         'a23369ea33be8b4a5427ec2cfc5373dd'
+         'b372088e550683df5ea8528ca6bbed1f'
+         'ddd0028f77f131f3839bde92202305c4'
+         'b04b9eb0bd049fa59dd518587a26d1c4'
          '22e8629ef19bc276a102c5d4d284c1bd')
 
 prepare() {
@@ -36,9 +40,10 @@
 package() {
   cd ${pkgname}-${pkgver}
   make INSTALLROOT="${pkgdir}" install
+  install -D -m644 "${srcdir}/tftpd.conf" "$pkgdir/etc/conf.d/tftpd"
   install -d "${pkgdir}/srv/tftp"
-  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}/tftpd.service" "${pkgdir}/usr/lib/systemd/system/tftpd.service"
+  install -D -m644 "${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"  

Added: tftpd.conf
===================================================================
--- tftpd.conf	                        (rev 0)
+++ tftpd.conf	2015-05-02 00:55:45 UTC (rev 238330)
@@ -0,0 +1 @@
+TFTPD_ARGS="--secure /srv/tftp/"

Added: tftpd.install
===================================================================
--- tftpd.install	                        (rev 0)
+++ tftpd.install	2015-05-02 00:55:45 UTC (rev 238330)
@@ -0,0 +1,6 @@
+post_upgrade() {
+  if [ -f /etc/systemd/system/tftpd.service ]; then
+    echo ">>> TFTP server configuration has been moved to /etc/conf.d/tftpd."
+    echo "    Please update /etc/conf.d/tftpd and remove /etc/systemd/system/tftpd.service"
+  fi
+}

Modified: tftpd.service
===================================================================
--- tftpd.service	2015-05-01 19:53:11 UTC (rev 238329)
+++ tftpd.service	2015-05-02 00:55:45 UTC (rev 238330)
@@ -1,8 +1,11 @@
 [Unit]
 Description=hpa's original TFTP daemon
+After=network.target
 
 [Service]
-ExecStart=/usr/bin/in.tftpd -s /srv/tftp/
-StandardInput=socket
-StandardOutput=inherit
-StandardError=journal
+Type=forking
+EnvironmentFile=/etc/conf.d/tftpd
+ExecStart=/usr/bin/in.tftpd --listen $TFTPD_ARGS
+
+[Install]
+WantedBy=multi-user.target

Modified: tftpd.socket
===================================================================
--- tftpd.socket	2015-05-01 19:53:11 UTC (rev 238329)
+++ tftpd.socket	2015-05-02 00:55:45 UTC (rev 238330)
@@ -1,3 +1,7 @@
+[Unit]
+Description=hpa's original TFTP daemon
+Conflicts=tftpd.service
+
 [Socket]
 ListenDatagram=69