Really fix init script --quiet reload, patch by Bernd Lommerzheim, bug #314055

Package-Manager: portage-2.2.0_alpha4/cvs/Linux x86_64

3 files changed, 17 insertions, 16 deletions

diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog
index ec5fd5e91e18..28aeabdf3608 100644
--- a/net-ftp/proftpd/ChangeLog
+++ b/net-ftp/proftpd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-ftp/proftpd
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.249 2010/11/16 12:54:15 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.250 2010/11/16 13:00:29 voyageur Exp $
+
+  16 Nov 2010; Bernard Cafarelli <voyageur@gentoo.org> files/proftpd.initd:
+  Really fix init script --quiet reload, patch by Bernd Lommerzheim, bug
+  #314055
 
   16 Nov 2010; Bernard Cafarelli <voyageur@gentoo.org>
   -files/proftpd-1.3.2-mysql-include.patch,
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index cd804dd7eb59..67c10cf63ae4 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -1,5 +1,5 @@
 AUX proftpd.conf.sample 1275 RMD160 199b8cced06d347ef8a2033b68850fd9dd922ccd SHA1 e58e5e7856bc77e159a628717ad1c73e20c5b883 SHA256 a214b3937f319c70976d29cfcd47c2cd937d1d70b7274c2b241b1e97606e89c0
-AUX proftpd.initd 1628 RMD160 944b3e8e4ffd008d7fef55a09e8d374f5ca74597 SHA1 fa39e5a2a06bbf3fdf5c50be55c8d3c7f87a23f2 SHA256 167fac1a864179a53e4ea26377ec2fe9b5e60d9ba564f37f5b86474b18c2fd43
+AUX proftpd.initd 1563 RMD160 c30ab2c000ca31a348e0c9d92e07d93c5cba8d4e SHA1 7462aaec25c6f44928339458d450f7e386b147d4 SHA256 fe36a50fcf1a2d7b820edde94349cd68204e7b14c8a5d34f710af68ed1ce8315
 AUX proftpd.xinetd 295 RMD160 c5c829319e901f478fe58b920347cc1b8706a366 SHA1 3f1bd8d6cbb1488301b9aa0346e02b571fd0783a SHA256 150a5701f5c2788ecdf2c6ec228ce674963c9dc7bc1c511ad1eba8dfe05e2d5d
 DIST mod_clamav-0.11rc.tar.gz 5115 RMD160 1b7f0bf94ed4664f873848e0fedee493f18726b8 SHA1 26fa4a8106fbb3266e7c94f50f12ed74fb2f3fec SHA256 87630eb1866066d6320ee711897d8998b8f4915c0498b2e78cc0464abd34855a
 DIST mod_gss-1.3.3.tar.gz 115098 RMD160 6a772ea215db7af94223fbb3bbb84614d1f7cf30 SHA1 b17015a49e41ee643f1891940f9f3f8a7d77e522 SHA256 24702cf0333720730cc269eb30529061365b1384fdce274bc3d46ccfc300934e
@@ -8,5 +8,5 @@ DIST proftpd-mod-case-0.4.tar.gz 4849 RMD160 fdf579587461c0ad2136f6cc1e3064efe31
 DIST proftpd-mod-deflate-0.5.4.tar.gz 55219678 RMD160 0d9ac70d076de3be521492d0c79089291a1b6dfd SHA1 292ba9dd301a010c46906ec09b5d455ff2b8ee4f SHA256 6ae753608ad126067bd48da8d4ea6ac3ef8eaf339ae924ffdbe30d1819a5e5db
 DIST proftpd-mod-vroot-0.8.5.tar.gz 8349 RMD160 0e9c3ea9615ed74556fcaf6145863922ee45bedf SHA1 fea69382f4dda36b620780e69cef5872f41f86fe SHA256 305ad1e3b320dc21172982c54a614a09d43373f7289b63202788de640145bbd4
 EBUILD proftpd-1.3.3c.ebuild 7180 RMD160 0224857289f16e1a9a9115b6640754f07a3fb35c SHA1 0b66f216073618128dd4f5cc04701178db963083 SHA256 581675c43c65aeb100a6abe8427bce2af571df256ec2d93a1746bf49a3311bc9
-MISC ChangeLog 41883 RMD160 1e2c52f6cb05a2d948210d7bb7a18024d7d2ec31 SHA1 082ad4b5b69544a3df698066195f21e0cca4803d SHA256 2b1d9d23157ad0dd0073254939e4c181cf622059a8c8cf5d8a660c9f2196a2f5
+MISC ChangeLog 42043 RMD160 2138a1368553221e4aca0df7e5c84750e8be5b26 SHA1 9143d553cbd8df21d0f4718f4a20e008d7091125 SHA256 b8262dd4c71efb02b956756ad885d0876a1609795209ce339fd27b5010e71f35
 MISC metadata.xml 1671 RMD160 7ab8bc2be652f3358f83238dd526d271eaf27cf2 SHA1 9818b3a7957e30b8aa739708e614000108e863f7 SHA256 3d51a9f6b7f3cc3833c09e8a25cdacd3f25723c522f1bf6766277aee490d048e
diff --git a/net-ftp/proftpd/files/proftpd.initd b/net-ftp/proftpd/files/proftpd.initd
index d5a0eb79807c..ff03b411488b 100644
--- a/net-ftp/proftpd/files/proftpd.initd
+++ b/net-ftp/proftpd/files/proftpd.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/files/proftpd.initd,v 1.2 2010/07/29 21:50:32 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/files/proftpd.initd,v 1.3 2010/11/16 13:00:29 voyageur Exp $
 
 opts="reload"
 
@@ -16,13 +16,13 @@ check_configuration() {
 		eerror "file. In /etc/proftpd you can find a sample configuration."
 		return 1
 	fi
- 	/usr/sbin/proftpd -t &>/dev/null
- 	if [ $? -ne 0 ] ; then
- 		eerror "The ProFTPD configuration file /etc/proftpd/proftpd.conf is invalid! You have to"
- 		eerror "fix your configuration in order to run the ProFTPD server. For more information"
- 		eerror "you may execute the ProFTPD configuration check '/usr/sbin/proftpd -t'."
- 		return 2
- 	fi
+	/usr/sbin/proftpd -t &>/dev/null
+	if [ $? -ne 0 ] ; then
+		eerror "The ProFTPD configuration file /etc/proftpd/proftpd.conf is invalid! You have to"
+		eerror "fix your configuration in order to run the ProFTPD server. For more information"
+		eerror "you may execute the ProFTPD configuration check '/usr/sbin/proftpd -t'."
+		return 2
+	fi
 }
 
 start() {
@@ -44,12 +44,9 @@ stop() {
 }
 
 reload() {
-	if [ ! -f /var/run/proftpd/proftpd.pid ] ; then
-		eerror "ProFTPD is not running."
-		return 1
-	fi
 	check_configuration || return 1
 	ebegin "Reloading ProFTPD"
-	kill -HUP `cat /var/run/proftpd/proftpd.pid` &>/dev/null
+	start-stop-daemon --stop --quiet --signal HUP --oknodo \
+		--pidfile /var/run/proftpd/proftpd.pid
 	eend $?
 }