[arch-commits] Commit in proftpd/trunk (PKGBUILD proftpd proftpd.service)

[Andrea Scarpino]

    Date: Tuesday, August 14, 2012 @ 12:08:58
  Author: andrea
Revision: 165248

upgpkg: proftpd 1:1.3.4b-2

Move the runtime dir to /run/proftpd (FS#28497); build with systemd support; Add a systemd service file

Added:
  proftpd/trunk/proftpd.service
Modified:
  proftpd/trunk/PKGBUILD
  proftpd/trunk/proftpd

-----------------+
 PKGBUILD        |   20 +++++++++++---------
 proftpd         |    4 ++--
 proftpd.service |   14 ++++++++++++++
 3 files changed, 27 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-08-14 16:08:31 UTC (rev 165247)
+++ PKGBUILD	2012-08-14 16:08:58 UTC (rev 165248)
@@ -4,21 +4,22 @@
 
 pkgname=proftpd
 pkgver=1.3.4b
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc="A high-performance, scalable FTP server"
 arch=('i686' 'x86_64')
 url="http://www.proftpd.org"
 license=('GPL')
-depends=('libldap' 'libmysqlclient' 'postgresql-libs')
+depends=('libmysqlclient' 'postgresql-libs')
 backup=('etc/proftpd.conf' 'etc/conf.d/proftpd')
 source=(ftp://ftp.proftpd.org/distrib/source/${pkgname}-${pkgver}.tar.gz{,.asc}
-        'proftpd' 'proftpd.logrotate' 'proftpd.conf.d')
+        'proftpd' 'proftpd.logrotate' 'proftpd.conf.d' 'proftpd.service')
 md5sums=('0871e0b93c9c3c88ca950b6d9a04aed2'
          'e5b9bd78029a15f82994efcb7ed2e9fb'
-         '8177292919acb2f087ded0bb7b2dcc32'
+         'c439a0a1dbc21b604d8382da87aa021b'
          'ddb09eb13131becdf0e081eef413116b'
-         '71d5932b0461c318ed68c2c0c2660736')
+         '71d5932b0461c318ed68c2c0c2660736'
+         '2c446f531948c8cc0a1e0fae28f8dfda')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -28,12 +29,13 @@
     --disable-pam \
     --with-modules=mod_quotatab:mod_quotatab_sql:mod_quotatab_file:mod_tls:mod_ldap:mod_sql:mod_sql_mysql:mod_sql_postgres \
     --sysconfdir=/etc \
-    --localstatedir=/var/run \
+    --localstatedir=/run/proftpd \
     --enable-ctrls \
     --enable-ipv6 \
     --with-includes=/usr/include/mysql:/usr/include/postgresql \
     --with-libraries=/usr/lib/mysql:/usr/lib/postgresql \
-    --enable-nls
+    --enable-nls \
+    --with-systemd
 
   make
 }
@@ -49,6 +51,6 @@
   install -Dm755 ../proftpd "${pkgdir}/etc/rc.d/proftpd"
   install -Dm755 contrib/xferstats.holger-preiss "${pkgdir}/usr/bin/ftpstats"
 
-  # /var/run is a symlink to /run now
-  rm -rf "${pkgdir}/var"
+  install -d "${pkgdir}/usr/lib/systemd/system/"
+  install -m644 "${srcdir}"/proftpd.service "${pkgdir}/usr/lib/systemd/system/"
 }

Modified: proftpd
===================================================================
--- proftpd	2012-08-14 16:08:31 UTC (rev 165247)
+++ proftpd	2012-08-14 16:08:58 UTC (rev 165248)
@@ -20,11 +20,11 @@
     ;;
   stop)
     stat_busy "Stopping ProFTPd Server"
-    [ -f /run/proftpd.pid ] && kill $(cat /run/proftpd.pid) &> /dev/null
+    [ -f /run/proftpd/proftpd.pid ] && kill $(cat /run/proftpd/proftpd.pid) &> /dev/null
     if [ $? -gt 0 ]; then
       stat_fail
     else
-      rm -f /run/proftpd.pid
+      rm -f /run/proftpd/proftpd.pid
       rm_daemon proftpd
       stat_done
     fi

Added: proftpd.service
===================================================================
--- proftpd.service	                        (rev 0)
+++ proftpd.service	2012-08-14 16:08:58 UTC (rev 165248)
@@ -0,0 +1,14 @@
+[Unit]
+Description = ProFTPD FTP Server
+After = network.target nss-lookup.target local-fs.target remote-fs.target
+
+[Service]
+Type = forking
+PIDFile = /run/proftpd/proftpd.pid
+Environment = PROFTPD_ARGS=
+EnvironmentFile = -/etc/conf.d/proftpd
+ExecStart = /usr/sbin/proftpd $PROFTPD_ARGS
+ExecReload = /bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy = multi-user.target