diff options
| author | Leonardo Arena <rnalrd@alpinelinux.org> | 2013-01-01 07:18:21 +0000 |
|---|---|---|
| committer | Leonardo Arena <rnalrd@alpinelinux.org> | 2013-01-01 07:18:33 +0000 |
| commit | b1d24afbf60529e9b4ea13fd1f329b8351192eb7 (patch) | |
| tree | 31c54af85c5bbccf274aa90f00f8adb24d808559 /main | |
| parent | fa8c5cfd27b0b4a5f1a9cd750e36c59c73546229 (diff) | |
| download | aports-b1d24afbf60529e9b4ea13fd1f329b8351192eb7.tar.bz2 aports-b1d24afbf60529e9b4ea13fd1f329b8351192eb7.tar.xz | |
main/vsftpd: support multiple instances
Diffstat (limited to 'main')
| -rw-r--r-- | main/vsftpd/APKBUILD | 10 | ||||
| -rw-r--r-- | main/vsftpd/vsftpd.confd | 2 | ||||
| -rw-r--r-- | main/vsftpd/vsftpd.initd | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/main/vsftpd/APKBUILD b/main/vsftpd/APKBUILD index 03f5cef158..e4b0466d8b 100644 --- a/main/vsftpd/APKBUILD +++ b/main/vsftpd/APKBUILD @@ -2,13 +2,13 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=vsftpd pkgver=3.0.2 -pkgrel=0 +pkgrel=1 pkgdesc="Very secure ftpd" url="http://vsftpd.beasts.org" arch="all" license="GPL" depends= -makedepends="openssl-dev libcap-dev wget linux-pam-dev" +makedepends="openssl-dev libcap-dev linux-pam-dev" subpackages="$pkgname-doc" source="https://security.appspot.com/downloads/vsftpd-${pkgver}.tar.gz vsftpd-enable-ssl.patch @@ -40,7 +40,7 @@ package() { install -m755 -D vsftpd "$pkgdir"/usr/sbin/vsftpd install -m644 -D vsftpd.8 "$pkgdir"/usr/share/man/man8/vsftpd.8 install -m644 -D vsftpd.conf.5 "$pkgdir"/usr/share/man/man5/vsftpd.conf.5 - install -m644 -D vsftpd.conf "$pkgdir"/etc/vsftpd.conf + install -m644 -D vsftpd.conf "$pkgdir"/etc/vsftpd/vsftpd.conf install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname mkdir -p "$pkgdir"/usr/share/empty @@ -49,5 +49,5 @@ package() { md5sums="8b00c749719089401315bd3c44dddbb2 vsftpd-3.0.2.tar.gz f3cbaf364cd3c46a2a03b00de9d7e184 vsftpd-enable-ssl.patch f2245efcc271356743805f38d6c5aea3 vsftpd-gnu-source.patch -1a56bcc7698dba6490f0007f37c75e9b vsftpd.initd -431dfe7403323e247a88b97beade5d78 vsftpd.confd" +b48784af42b0f787e55276fc20476aa2 vsftpd.initd +ac2ae36e4849bf50e0f03fa5e02a7bae vsftpd.confd" diff --git a/main/vsftpd/vsftpd.confd b/main/vsftpd/vsftpd.confd index 0abb80c6e8..0ef89316b9 100644 --- a/main/vsftpd/vsftpd.confd +++ b/main/vsftpd/vsftpd.confd @@ -4,6 +4,6 @@ # Specify daemon $OPTS here. # -OPTS="" +OPTS="/etc/vsftpd/vsftpd.conf" USER="nobody" GROUP="nobody" diff --git a/main/vsftpd/vsftpd.initd b/main/vsftpd/vsftpd.initd index 52b6238779..8736c79acf 100644 --- a/main/vsftpd/vsftpd.initd +++ b/main/vsftpd/vsftpd.initd @@ -9,18 +9,18 @@ depend() { } start() { - ebegin "Starting ${NAME}" + ebegin "Starting ${SVCNAME}" start-stop-daemon --start --quiet --background \ - --make-pidfile --pidfile /var/run/${NAME}.pid \ + --make-pidfile --pidfile /var/run/${SVCNAME}.pid \ --exec ${DAEMON} -- ${OPTS} eend $? } stop() { - ebegin "Stopping ${NAME}" + ebegin "Stopping ${SVCNAME}" start-stop-daemon --stop --quiet \ --exec ${DAEMON} \ - --pidfile /var/run/${NAME}.pid \ + --pidfile /var/run/${SVCNAME}.pid \ eend $? } |