Dont use a tempfile in init.d restart() #146624 by Stefan Hellermann.

Package-Manager: portage-2.1.1_rc1-r6

4 files changed, 66 insertions, 18 deletions

diff --git a/net-nds/portmap/ChangeLog b/net-nds/portmap/ChangeLog
index cb5b78d019ec..4e38ead3f98f 100644
--- a/net-nds/portmap/ChangeLog
+++ b/net-nds/portmap/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-nds/portmap
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/portmap/ChangeLog,v 1.32 2005/08/23 13:21:37 flameeyes Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/portmap/ChangeLog,v 1.33 2006/09/09 08:28:05 vapier Exp $
+
+  09 Sep 2006; Mike Frysinger <vapier@gentoo.org> files/portmap.rc6:
+  Dont use a tempfile in init.d restart() #146624 by Stefan Hellermann.
 
   23 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> portmap-5b-r9.ebuild:
   Use -1 instead of /bin/false on enewuser call.
diff --git a/net-nds/portmap/Manifest b/net-nds/portmap/Manifest
index 294bc30fd087..14fc11e3c98e 100644
--- a/net-nds/portmap/Manifest
+++ b/net-nds/portmap/Manifest
@@ -1,25 +1,70 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 f328e9265f2f5610d9d8d0c3b1b7a513 ChangeLog 4535
-MD5 44dae63001c0ad007604a7ba55403838 files/digest-portmap-5b-r9 64
+AUX portmap-4.0-cleanup.patch 2193 RMD160 f4e4008039098ac6757e7e282b5a0267b9ebf680 SHA1 0ec43df5c8efbb23b9df89ebce766aebb82b0071 SHA256 878f0dc9f57e5a868ba0e76d6f7c81ed9a4ea17dcf32ac1a6078762e1b2acf8b
 MD5 c4cab1b374730a709460d95211200852 files/portmap-4.0-cleanup.patch 2193
+RMD160 f4e4008039098ac6757e7e282b5a0267b9ebf680 files/portmap-4.0-cleanup.patch 2193
+SHA256 878f0dc9f57e5a868ba0e76d6f7c81ed9a4ea17dcf32ac1a6078762e1b2acf8b files/portmap-4.0-cleanup.patch 2193
+AUX portmap-4.0-malloc.patch 9067 RMD160 890aa533b64b2fdd4e02d9eec59ade65bb6a4e8d SHA1 3b14c87f179c9da1a743f6f26493fd87c9136f0a SHA256 2ad0ff246a3a84f457a8d27d7036d363bb8cfa7a4250bbbf2873b1a1f1df3747
 MD5 7667fe1c5070f9f57c1beb25015bb7be files/portmap-4.0-malloc.patch 9067
+RMD160 890aa533b64b2fdd4e02d9eec59ade65bb6a4e8d files/portmap-4.0-malloc.patch 9067
+SHA256 2ad0ff246a3a84f457a8d27d7036d363bb8cfa7a4250bbbf2873b1a1f1df3747 files/portmap-4.0-malloc.patch 9067
+AUX portmap-4.0-rpc_user.patch 1779 RMD160 6557c68d4878a7a49f51e5cb519e60e54f572b9d SHA1 859834080956de8b3e15015b474e2e176abb660a SHA256 948aac8db2c1260a5f234f37e917eca33d2fab1401e1e3d2308b00c4d1b1218f
 MD5 49ef87c468b07ca837a1282faca5647b files/portmap-4.0-rpc_user.patch 1779
+RMD160 6557c68d4878a7a49f51e5cb519e60e54f572b9d files/portmap-4.0-rpc_user.patch 1779
+SHA256 948aac8db2c1260a5f234f37e917eca33d2fab1401e1e3d2308b00c4d1b1218f files/portmap-4.0-rpc_user.patch 1779
+AUX portmap-4.0-sigpipe.patch 353 RMD160 a0a72eb3125c792c1df0a79d70e21d4d4171344b SHA1 7eedad96b3f1cd29b59a5bc0b4e8350bc98837b7 SHA256 bf67d3e47ccb45f86b9238e8915599ed0a109394e104801a1b135d9f73a5ed59
 MD5 d0820fd449ae88e56f2a3e78b96bb9d1 files/portmap-4.0-sigpipe.patch 353
+RMD160 a0a72eb3125c792c1df0a79d70e21d4d4171344b files/portmap-4.0-sigpipe.patch 353
+SHA256 bf67d3e47ccb45f86b9238e8915599ed0a109394e104801a1b135d9f73a5ed59 files/portmap-4.0-sigpipe.patch 353
+AUX portmap-5b-include-errno_h.patch 403 RMD160 7cccde0349afb521aa09727e64901b2f79038384 SHA1 c4835d3d13edb319e8f77c7b81d79f59792db820 SHA256 ecb9aaf8d9ee0211899880f07f0d7a1fcbea221615cc576c92b70c0b80a44fa1
 MD5 887940376974bf01ecf94fd032f224eb files/portmap-5b-include-errno_h.patch 403
+RMD160 7cccde0349afb521aa09727e64901b2f79038384 files/portmap-5b-include-errno_h.patch 403
+SHA256 ecb9aaf8d9ee0211899880f07f0d7a1fcbea221615cc576c92b70c0b80a44fa1 files/portmap-5b-include-errno_h.patch 403
+AUX portmap-5b-loopback-only.patch 2007 RMD160 7117f9bf481d9d1b7aec794d5b55ad9be242d3ce SHA1 5ae8c56fcaf210d594856bfe9f49d678144db660 SHA256 b076764dfc0d2a77112fb9a6a3c5548a5d6075ea119cf3b3b43e51eb9e237ae9
 MD5 5bef50780d3ffa439bc12d3e238f2e14 files/portmap-5b-loopback-only.patch 2007
+RMD160 7117f9bf481d9d1b7aec794d5b55ad9be242d3ce files/portmap-5b-loopback-only.patch 2007
+SHA256 b076764dfc0d2a77112fb9a6a3c5548a5d6075ea119cf3b3b43e51eb9e237ae9 files/portmap-5b-loopback-only.patch 2007
+AUX portmap-5b-no-SYS.patch 541 RMD160 c717e8b85c8abdc4cb8bfc21731a12834313ddb3 SHA1 d5efdd35f9d3292e230391efdeacd15d6f01f14d SHA256 a784c1aa74977c4a54bd76312e4651826352981d7f53ccf99f58442dd1103e0e
 MD5 14b082c837898bb8901a41a43306d0f2 files/portmap-5b-no-SYS.patch 541
+RMD160 c717e8b85c8abdc4cb8bfc21731a12834313ddb3 files/portmap-5b-no-SYS.patch 541
+SHA256 a784c1aa74977c4a54bd76312e4651826352981d7f53ccf99f58442dd1103e0e files/portmap-5b-no-SYS.patch 541
+AUX portmap-5b-optional-tcpd.patch 1066 RMD160 396ee5135eea281770b4ef250a4f7ae0fefe7393 SHA1 4bbf40d235adcf2ab2a446cdc034a5588cd1b699 SHA256 9b79bec6abcf16700765380dc4b90c058e7e11df5046e9309e3135bb83571ef8
 MD5 8b7fc4f54e294754bbd464ec3b6f919b files/portmap-5b-optional-tcpd.patch 1066
+RMD160 396ee5135eea281770b4ef250a4f7ae0fefe7393 files/portmap-5b-optional-tcpd.patch 1066
+SHA256 9b79bec6abcf16700765380dc4b90c058e7e11df5046e9309e3135bb83571ef8 files/portmap-5b-optional-tcpd.patch 1066
+AUX portmap.confd 117 RMD160 ae49c6ccf56b8b647a475bb91c2b45e5848a97d1 SHA1 a656e4dfe3c791388886b34a4ad613a64b140c12 SHA256 c3b97113f50759a880af016d940fbf16c03e5db833b537a756476b3b1e68bcf3
 MD5 389d24b3acd37306d50b6d7d37b626be files/portmap.confd 117
-MD5 417c9dc094234061ad301e5b5413b120 files/portmap.rc6 1132
+RMD160 ae49c6ccf56b8b647a475bb91c2b45e5848a97d1 files/portmap.confd 117
+SHA256 c3b97113f50759a880af016d940fbf16c03e5db833b537a756476b3b1e68bcf3 files/portmap.confd 117
+AUX portmap.rc6 995 RMD160 139b4291e90665697dce614152f9dc107b454296 SHA1 5767d3252444b800d6b5f8fa5134d370a6515923 SHA256 ee783fc5993c175964bd719dfb5116100efb26713801227fd116bd770f639650
+MD5 a896ab21544b75520d1dc96be79602d8 files/portmap.rc6 995
+RMD160 139b4291e90665697dce614152f9dc107b454296 files/portmap.rc6 995
+SHA256 ee783fc5993c175964bd719dfb5116100efb26713801227fd116bd770f639650 files/portmap.rc6 995
+AUX portmap_5beta.dif 8871 RMD160 f025aea41285af81eaaddd3f6fcbade93a571837 SHA1 2593aa85cd86d2bb6f6b3b718384556d1f8f6f33 SHA256 9191b0b2b7bba7a999a26d6af37057aee18f9ab2aebd85c2dbd89723284ab6da
 MD5 0ec47652f96bfda762a2ffc72a78f002 files/portmap_5beta.dif 8871
-MD5 def1cd0cee829a8caa56efd6a51d937c metadata.xml 184
+RMD160 f025aea41285af81eaaddd3f6fcbade93a571837 files/portmap_5beta.dif 8871
+SHA256 9191b0b2b7bba7a999a26d6af37057aee18f9ab2aebd85c2dbd89723284ab6da files/portmap_5beta.dif 8871
+DIST portmap_5beta.tar.gz 18702 RMD160 eb789f3d61f5bccefa09275bca70b0947bc2f365 SHA1 783a322ca9220e4830664f94195ff923ce8a09d6 SHA256 e8fb4429ecf03809f60b2e194be120a811be1c5cc3cc5d933ede938114357b61
+EBUILD portmap-5b-r9.ebuild 1993 RMD160 a09be4c4d86db0875589b426b06acd87707bf2b1 SHA1 757021b58fe38bff48b1585656eae18a88f3986a SHA256 3a8a59947ac531df76f9bc64b16daf2dd9b01259e387eba72b9e07be828db2af
 MD5 5ce90742848c7ff2e36dfc7ab72daa8a portmap-5b-r9.ebuild 1993
+RMD160 a09be4c4d86db0875589b426b06acd87707bf2b1 portmap-5b-r9.ebuild 1993
+SHA256 3a8a59947ac531df76f9bc64b16daf2dd9b01259e387eba72b9e07be828db2af portmap-5b-r9.ebuild 1993
+MISC ChangeLog 4674 RMD160 7567f44f84f1dc326b3e917802f9959e07e3d7d0 SHA1 c7e9eb2e7fc28446f704fef7992f75962b23f618 SHA256 0261759d238d14e1b42d322ba15d184ffcf37b96995b9a6a13da1139ee85d79b
+MD5 b570af02189830b5244a542fd037fe2d ChangeLog 4674
+RMD160 7567f44f84f1dc326b3e917802f9959e07e3d7d0 ChangeLog 4674
+SHA256 0261759d238d14e1b42d322ba15d184ffcf37b96995b9a6a13da1139ee85d79b ChangeLog 4674
+MISC metadata.xml 184 RMD160 e04454ac0ce1332b55442f66f80c5b0a1f378d1b SHA1 8b1d8587e1a69023464beadc22574662e5c839b3 SHA256 07152ec8272b393b26f92d7ff6a9a74b0eda6624ab35367ba7670f881c3519d7
+MD5 def1cd0cee829a8caa56efd6a51d937c metadata.xml 184
+RMD160 e04454ac0ce1332b55442f66f80c5b0a1f378d1b metadata.xml 184
+SHA256 07152ec8272b393b26f92d7ff6a9a74b0eda6624ab35367ba7670f881c3519d7 metadata.xml 184
+MD5 f9a8e87c18a72ece706d3df644104e69 files/digest-portmap-5b-r9 238
+RMD160 1bbdbbc4f3600ef52891fa10a383831165c1e1ff files/digest-portmap-5b-r9 238
+SHA256 9bc24979f7def50f817687e303d1a6084b8fde38c0f9e1361937829277ed6122 files/digest-portmap-5b-r9 238
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFDzGYP2+ySkm8kpY0RAie2AKC/oy9F0IBDsFRWza6b/ufKFRiZQwCgxECW
-6KMFBgTRb7gKo1Uaexues58=
-=yai4
+iD8DBQFFAnskamhnQswr0vIRAjwvAJ9SVGBmx9Phkop/uutA2ozx8BHcpwCgrlbE
+AVmvgzPyt50giUVNoolCOM4=
+=KllO
 -----END PGP SIGNATURE-----
diff --git a/net-nds/portmap/files/digest-portmap-5b-r9 b/net-nds/portmap/files/digest-portmap-5b-r9
index 61f9e105bbe8..3ef118a79c29 100644
--- a/net-nds/portmap/files/digest-portmap-5b-r9
+++ b/net-nds/portmap/files/digest-portmap-5b-r9
@@ -1 +1,3 @@
 MD5 781e16ed4487c4caa082c6fef09ead4f portmap_5beta.tar.gz 18702
+RMD160 eb789f3d61f5bccefa09275bca70b0947bc2f365 portmap_5beta.tar.gz 18702
+SHA256 e8fb4429ecf03809f60b2e194be120a811be1c5cc3cc5d933ede938114357b61 portmap_5beta.tar.gz 18702
diff --git a/net-nds/portmap/files/portmap.rc6 b/net-nds/portmap/files/portmap.rc6
index b167c97a4c1b..80abe5c72d80 100644
--- a/net-nds/portmap/files/portmap.rc6
+++ b/net-nds/portmap/files/portmap.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/portmap/files/portmap.rc6,v 1.10 2005/03/03 23:24:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/portmap/files/portmap.rc6,v 1.11 2006/09/09 08:28:05 vapier Exp $
 
 depend() {
 	use net
@@ -29,9 +29,8 @@ stop() {
 restart() {
 	# Dump the portmapper's table before stopping
 	ebegin "Saving portmap table"
-	local tmpfile=`mktemp /tmp/pmap_table.XXXXXX`
-	[ -n "$tmpfile" ] && pmap_dump >$tmpfile
-	eend $? "Error saving portmap table."
+	local pmap=$(pmap_dump)
+	eend $?
 
 	# Stop and restart portmapper
 	svc_stop
@@ -39,10 +38,9 @@ restart() {
 	svc_start
 
 	# Reload the portmapper's table
-	if [ -n "$tmpfile" ]; then
+	if [[ -n ${pmap} ]] ; then
 		ebegin "Reloading portmap table"
-		pmap_set <$tmpfile
-		eend $? "Error reloading portmap table."
-		rm -f $tmpfile
+		echo "${pmap}" | pmap_set
+		eend $?
 	fi
 }