Fix init script, bug 234278

Package-Manager: portage-2.1.6.3/cvs/Linux 2.6.27-gentoo-r7 i686

5 files changed, 20 insertions, 131 deletions

diff --git a/net-ftp/vsftpd/ChangeLog b/net-ftp/vsftpd/ChangeLog
index 2cbae9c96428..1898d5990a68 100644
--- a/net-ftp/vsftpd/ChangeLog
+++ b/net-ftp/vsftpd/ChangeLog
@@ -1,6 +1,12 @@
 # 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.101 2008/08/21 22:51:37 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.102 2008/12/26 16:50:16 armin76 Exp $
+
+*vsftpd-2.0.7-r1 (26 Dec 2008)
+
+  26 Dec 2008; Raúl Porcel <armin76@gentoo.org> files/vsftpd.init,
+  -vsftpd-2.0.5-r3.ebuild, -vsftpd-2.0.7.ebuild, +vsftpd-2.0.7-r1.ebuild:
+  Fix init script, bug 234278
 
   21 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
   add GLEP 56 USE flag desc from use.local.desc
diff --git a/net-ftp/vsftpd/Manifest b/net-ftp/vsftpd/Manifest
index cfeee9b0e899..e766c6a3b109 100644
--- a/net-ftp/vsftpd/Manifest
+++ b/net-ftp/vsftpd/Manifest
@@ -1,26 +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 1706 RMD160 206f46f61b78f279c09d5a4e3a011020c24accd1 SHA1 d8d80d6a22d51619cf64541e9911260ebf709c5e SHA256 4d8b6a01669948d33c6a9b2d757d6f651a7261a79d68d90c2cad5b17da713440
+AUX vsftpd.init 1922 RMD160 50925ca15a4f94662790244546454c523b6e4f95 SHA1 ef453f4925e941e21075be678387076e57246b3d SHA256 78941ea7744d65d4674b4df8ecee6df91e6ed601c47d64ce1f489af56ea250e2
 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
 DIST vsftpd-2.0.7.tar.gz 162801 RMD160 8947c7ae00214fb30c9d7d2cfba5116643e1d8c7 SHA1 760afe849d1ebe10592ef29032b6e00e7f1bbf79 SHA256 5d86a6d627f2d8e35dbdefdbd445f6016d349955107b247076bbcc36cde1046b
-EBUILD vsftpd-2.0.5-r3.ebuild 3137 RMD160 8811a452f2468fbeae101b5656f012bb3b795650 SHA1 826bbaef7734756449be0e55f7d4e639be1d2095 SHA256 f6dabaffbee5306548f8c8ba434f99941885007b1fc85d3cc5dbab9fe61b3023
 EBUILD vsftpd-2.0.6.ebuild 3044 RMD160 cf2e521ad9956cd0012d3f96142f94fdcf8224da SHA1 8b398867467e17bf923739214ce129f3badd8c9b SHA256 04be29d36f762c17711cfb0fed0beced92ec3d43cc3efc461742387b7c3cd8e9
-EBUILD vsftpd-2.0.7.ebuild 3054 RMD160 cd72276550fdee13f3ba81622789b14de6a911ec SHA1 e2a1ea7a5d7382fb961a8c7a916417bd709eac9b SHA256 9dd41e807a9d682edf360f63123b890799bfa327077202d0c5ce57774f75e310
-MISC ChangeLog 14076 RMD160 f68735f1ee78aa5e21b9df4c54c9529f7dd2e7f0 SHA1 5d7881c755ab8eedc7d3199e63fcd002e91c37f1 SHA256 b5b9019a7e403125516a82d60d436072b712ebf7f29a3a7dbe53aab0c4b5a047
+EBUILD vsftpd-2.0.7-r1.ebuild 3057 RMD160 def2a74d903e8ce27681ef3838dd1ea8636ce7d7 SHA1 5fb4a5edcc0737e7121f4ee946feabeec111711a SHA256 60dc1e4b19d1481fb21abec2a492cf8244b93a2c8a299f7cb3f6f46fd0a53fde
+MISC ChangeLog 14282 RMD160 ed683e860cc6a6ff0a836bea4ec1cd99b7e5f4dd SHA1 a404bc0a4015c3a5dcf7d7e1ee5505055eddeca4 SHA256 9f11de566f4222ef48b03ad739b327c6d3b31585ccdc8528e5b9d34691c76e22
 MISC metadata.xml 461 RMD160 278f77b63e921b04c1f5dbba5ccdce9a9ea102ba SHA1 ab6b6b939d90e49d290a562dda3a053b9aaba3bd SHA256 c317698005dced22f4bfe2b4cc97d1671db4ba337d6452501e842c385ae9a433
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkkSVvUACgkQ67wieSYcaxebJgCfe4EB8XL6W+2l2UdKCjTskIHf
-EsgAn1GNVwiPwMon5Zfcf/rlFQ0Qsz4o
-=fva8
------END PGP SIGNATURE-----
diff --git a/net-ftp/vsftpd/files/vsftpd.init b/net-ftp/vsftpd/files/vsftpd.init
index 8e280817bd98..e486e1fc0863 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.6 2008/06/02 04:18:15 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/files/vsftpd.init,v 1.7 2008/12/26 16:50:15 armin76 Exp $
 
 VSFTPD_NAME=${SVCNAME##*.}
 if [ -n "${VSFTPD_NAME}" -a "${SVCNAME}" != "vsftpd" ]; then
@@ -12,6 +12,7 @@ else
     VSFTPD_CONF_DEFAULT="/etc/vsftpd/vsftpd.conf"
 fi
 VSFTPD_CONF=${VSFTPD_CONF:-${VSFTPD_CONF_DEFAULT}}
+VSFTPD_EXEC=${VSFTPD_EXEC:-/usr/sbin/vsftpd}
 
 depend() {
 	need net
@@ -48,7 +49,7 @@ checkconfig() {
 start() {
 	checkconfig || return 1
 	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --exec /usr/sbin/vsftpd \
+	start-stop-daemon --start --exec ${VSFTPD_EXEC} \
 		--background --make-pidfile --pidfile "${VSFTPD_PID}" \
 		-- "${VSFTPD_CONF}"
 	eend $?
@@ -56,7 +57,12 @@ start() {
 
 stop() {
 	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --exec /usr/sbin/vsftpd 
+	if [ -f ${VSFTPD_PID} ]; then
+		start-stop-daemon --stop --pidfile ${VSFTPD_PID} 
+	else
+		ewarn "Couldn't found ${VSFTPD_PID} trying to stop over the process name ${SVCNAME}"
+		start-stop-daemon --stop --name ${SVCNAME}
+	fi
 	eend $?
 }
 
diff --git a/net-ftp/vsftpd/vsftpd-2.0.5-r3.ebuild b/net-ftp/vsftpd/vsftpd-2.0.5-r3.ebuild
deleted file mode 100644
index 0181c9a34d4d..000000000000
--- a/net-ftp/vsftpd/vsftpd-2.0.5-r3.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-2.0.5-r3.ebuild,v 1.5 2008/05/14 22:12:57 flameeyes Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Very Secure FTP Daemon written with speed, size and security in mind"
-HOMEPAGE="http://vsftpd.beasts.org/"
-SRC_URI="ftp://vsftpd.beasts.org/users/cevans/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="caps logrotate pam tcpd ssl selinux xinetd"
-
-DEPEND="caps? ( sys-libs/libcap )
-	pam? ( virtual/pam )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	ssl? ( >=dev-libs/openssl-0.9.7d )"
-RDEPEND="${DEPEND}
-	net-ftp/ftpbase
-	logrotate? ( app-admin/logrotate )
-	selinux? ( sec-policy/selinux-ftpd )
-	xinetd? ( sys-apps/xinetd )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Patch the source, config and the manpage to use /etc/vsftpd/
-	epatch "${FILESDIR}/${PN}-2.0.3-gentoo.patch"
-
-	# Fix building without the libcap
-	epatch "${FILESDIR}/${PN}-2.0.6-caps.patch"
-	has_version "<sys-libs/libcap-2" && epatch "${FILESDIR}"/${PN}-2.0.6-libcap1.patch
-
-	# Fix anon umask uploads, #183213.
-	epatch "${FILESDIR}/${P}-anon-upload-umask.patch"
-
-	# Configure vsftpd build defaults
-	use tcpd && echo "#define VSF_BUILD_TCPWRAPPERS" >> builddefs.h
-	use ssl && echo "#define VSF_BUILD_SSL" >> builddefs.h
-	use pam || echo "#undef VSF_BUILD_PAM" >> builddefs.h
-
-	# Ensure that we don't link against libcap unless asked
-	if ! use caps ; then
-		sed -i '/^#define VSF_SYSDEP_HAVE_LIBCAP$/ d' sysdeputil.c
-		sed -i '/libcap/ d' vsf_findlibs.sh
-	fi
-
-	# Let portage control stripping
-	sed -i '/^LINK[[:space:]]*=[[:space:]]*/ s/-Wl,-s//' Makefile
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die
-}
-
-src_install() {
-	into /usr
-	doman vsftpd.conf.5 vsftpd.8
-	dosbin vsftpd || die
-
-	dodoc AUDIT BENCHMARKS BUGS Changelog FAQ \
-		README README.security REWARD SIZE \
-		SPEED TODO TUNING
-	newdoc vsftpd.conf vsftpd.conf.example
-
-	docinto security
-	dodoc SECURITY/*
-
-	insinto "/usr/share/doc/${PF}/examples"
-	doins -r EXAMPLE/*
-
-	insinto /etc/vsftpd
-	newins vsftpd.conf vsftpd.conf.example
-
-	if use logrotate ; then
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/vsftpd.logrotate" vsftpd
-	fi
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/vsftpd.xinetd" vsftpd
-	fi
-
-	newinitd "${FILESDIR}/vsftpd.init" vsftpd
-
-	keepdir /usr/share/vsftpd/empty
-}
-
-pkg_preinst() {
-	# If we use xinetd, then we comment out listen=YES
-	# so that our default config works under xinetd - fixes #78347
-	if use xinetd ; then
-		sed -i '/\listen=YES/s/^/#/g' "${D}"/etc/vsftpd/vsftpd.conf.example
-	fi
-}
-
-pkg_postinst() {
-	einfo "vsftpd init script can now be multiplexed."
-	einfo "The default init script forces /etc/vsftpd/vsftpd.conf to exist."
-	einfo "If you symlink the init script to another one, say vsftpd.foo"
-	einfo "then that uses /etc/vsftpd/foo.conf instead."
-	einfo
-	einfo "Example:"
-	einfo "   cd /etc/init.d"
-	einfo "   ln -s vsftpd vsftpd.foo"
-	einfo "You can now treat vsftpd.foo like any other service"
-}
diff --git a/net-ftp/vsftpd/vsftpd-2.0.7.ebuild b/net-ftp/vsftpd/vsftpd-2.0.7-r1.ebuild
index 9248e031b29b..b947cf890141 100644
--- a/net-ftp/vsftpd/vsftpd-2.0.7.ebuild
+++ b/net-ftp/vsftpd/vsftpd-2.0.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-2.0.7.ebuild,v 1.1 2008/07/31 09:58:14 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-2.0.7-r1.ebuild,v 1.1 2008/12/26 16:50:16 armin76 Exp $
 
 inherit eutils toolchain-funcs