[arch-commits] Commit in proftpd/trunk (4 files)

[Andrea Scarpino]

    Date: Thursday, August 23, 2012 @ 08:53:57
  Author: andrea
Revision: 165549

upgpkg: proftpd 1:1.3.4b-3

Create the /run/proftpd with the tmpfile (FS#31246); Fix the systemd service

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

------------------+
 PKGBUILD         |   16 ++++++++++++----
 proftpd.install  |    3 +++
 proftpd.service  |   14 ++++++--------
 proftpd.tmpfiles |    1 +
 4 files changed, 22 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-08-23 12:34:30 UTC (rev 165548)
+++ PKGBUILD	2012-08-23 12:53:57 UTC (rev 165549)
@@ -4,22 +4,25 @@
 
 pkgname=proftpd
 pkgver=1.3.4b
-pkgrel=2
+pkgrel=3
 epoch=1
 pkgdesc="A high-performance, scalable FTP server"
 arch=('i686' 'x86_64')
-url="http://www.proftpd.org"
+url="http://www.proftpd.org/"
 license=('GPL')
 depends=('libmysqlclient' 'postgresql-libs')
 backup=('etc/proftpd.conf' 'etc/conf.d/proftpd')
+install=${pkgname}.install
 source=(ftp://ftp.proftpd.org/distrib/source/${pkgname}-${pkgver}.tar.gz{,.asc}
-        'proftpd' 'proftpd.logrotate' 'proftpd.conf.d' 'proftpd.service')
+        'proftpd' 'proftpd.logrotate' 'proftpd.conf.d' 'proftpd.service'
+        'proftpd.tmpfiles')
 md5sums=('0871e0b93c9c3c88ca950b6d9a04aed2'
          'e5b9bd78029a15f82994efcb7ed2e9fb'
          'c439a0a1dbc21b604d8382da87aa021b'
          'ddb09eb13131becdf0e081eef413116b'
          '71d5932b0461c318ed68c2c0c2660736'
-         '2c446f531948c8cc0a1e0fae28f8dfda')
+         '5709f27ebcbe906e52963ea75e4fde64'
+         '907b149a120b046f05647c73502e23c9')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -53,4 +56,9 @@
 
   install -d "${pkgdir}/usr/lib/systemd/system/"
   install -m644 "${srcdir}"/proftpd.service "${pkgdir}/usr/lib/systemd/system/"
+  install -Dm644 "${srcdir}"/proftpd.tmpfiles \
+    "${pkgdir}"/usr/lib/tmpfiles.d/proftpd.conf
+
+  # /run is tmpfs
+  rmdir "${pkgdir}"/run/{proftpd,}
 }

Added: proftpd.install
===================================================================
--- proftpd.install	                        (rev 0)
+++ proftpd.install	2012-08-23 12:53:57 UTC (rev 165549)
@@ -0,0 +1,3 @@
+post_install() {
+  systemd-tmpfiles --create proftpd.conf
+}

Modified: proftpd.service
===================================================================
--- proftpd.service	2012-08-23 12:34:30 UTC (rev 165548)
+++ proftpd.service	2012-08-23 12:53:57 UTC (rev 165549)
@@ -1,14 +1,12 @@
 [Unit]
-Description = ProFTPD FTP Server
-After = network.target nss-lookup.target local-fs.target remote-fs.target
+Description=ProFTPD FTP Server
+After=network.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
+Type=forking
+PIDFile=/run/proftpd/proftpd.pid
+ExecStart=/usr/sbin/proftpd
+ExecReload=/bin/kill -HUP $MAINPID
 
 [Install]
 WantedBy = multi-user.target

Added: proftpd.tmpfiles
===================================================================
--- proftpd.tmpfiles	                        (rev 0)
+++ proftpd.tmpfiles	2012-08-23 12:53:57 UTC (rev 165549)
@@ -0,0 +1 @@
+d /run/proftpd 0755 root root