Drop funky custom env cleaning as ssd does it for us now #253178 by Erik Hahn.

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.28 x86_64

3 files changed, 25 insertions, 27 deletions

diff --git a/sys-apps/xinetd/ChangeLog b/sys-apps/xinetd/ChangeLog
index 0548d4608475..cc915ac6f5cb 100644
--- a/sys-apps/xinetd/ChangeLog
+++ b/sys-apps/xinetd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/xinetd
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/xinetd/ChangeLog,v 1.46 2008/12/20 09:45:38 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/xinetd/ChangeLog,v 1.47 2008/12/31 09:06:44 vapier Exp $
+
+  31 Dec 2008; Mike Frysinger <vapier@gentoo.org> files/xinetd.rc6:
+  Drop funky custom env cleaning as ssd does it for us now #253178 by Erik
+  Hahn.
 
   20 Dec 2008; Peter Volkov <pva@gentoo.org> xinetd-2.3.13.ebuild,
   xinetd-2.3.14.ebuild:
diff --git a/sys-apps/xinetd/Manifest b/sys-apps/xinetd/Manifest
index 93d1c3ec57bd..eff532c0d394 100644
--- a/sys-apps/xinetd/Manifest
+++ b/sys-apps/xinetd/Manifest
@@ -1,22 +1,19 @@
-AUX etc.xinetd.d/README.services 643 RMD160 44c6cd5dacd44cf3ed3c25e66220da1a016a9f65 SHA1 2a68f1d0dae141e38c0d399b4539a5122fd42f09 SHA256 0383c2898a5b21a75af197998e57c49c77758716894c9e88fbf3ad9e82a25a5b
-AUX etc.xinetd.d/chargen-tcp 246 RMD160 dcf63b048f5b4f8975005a6a72864b91f3efb408 SHA1 dffe4c49cb9019a7911261168900384c1ccf313b SHA256 c9ac1f047712da37f3d8b171fe0478b4ded77c0a47b63d4663d0949d12bebb69
-AUX etc.xinetd.d/chargen-udp 266 RMD160 fefd998de3e35d503b8c593b82d7c1ff26b98ffb SHA1 fab55d9db34daeb19f949e3a767589d651e69630 SHA256 8e108f521dcdcb6f99fde3c251b0d21f0ee7e317a07875b0253a8f5685e7e553
-AUX etc.xinetd.d/daytime-tcp 246 RMD160 6f3d5b676ac2e1458869a5f999d6bc9a45451812 SHA1 24e3efc969008ebdf2cbcab7a4b7d12423bfcb2d SHA256 b3ca856f63766e9403bc67766122c933d75a627b3febba1b3698fa8862fca20a
-AUX etc.xinetd.d/daytime-udp 272 RMD160 b9a74eaca34dec469bfea093156a42ae45c3cfe4 SHA1 c1c5f4c917f94ce3a57ac8d2495ff6ce946dd0c0 SHA256 5dc2e34a3dea9de1f15f66c66ef19bb70ce20e1df3bdec78a095a8d72641b140
-AUX etc.xinetd.d/echo-tcp 238 RMD160 e229ebb1395e1ba00ba1d1dd222c18faeb16abf4 SHA1 295bc2c5dde8919081dd5c18fc1f93a7567a8ba6 SHA256 2b4005d27369d017e073f7eb426aa45226557a7bcde8ed25a3b3a89bb2d49ea7
-AUX etc.xinetd.d/echo-udp 263 RMD160 91384db79f3167ced66f567b4e29cd888c2366f3 SHA1 18beae5d32c71b3e883f1bbb6dda96b1e836483b SHA256 594836488f2d23ba3cf5c514bc93d72f7934130498693a16f936dc1bbf7f1fdd
-AUX etc.xinetd.d/time-tcp 270 RMD160 2148ec99eacc092930ef23cafdb522a16beeaf4e SHA1 5135ed63cdfaecbc217d1675237fc465cb862660 SHA256 46f802b6ff5ceef9158a9d297035b2d2398606583a369290973cc48fb733af88
-AUX etc.xinetd.d/time-udp 272 RMD160 7138ccd9f496af727e59fceb1c6c4ee268d73f97 SHA1 161ae79c86bb8efb23ca51b82b7391b40ab69a88 SHA256 6c39c7a1fb0b788ca075b478ec79d94cf55990a13090ded13a91b690bbf94c80
-AUX xinetd-2.3.13-gcc4.patch 893 RMD160 3a77bc5db1e63fae0a1b12eb2e7425eca7ccc65e SHA1 a6418984ac9f8546e1752c40e45efdd0c83620ff SHA256 9de0dc8f8149ed6b26c878d5de4a7c9523be3632ed0316a502fd69e5cf6b97e2
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX xinetd-2.3.14-DESTDIR.patch 1725 RMD160 db439670f48e887cb79574507eba85a1b3fc7e35 SHA1 783b5259cb774d74e71a7d3bb3c5569e325afc67 SHA256 928e078070c2b662cd53808c16c5217a9f7f46e31132254bbf19f5efc39b0bc4
 AUX xinetd-2.3.14-config.patch 154 RMD160 2bc92051859da103070d3b26a2922b2fb3eacbe1 SHA1 e07d8aca9684d5c525a7485eb7f43a7df2cb88b3 SHA256 9aa8641d7462a2566770ad93efe13004c5b8c02374221f7b7bd1382c805ffc2e
 AUX xinetd-2.3.14-install-contrib.patch 728 RMD160 85f9ed2fd5c932ee5a63e02218242a6f84dbd5ee SHA1 64eecf162ba3f1d80959644ab79806f313fe7aa3 SHA256 e76479ccf5f5763a1365f3ad59edf30f20e77147b8e012d2cee179fc72298d8a
-AUX xinetd.conf 259 RMD160 a8f40b11f94d302ac6b2d3828e5a1b6b01d6fe2a SHA1 d3325f61b1c9f564e5e8490d5b65f2db5906fe14 SHA256 93610a90ec8050cd0567f42b66d99fc01459cb30db9b6afcdafb43141fdfca9e
 AUX xinetd.confd 90 RMD160 e06f0c374f4a3f05f9509d9aa3571692a0e4e783 SHA1 90628a05cccfff4c85d9cb05c77a0a12c8dfff6c SHA256 e401e2cf7c0180a170d3dc3e91d7e98002bae7b013df72813b7bcf89b864fb3a
-AUX xinetd.rc6 868 RMD160 509323618560309a6c42f830b0ecdf07bba756b2 SHA1 ced6b2d28c6b6ae332700dcef5e08fd335b9f4c5 SHA256 eb382cdf1fa828cb6bc5025b9c52cc562210589202d2dfc9fae26cf11aea1b99
-DIST xinetd-2.3.13.tar.gz 297548 RMD160 1a601f4238e13cf20c2ad8a807ea35a84331c6a8 SHA1 fef268d88e0fa2e02e709cf491d752a2b17c30aa SHA256 eddfd1bf3684eaff3a7ba424421d3126878a7469ced0f3d370c7cf66bde64522
+AUX xinetd.rc6 827 RMD160 1167efffbd8aec1c84186e62fc06802e4aeb71ef SHA1 99032723417d6c54b98264168a982634cdc69671 SHA256 5fc5c85540416419e423916560acbbeba3bac9c295e677576e1b8dc060e42f73
 DIST xinetd-2.3.14.tar.gz 301703 RMD160 03d59f99b7818f2e6c4ca50fe13a092c82d010be SHA1 6e9f0e0b0e04328f106851682ec707c61448ee69 SHA256 760e0e617c609a0509ef63fc7e9580d2f1d88c6113bb6d63273de7de7cd0bc1f
-EBUILD xinetd-2.3.13.ebuild 1997 RMD160 822c8791948da6d9900cdd191dbc494e5728375f SHA1 cfeebe01bf232bb6094df9d945c6392d663151be SHA256 ef8f1755dea24658678c344fd6145b8932aee5590350533bd13554387e3c8c7e
 EBUILD xinetd-2.3.14.ebuild 1698 RMD160 81479346b6b93f84ffc2fa135445d68dd39e9d93 SHA1 daa99a62db6fe4f6d47381fa168bb8f63e2bc6d0 SHA256 554ae2dfc6f5e9676542bea19c52281f7e3ffc5856abfe9d982e15e0f694efe5
-MISC ChangeLog 6644 RMD160 955aab6575bb2f1d16480c205218849bbdaa27c3 SHA1 76664e316c7511d65b815ef3d84448d09d5b56d9 SHA256 123046d47a9e40c1b370758b998d1905eaf91d3833359ab80962b531e9bdc340
+MISC ChangeLog 6799 RMD160 0ed6f48b28346f5f6324d08c70c9f7c140cd51a0 SHA1 c5a779656f1a0d4ad218073aa0b02675f37da89f SHA256 e956e56750ca6a5ef3ea94f1f15eabedb1fc9f3c46f29022229359bd15a4f7af
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAklbNi0ACgkQn/5bYzqsSmFGMwCfYRSweBJdKM2m5shGEcw14h9h
+hzwAnjmiA0Nd8iz5aZHlK67mKbiLzJDm
+=BW7x
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/xinetd/files/xinetd.rc6 b/sys-apps/xinetd/files/xinetd.rc6
index 72b338690da5..31104fc75c9e 100644
--- a/sys-apps/xinetd/files/xinetd.rc6
+++ b/sys-apps/xinetd/files/xinetd.rc6
@@ -1,9 +1,9 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/xinetd/files/xinetd.rc6,v 1.19 2005/07/30 07:34:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/xinetd/files/xinetd.rc6,v 1.20 2008/12/31 09:06:44 vapier Exp $
 
-opts="start stop reload restart dump check"
+opts="reload dump check"
 
 depend() {
 	use net
@@ -11,11 +11,8 @@ depend() {
 
 start() {
 	ebegin "Starting xinetd"
-	(
-	# workaround for #25754
-	unset -f `declare -F | sed 's:declare -f::g'`
-	/usr/sbin/xinetd -pidfile /var/run/xinetd.pid ${XINETD_OPTS}
-	)
+	start-stop-daemon --start --pidfile /var/run/xinetd.pid -- \
+		xinetd -pidfile /var/run/xinetd.pid ${XINETD_OPTS}
 	eend $?
 }
 
@@ -25,19 +22,19 @@ stop() {
 	eend $?
 }
 
-reload(){
+reload() {
 	ebegin "Reloading configuration"
 	killall -HUP xinetd &>/dev/null
 	eend $?
 }
 
-dump(){
+dump() {
 	ebegin "Dumping configuration"
 	killall -USR1 xinetd &>/dev/null
 	eend $?
 }
 
-check(){
+check() {
 	ebegin "Performing Consistency Check"
 	killall -IOT xinetd &>/dev/null
 	eend $?