From dfe8df3576e5cc423d631bc78b469dbf4bb27a6a Mon Sep 17 00:00:00 2001 From: Stewart Honsberger Date: Sat, 24 Jan 2004 07:31:31 +0000 Subject: Re Bug #28345; added "--retry 20" to start-stop-daemon to check --- net-ftp/proftpd/ChangeLog | 6 +++++- net-ftp/proftpd/Manifest | 30 +++++++++++++++--------------- net-ftp/proftpd/files/proftpd.rc6 | 4 ++-- 3 files changed, 22 insertions(+), 18 deletions(-) (limited to 'net-ftp') diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog index 15bef19c9085..0ed49b3cb0e6 100644 --- a/net-ftp/proftpd/ChangeLog +++ b/net-ftp/proftpd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-ftp/proftpd # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.47 2004/01/24 04:38:49 raker Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.48 2004/01/24 07:31:23 blkdeath Exp $ + + 24 Jan 2004; Stewart Honsberger files/proftpd.rc6: + Re: Bug #28345 added "--retry 20" to start-stop-daemon line in init script + to account for stray processes. 23 Jan 2004; Nick Hadaway proftpd-1.2.9.ebuild: Removed libpcap dependancy. See bug #36291. Also removed unneeded diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest index e033315a7734..0f153a1d1cd2 100644 --- a/net-ftp/proftpd/Manifest +++ b/net-ftp/proftpd/Manifest @@ -1,24 +1,24 @@ -MD5 3bc8ce3f5baacf0756ccc0a5d7d08ce9 proftpd-1.2.9_rc2.ebuild 3036 -MD5 9fc268673f01fb44ccbeb1ba9b03fe10 proftpd-1.2.8.ebuild 2735 -MD5 4f9ff456a1e0bc583b44fff8c2392e40 proftpd-1.2.9_rc2-r1.ebuild 3160 +MD5 d9f131dca3dcc5fa14c602397c0add28 ChangeLog 7683 +MD5 63bd6e87942a25d48bd5365edd8246c0 metadata.xml 268 MD5 af980038dfeb68c33f10ce7f7a8664bd proftpd-1.2.5-r1.ebuild 2484 -MD5 f29eb6e755937b7bd540ae7a64309a49 proftpd-1.2.9_rc1.ebuild 2908 MD5 8403cc3447fabc18a92eeb5dc891ed26 proftpd-1.2.7.ebuild 3668 +MD5 9fc268673f01fb44ccbeb1ba9b03fe10 proftpd-1.2.8.ebuild 2735 +MD5 f29eb6e755937b7bd540ae7a64309a49 proftpd-1.2.9_rc1.ebuild 2908 +MD5 4f9ff456a1e0bc583b44fff8c2392e40 proftpd-1.2.9_rc2-r1.ebuild 3160 +MD5 3bc8ce3f5baacf0756ccc0a5d7d08ce9 proftpd-1.2.9_rc2.ebuild 3036 MD5 8b61bc1b4a71805531b36c33915858dd proftpd-1.2.9_rc3.ebuild 3123 MD5 6beb385b17a46530128b779f30adeb0b proftpd-1.2.9.ebuild 3014 -MD5 2438a60ece5d25484858642166aab963 ChangeLog 7493 -MD5 63bd6e87942a25d48bd5365edd8246c0 metadata.xml 268 -MD5 e0d8b83173f9686a34c7ad858232d4dd files/proftpd.rc6 739 -MD5 b338504ed873219e368abab7df6c276d files/proftpd.conf 1704 +MD5 6236a589ef01778d118911281b20be51 files/digest-proftpd-1.2.5-r1 66 MD5 c1dc1d9278d5b77f53ea44ee848dafc6 files/digest-proftpd-1.2.7 211 MD5 cb6cd6133728449d0da092b1d6147b9d files/digest-proftpd-1.2.8 66 -MD5 6c1a92fc601780a49fdfc01aaf483b69 files/digest-proftpd-1.2.9 66 -MD5 0cf02f8c82f22e714b8299e7b7907d8f files/mod_sql_postgres.c.patch 275 -MD5 4d676b70c97bc6daabd8c2ba8d52d27a files/proftpd.xinetd 295 -MD5 2cb235867cee126fe540c911c3b5ad5b files/proftpd-1.2.9_rc2-dirtree-r118.patch 474 -MD5 836a8039f80567f9bb82951c450fb51e files/digest-proftpd-1.2.9_rc2-r1 70 MD5 2cb8d1fb115bf19c162c4b6510f98bca files/digest-proftpd-1.2.9_rc1 69 +MD5 0cf02f8c82f22e714b8299e7b7907d8f files/mod_sql_postgres.c.patch 275 +MD5 b338504ed873219e368abab7df6c276d files/proftpd.conf 1704 MD5 836a8039f80567f9bb82951c450fb51e files/digest-proftpd-1.2.9_rc2 70 -MD5 3db5027a53a7d9d889c5a75df90d77b0 files/digest-proftpd-1.2.9_rc3 69 -MD5 6236a589ef01778d118911281b20be51 files/digest-proftpd-1.2.5-r1 66 MD5 e558f099037d359da5f855285542246e files/1.2.9_rc3-reversedns.diff 1974 +MD5 836a8039f80567f9bb82951c450fb51e files/digest-proftpd-1.2.9_rc2-r1 70 +MD5 3db5027a53a7d9d889c5a75df90d77b0 files/digest-proftpd-1.2.9_rc3 69 +MD5 2cb235867cee126fe540c911c3b5ad5b files/proftpd-1.2.9_rc2-dirtree-r118.patch 474 +MD5 6c1a92fc601780a49fdfc01aaf483b69 files/digest-proftpd-1.2.9 66 +MD5 4d676b70c97bc6daabd8c2ba8d52d27a files/proftpd.xinetd 295 +MD5 7ce232be10244976221ed99e6a460805 files/proftpd.rc6 750 diff --git a/net-ftp/proftpd/files/proftpd.rc6 b/net-ftp/proftpd/files/proftpd.rc6 index d43f2aebbc52..32da8f04f40b 100644 --- a/net-ftp/proftpd/files/proftpd.rc6 +++ b/net-ftp/proftpd/files/proftpd.rc6 @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/files/proftpd.rc6,v 1.6 2003/11/06 03:24:28 blkdeath Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/files/proftpd.rc6,v 1.7 2004/01/24 07:31:23 blkdeath Exp $ depend() { need net @@ -24,6 +24,6 @@ start() { stop() { ebegin "Stopping proftpd" - start-stop-daemon --stop --quiet --pidfile /var/run/proftpd.pid + start-stop-daemon --stop --retry 20 --quiet --pidfile /var/run/proftpd.pid eend $? } -- cgit v1.2.3-65-gdbad