diff options
Diffstat (limited to 'community/vsftpd')
| -rw-r--r-- | community/vsftpd/PKGBUILD | 32 | ||||
| -rw-r--r-- | community/vsftpd/vsftpd-ssl.service | 2 | ||||
| -rw-r--r-- | community/vsftpd/vsftpd-ssl@.service | 2 | ||||
| -rw-r--r-- | community/vsftpd/vsftpd.d | 67 | ||||
| -rw-r--r-- | community/vsftpd/vsftpd.service | 2 | ||||
| -rw-r--r-- | community/vsftpd/vsftpd.xinetd | 2 | ||||
| -rw-r--r-- | community/vsftpd/vsftpd@.service | 2 |
7 files changed, 20 insertions, 89 deletions
diff --git a/community/vsftpd/PKGBUILD b/community/vsftpd/PKGBUILD index fdff92bbd..5c6bc3b11 100644 --- a/community/vsftpd/PKGBUILD +++ b/community/vsftpd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 76440 2012-09-18 15:37:11Z bpiotrowski $ +# $Id: PKGBUILD 90372 2013-05-12 05:50:20Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Andreas Radke <andyrtr@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=vsftpd pkgver=3.0.2 -pkgrel=1 +pkgrel=2 pkgdesc="Very Secure FTP daemon" arch=('i686' 'x86_64') url="https://security.appspot.com/vsftpd.html" @@ -14,21 +14,20 @@ 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-ssl.socket vsftpd.socket + vsftpd.xinetd vsftpd-ssl.socket vsftpd.socket vsftpd.service vsftpd@.service vsftpd-ssl.service vsftpd-ssl@.service) -sha1sums=('f36976bb1c5df25ac236d8a29e965ba2b825ccd0' - '42c6055c1418ad93340bfa3b176b60f1e5b15e0a' - 'c87b4ce56dac15223694a6e86c01ea813b877596' - '24f268956c24e78be0c234c6d31f41487922eafe' - 'f81dab50243f7e82dc9722ca79b2b24de0882eb2' - '5b7a7a1e0c04acfcc2dba1346557f1193b9905ba' - 'cde3528825b073d3941c263e9e63b4c298a97c47' - '3a040a18893a5103a1d4a22e631ee247bde8c8d3' - '2b0a778d7b2329a6d4c01a64ef6c7d90144cd3ab' - 'e5bd183664008bb0cc0353d4efb2e8e92a365798') +sha256sums=('be46f0e2c5528fe021fafc8dab1ecfea0c1f183063a06977f8537fcd0b195e56' + 'SKIP' + '5909f9b95479429c236170a06879d27d07ddda52d9c4c5543c961500c4cac2e0' + 'd5185e48fffc6253499a55e0fe0f90a3424fc639640af11a9d38df33fb145afe' + '9fdbfd2ec0207170371ca3cf2b0ddca2dc2fe3d062e5792e0d3e51474c3198c9' + '50c392f373f8ce37aa226a9af7a6b038a8683ee3e041ebbad1bb483e47e8a1f8' + 'd7b8e4827d4f6bafcbf52f9d2d7380958c7b08bb3f757806aa89d4bc06c9671c' + 'b88a50fc68b3bf746d13c9a777df77791cd3eac6eb7c2df655418071c2adf422' + '4a55c2468b08d858f71bacf1f4885847bec8e548b0e92088068d9bdd3884af84') build() { - cd $srcdir/$pkgname-$pkgver + cd $pkgname-$pkgver # build-time config sed \ @@ -39,14 +38,13 @@ build() { } package() { - cd $srcdir/$pkgname-$pkgver + cd $pkgname-$pkgver - install -D -m755 vsftpd $pkgdir/usr/sbin/vsftpd + install -D -m755 vsftpd $pkgdir/usr/bin/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 -m644 $srcdir/vsftpd.service $pkgdir/usr/lib/systemd/system/vsftpd.service install -D -m644 $srcdir/vsftpd@.service $pkgdir/usr/lib/systemd/system/vsftpd@.service diff --git a/community/vsftpd/vsftpd-ssl.service b/community/vsftpd/vsftpd-ssl.service index b5b84b3c3..3343bc920 100644 --- a/community/vsftpd/vsftpd-ssl.service +++ b/community/vsftpd/vsftpd-ssl.service @@ -2,7 +2,7 @@ Description=vsftpd daemon (legacy implicit SSL) [Service] -ExecStart=/usr/sbin/vsftpd -oimplicit_ssl=yes +ExecStart=/usr/bin/vsftpd -oimplicit_ssl=yes ExecReload=/bin/kill -HUP $MAINPID KillMode=process diff --git a/community/vsftpd/vsftpd-ssl@.service b/community/vsftpd/vsftpd-ssl@.service index e53fad324..8bcf78e55 100644 --- a/community/vsftpd/vsftpd-ssl@.service +++ b/community/vsftpd/vsftpd-ssl@.service @@ -2,7 +2,7 @@ Description=vsftpd per-connection server (legacy implicit SSL) [Service] -ExecStart=-/usr/sbin/vsftpd -oimplicit_ssl=yes +ExecStart=-/usr/bin/vsftpd -oimplicit_ssl=yes ExecReload=/bin/kill -HUP $MAINPID StandardInput=socket StandardOutput=socket diff --git a/community/vsftpd/vsftpd.d b/community/vsftpd/vsftpd.d deleted file mode 100644 index 27310855c..000000000 --- a/community/vsftpd/vsftpd.d +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/bash - -daemon_name=vsftpd - -. /etc/rc.conf -. /etc/rc.d/functions - -get_pid() { - pidof -o %PPID $daemon_name -} - -case "$1" in - start) - stat_busy "Starting $daemon_name daemon" - - PID=$(get_pid) - if [ -z "$PID" ]; then - [ -f /var/run/$daemon_name.pid ] && rm -f /var/run/$daemon_name.pid - # RUN - $daemon_name & - # - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - echo $(get_pid) > /var/run/$daemon_name.pid - add_daemon $daemon_name - stat_done - fi - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping $daemon_name daemon" - PID=$(get_pid) - # KILL - [ ! -z "$PID" ] && kill $PID &> /dev/null - # - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - rm -f /var/run/$daemon_name.pid &> /dev/null - rm_daemon $daemon_name - stat_done - fi - ;; - - restart) - $0 stop - sleep 3 - $0 start - ;; - - status) - stat_busy "Checking $daemon_name status"; - ck_status $daemon_name - ;; - - *) - echo "usage: $0 {start|stop|restart|status}" -esac - -exit 0 diff --git a/community/vsftpd/vsftpd.service b/community/vsftpd/vsftpd.service index cbd10d9d1..63876460c 100644 --- a/community/vsftpd/vsftpd.service +++ b/community/vsftpd/vsftpd.service @@ -2,7 +2,7 @@ Description=vsftpd daemon [Service] -ExecStart=/usr/sbin/vsftpd +ExecStart=/usr/bin/vsftpd ExecReload=/bin/kill -HUP $MAINPID KillMode=process diff --git a/community/vsftpd/vsftpd.xinetd b/community/vsftpd/vsftpd.xinetd index eff2eb3db..2a6f38c80 100644 --- a/community/vsftpd/vsftpd.xinetd +++ b/community/vsftpd/vsftpd.xinetd @@ -3,7 +3,7 @@ service ftp socket_type = stream wait = no user = root - server = /usr/sbin/vsftpd + server = /usr/bin/vsftpd log_on_success += HOST DURATION log_on_failure += HOST disable = yes diff --git a/community/vsftpd/vsftpd@.service b/community/vsftpd/vsftpd@.service index 353f95f82..81e142990 100644 --- a/community/vsftpd/vsftpd@.service +++ b/community/vsftpd/vsftpd@.service @@ -2,7 +2,7 @@ Description=vsftpd per-connection server [Service] -ExecStart=-/usr/sbin/vsftpd +ExecStart=-/usr/bin/vsftpd ExecReload=/bin/kill -HUP $MAINPID StandardInput=socket StandardError=syslog |