From 29896582b8f0f163c9b880fa64ee948d470ef5ba Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Sat, 25 Aug 2012 00:02:57 +0000
Subject: Sat Aug 25 00:02:57 UTC 2012

---
 extra/proftpd/PKGBUILD         | 18 +++++++++++++-----
 extra/proftpd/proftpd.install  |  3 +++
 extra/proftpd/proftpd.service  | 14 ++++++--------
 extra/proftpd/proftpd.tmpfiles |  1 +
 4 files changed, 23 insertions(+), 13 deletions(-)
 create mode 100644 extra/proftpd/proftpd.install
 create mode 100644 extra/proftpd/proftpd.tmpfiles

(limited to 'extra/proftpd')

diff --git a/extra/proftpd/PKGBUILD b/extra/proftpd/PKGBUILD
index 47be71491..32e2c436a 100644
--- a/extra/proftpd/PKGBUILD
+++ b/extra/proftpd/PKGBUILD
@@ -1,25 +1,28 @@
-# $Id: PKGBUILD 165441 2012-08-19 15:31:22Z andrea $
+# $Id: PKGBUILD 165550 2012-08-23 12:54:55Z andrea $
 # Maintainer:
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 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 @@ package() {
 
   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,}
 }
diff --git a/extra/proftpd/proftpd.install b/extra/proftpd/proftpd.install
new file mode 100644
index 000000000..6d9888496
--- /dev/null
+++ b/extra/proftpd/proftpd.install
@@ -0,0 +1,3 @@
+post_install() {
+  systemd-tmpfiles --create proftpd.conf
+}
diff --git a/extra/proftpd/proftpd.service b/extra/proftpd/proftpd.service
index c202a2fdf..a07d17f46 100644
--- a/extra/proftpd/proftpd.service
+++ b/extra/proftpd/proftpd.service
@@ -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
diff --git a/extra/proftpd/proftpd.tmpfiles b/extra/proftpd/proftpd.tmpfiles
new file mode 100644
index 000000000..241dc7cb1
--- /dev/null
+++ b/extra/proftpd/proftpd.tmpfiles
@@ -0,0 +1 @@
+d /run/proftpd 0755 root root
-- 
cgit v1.2.3-54-g00ecf