7 files changed, 83 insertions, 14 deletions
diff --git a/community/vsftpd/PKGBUILD b/community/vsftpd/PKGBUILD
index 4991b3673..c5ee68e0b 100644
--- a/community/vsftpd/PKGBUILD
+++ b/community/vsftpd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 69566 2012-04-18 17:36:30Z bpiotrowski $
+# $Id: PKGBUILD 72800 2012-06-22 12:52:54Z dreisner $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=vsftpd
 pkgver=3.0.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Very Secure FTP daemon"
 arch=('i686' 'x86_64' 'mips64el')
 url="https://security.appspot.com/vsftpd.html"
@@ -14,32 +14,46 @@ depends=('openssl')
 backup=('etc/vsftpd.conf' 'etc/xinetd.d/vsftpd')
 install=vsftpd.install
 source=(https://security.appspot.com/downloads/${pkgname}-${pkgver}.tar.gz{,.asc}
-        'vsftpd.xinetd' 'vsftpd.d')
+        vsftpd.xinetd vsftpd.d  vsftpd-ssl.socket  vsftpd.socket
+        vsftpd.service  vsftpd@.service vsftpd-ssl.service vsftpd-ssl@.service)
 sha1sums=('436da30cefa33e22a0266077ab95397e9432e297'
           '2142ac8a84f18ecc1ebac21b9ac07858c35ae6af'
           'c87b4ce56dac15223694a6e86c01ea813b877596'
-          '24f268956c24e78be0c234c6d31f41487922eafe')
+          '24f268956c24e78be0c234c6d31f41487922eafe'
+          'f81dab50243f7e82dc9722ca79b2b24de0882eb2'
+          '5b7a7a1e0c04acfcc2dba1346557f1193b9905ba'
+          'f1fa8cfaab1541c1ce3bb4dab4f4b302e5c44b03'
+          '3a040a18893a5103a1d4a22e631ee247bde8c8d3'
+          '08b2938dc81ee200b6d733a32f5565b9dbe170a3'
+          'e5bd183664008bb0cc0353d4efb2e8e92a365798')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd $srcdir/$pkgname-$pkgver
 
   # build-time config
   sed \
     -e 's|^#undef VSF_BUILD_SSL$|#define VSF_BUILD_SSL|' \
     -i builddefs.h
 
-  make CFLAGS="${CFLAGS} -fPIE" LINK='' LDFLAGS="-fPIE -pie ${LDFLAGS} -Wl,-z,now"
+  CFLAGS+=' -fPIE' LINK='' LDFLAGS="-fPIE -pie ${LDFLAGS} -Wl,-z,now" make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd $srcdir/$pkgname-$pkgver
 
-  install -D -m755 vsftpd "${pkgdir}/usr/sbin/vsftpd"
-  install -D -m644 vsftpd.conf "${pkgdir}/etc/vsftpd.conf"
-  install -D -m644 vsftpd.8 "${pkgdir}/usr/share/man/man8/vsftpd.8"
-  install -D -m644 vsftpd.conf.5 "${pkgdir}/usr/share/man/man5/vsftpd.conf.5"
-  install -D -m644 "${srcdir}/vsftpd.xinetd" "${pkgdir}/etc/xinetd.d/vsftpd"
-  install -D -m755 "${srcdir}/vsftpd.d" "${pkgdir}/etc/rc.d/vsftpd"
+  install -D -m755 vsftpd $pkgdir/usr/sbin/vsftpd
+  install -D -m644 vsftpd.conf $pkgdir/etc/vsftpd.conf
+  install -D -m644 vsftpd.8 $pkgdir/usr/share/man/man8/vsftpd.8
+  install -D -m644 vsftpd.conf.5 $pkgdir/usr/share/man/man5/vsftpd.conf.5
+  install -D -m644 $srcdir/vsftpd.xinetd $pkgdir/etc/xinetd.d/vsftpd
+  install -D -m755 $srcdir/vsftpd.d $pkgdir/etc/rc.d/vsftpd
 
-  install -d -m755 "${pkgdir}/usr/share/empty"
+  install -D -m644 $srcdir/vsftpd.service $pkgdir/usr/lib/systemd/system/vsftpd.service
+  install -D -m644 $srcdir/vsftpd@.service $pkgdir/usr/lib/systemd/system/vsftpd@.service 
+  install -D -m644 $srcdir/vsftpd-ssl.service $pkgdir/usr/lib/systemd/system/vsftpd-ssl.service
+  install -D -m644 $srcdir/vsftpd-ssl@.service $pkgdir/usr/lib/systemd/system/vsftpd-ssl@.service
+  install -D -m644 $srcdir/vsftpd.socket $pkgdir/usr/lib/systemd/system/vsftpd.socket
+  install -D -m644 $srcdir/vsftpd-ssl.socket $pkgdir/usr/lib/systemd/system/vsftpd-ssl.socket
+
+  install -d -m755 $pkgdir/usr/share/empty
 }
diff --git a/community/vsftpd/vsftpd-ssl.service b/community/vsftpd/vsftpd-ssl.service
new file mode 100644
index 000000000..f46b05fcd
--- /dev/null
+++ b/community/vsftpd/vsftpd-ssl.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=vsftpd daemon (legacy implicit SSL)
+
+[Service]
+ExecStart=/usr/sbin/vsftpd -olisten_ipv6=yes -oimplicit_ssl=yes
+ExecReload=/bin/kill -HUP $MAINPID
+KillMode=process
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/vsftpd/vsftpd-ssl.socket b/community/vsftpd/vsftpd-ssl.socket
new file mode 100644
index 000000000..b18b639c1
--- /dev/null
+++ b/community/vsftpd/vsftpd-ssl.socket
@@ -0,0 +1,9 @@
+[Unit]
+Conflicts=vsftpd.service
+
+[Socket]
+ListenStream=990
+Accept=yes
+
+[Install]
+WantedBy=sockets.target
diff --git a/community/vsftpd/vsftpd-ssl@.service b/community/vsftpd/vsftpd-ssl@.service
new file mode 100644
index 000000000..e53fad324
--- /dev/null
+++ b/community/vsftpd/vsftpd-ssl@.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=vsftpd per-connection server (legacy implicit SSL)
+
+[Service]
+ExecStart=-/usr/sbin/vsftpd -oimplicit_ssl=yes
+ExecReload=/bin/kill -HUP $MAINPID
+StandardInput=socket
+StandardOutput=socket
+StandardError=syslog
diff --git a/community/vsftpd/vsftpd.service b/community/vsftpd/vsftpd.service
new file mode 100644
index 000000000..d4f7251ba
--- /dev/null
+++ b/community/vsftpd/vsftpd.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=vsftpd daemon
+
+[Service]
+ExecStart=/usr/sbin/vsftpd -olisten_ipv6=yes
+ExecReload=/bin/kill -HUP $MAINPID
+KillMode=process
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/vsftpd/vsftpd.socket b/community/vsftpd/vsftpd.socket
new file mode 100644
index 000000000..cdc0d337e
--- /dev/null
+++ b/community/vsftpd/vsftpd.socket
@@ -0,0 +1,9 @@
+[Unit]
+Conflicts=vsftpd.service
+
+[Socket]
+ListenStream=21
+Accept=yes
+
+[Install]
+WantedBy=sockets.target
diff --git a/community/vsftpd/vsftpd@.service b/community/vsftpd/vsftpd@.service
new file mode 100644
index 000000000..353f95f82
--- /dev/null
+++ b/community/vsftpd/vsftpd@.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=vsftpd per-connection server
+
+[Service]
+ExecStart=-/usr/sbin/vsftpd
+ExecReload=/bin/kill -HUP $MAINPID
+StandardInput=socket
+StandardError=syslog