summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Olexa <darkside@gentoo.org>2008-06-02 04:18:15 +0000
committerJeremy Olexa <darkside@gentoo.org>2008-06-02 04:18:15 +0000
commite9ef14c18cd0b10301cf04b3dfebafc97654f101 (patch)
tree8470f84918334690ed411f17278445e50bf78ae7 /net-ftp
parentStable for HPPA (bug #223965). (diff)
downloadhistorical-e9ef14c18cd0b10301cf04b3dfebafc97654f101.tar.gz
historical-e9ef14c18cd0b10301cf04b3dfebafc97654f101.tar.bz2
historical-e9ef14c18cd0b10301cf04b3dfebafc97654f101.zip
Modified init script to allow vsftpd to stop correctly. Thanks to Vaclav Adamik for the suggestion, bug #223225
Package-Manager: portage-2.1.4.4
Diffstat (limited to 'net-ftp')
-rw-r--r--net-ftp/vsftpd/ChangeLog6
-rw-r--r--net-ftp/vsftpd/Manifest14
-rw-r--r--net-ftp/vsftpd/files/vsftpd.init5
3 files changed, 9 insertions, 16 deletions
diff --git a/net-ftp/vsftpd/ChangeLog b/net-ftp/vsftpd/ChangeLog
index 5599491b98c8..9ccc54c82d54 100644
--- a/net-ftp/vsftpd/ChangeLog
+++ b/net-ftp/vsftpd/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-ftp/vsftpd
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.98 2008/05/14 22:12:57 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.99 2008/06/02 04:18:14 darkside Exp $
+
+ 02 Jun 2008; Jeremy Olexa <darkside@gentoo.org> files/vsftpd.init:
+ Modified init script to allow vsftpd to stop correctly. Thanks to Vaclav
+ Adamik for the suggestion, bug #223225
14 May 2008; Diego Pettenò <flameeyes@gentoo.org> vsftpd-2.0.5-r3.ebuild,
vsftpd-2.0.6.ebuild:
diff --git a/net-ftp/vsftpd/Manifest b/net-ftp/vsftpd/Manifest
index 74b77a279fa4..e166fe38b3ef 100644
--- a/net-ftp/vsftpd/Manifest
+++ b/net-ftp/vsftpd/Manifest
@@ -1,24 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX vsftpd-2.0.3-gentoo.patch 7128 RMD160 99ef0aee94847405e6185cc95acbc72cba0df0e0 SHA1 4608e2656d83cc17fcef229a8f4b66c803b899d8 SHA256 8f3215d43948364d431312dd4109af09e9a83ebbafb7a1c388f2aefea4df9154
AUX vsftpd-2.0.5-anon-upload-umask.patch 818 RMD160 2c8a64226056df2b7451d434d0a5ec8302abfda3 SHA1 178e2d0a7f7862fefcd8dd6f36ae36583aee91ab SHA256 9875216bc2b1396e11a634e2a3ddf8ede6af0e0be797d9809b04d73e45aedc01
AUX vsftpd-2.0.6-caps.patch 649 RMD160 161b4610fdedcc3b1173055e534682fc5450b1d7 SHA1 cf63310bcee83e68079377c1da55e2b0d0111ebf SHA256 1435d0bc4e0d0e5f4a86ba2c42e77663be10d494cc9bc3af782c104a062e2778
AUX vsftpd-2.0.6-libcap1.patch 582 RMD160 239fa2c23770e81a0b45f8df154a52b42af1f542 SHA1 d3fb0ae32f445092e9ab5af2209ac16af2ac0a5d SHA256 8c72a4f34ca8f4f3fb2da49d4cfde288c346d29bac3036f25b64c51f1543a51c
AUX vsftpd.conf 3842 RMD160 2b0971c60f2ae2f9d3136849dff4dcf8ce117d41 SHA1 ebd5847bb328d8df188d85ffc5ccd7fcd5983525 SHA256 08b680a8531ecc8ccd9bf7cd91dc2de0a49105803a6d8fdcbe0f0dd47de8f6e0
-AUX vsftpd.init 1735 RMD160 1c1487ac281d341420ad741ee35e23807766a2fe SHA1 d5fe1307ed792e7580de9709e6c6ca6680fad430 SHA256 1651712a71c8f06cc5c12c903b5181ba60d01b1ee44833bb0c219ada770b034f
+AUX vsftpd.init 1706 RMD160 206f46f61b78f279c09d5a4e3a011020c24accd1 SHA1 d8d80d6a22d51619cf64541e9911260ebf709c5e SHA256 4d8b6a01669948d33c6a9b2d757d6f651a7261a79d68d90c2cad5b17da713440
AUX vsftpd.logrotate 53 RMD160 0fba0639da0d827fc0decfcf9ccd34fc7ad23c68 SHA1 cf18de9f84ad9a44974a7ae0f29562e9a516d5f9 SHA256 b31f4db8e2f8640f83bc38d83444ab784f8fc9a6492f654bb4149e1f566da2f3
AUX vsftpd.xinetd 432 RMD160 6e2b2d0517d0bf8a2a9d7ce42ca2ea4ce73fbca2 SHA1 5325ecbf0755ebd5778d69039393af075c1a9b40 SHA256 4e68c12108509823c74cd66f833299def48f497a4d660624362d3b4990af828f
DIST vsftpd-2.0.5.tar.gz 155985 RMD160 297c383aae9fd90f75d5d6a62b2ed5e54adf25d4 SHA1 9b6a079699aaeb01219665acf203c093f94faef0 SHA256 5462ebf0df2792dde8ea3cf5d87c715200aac388554b3f0a9ace6265edecfa5b
DIST vsftpd-2.0.6.tar.gz 158516 RMD160 33e9782e2c99986c2c8b60fc29880cedad7ba1fa SHA1 23fcc21996cd1404f6957d83bfb2e8004401a858 SHA256 8e35c3962477c5c539d9be489d0d3794840f5eda15690e492a6f1f256398ce30
EBUILD vsftpd-2.0.5-r3.ebuild 3137 RMD160 8811a452f2468fbeae101b5656f012bb3b795650 SHA1 826bbaef7734756449be0e55f7d4e639be1d2095 SHA256 f6dabaffbee5306548f8c8ba434f99941885007b1fc85d3cc5dbab9fe61b3023
EBUILD vsftpd-2.0.6.ebuild 3049 RMD160 29794b069c64d837c044c7100bd2e1117e6971b9 SHA1 a6eda2f4704f5b4e2a11d8becfc1ece6ccfacd25 SHA256 64375e14aa29f2e758eff5ae69922fa854bcda43bcea3b313ebeaca208347f15
-MISC ChangeLog 13663 RMD160 dba15067cfa12ff486505f39fc419da7b92308a6 SHA1 49c3fda366dd8b27179bb10a1f60488a0596c236 SHA256 52a5fc1dc9bc9b28f4ab0424b5325bbdca2c68d72f56b8511dbe5449a7a13b27
+MISC ChangeLog 13848 RMD160 312c91cff1d4a165a009ef42c76d9b8c9cb63b27 SHA1 bb03f585e66b7204d8109d507a0be35a82baf232 SHA256 3f44ebe283babecaf8d8bf87716723996a2076d9abfb5778b79b0729a890dbe0
MISC metadata.xml 358 RMD160 f8ffc0942c689c54a62b078a9a5bcd44702a5e68 SHA1 a252bf60d812dad06cbe00c324671cfba7b4e991 SHA256 cdc354a30f912a068432b3de197b3886ac05661869e7a0f67ac29f1da04b3b0d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkgrY+8ACgkQAiZjviIA2XiAgACfW1ZQAB+btUuU9EaRnDnBl1/Z
-g9AAnj8iqBqLOoZtWnFokKRnIoYIo85a
-=18LW
------END PGP SIGNATURE-----
diff --git a/net-ftp/vsftpd/files/vsftpd.init b/net-ftp/vsftpd/files/vsftpd.init
index 591679fd038e..8e280817bd98 100644
--- a/net-ftp/vsftpd/files/vsftpd.init
+++ b/net-ftp/vsftpd/files/vsftpd.init
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 2003-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/files/vsftpd.init,v 1.5 2007/04/10 13:00:55 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/files/vsftpd.init,v 1.6 2008/06/02 04:18:15 darkside Exp $
VSFTPD_NAME=${SVCNAME##*.}
if [ -n "${VSFTPD_NAME}" -a "${SVCNAME}" != "vsftpd" ]; then
@@ -56,8 +56,7 @@ start() {
stop() {
ebegin "Stopping ${SVCNAME}"
- start-stop-daemon --stop --exec /usr/sbin/vsftpd \
- --pidfile "${VSFTPD_PID}"
+ start-stop-daemon --stop --exec /usr/sbin/vsftpd
eend $?
}