(QA) Fix ${ROOT} abuse. bug #167240.

Package-Manager: portage-2.1.3_rc5

5 files changed, 47 insertions, 53 deletions

diff --git a/app-admin/webmin/ChangeLog b/app-admin/webmin/ChangeLog
index d50e6566875a..34cb4dfa36ed 100644
--- a/app-admin/webmin/ChangeLog
+++ b/app-admin/webmin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/webmin
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.152 2007/06/12 23:20:25 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.153 2007/06/24 23:04:04 peper Exp $
+
+  24 Jun 2007; Piotr Jaroszyński <peper@gentoo.org> metadata.xml,
+  webmin-1.340.ebuild, webmin-1.350.ebuild:
+  (QA) Fix ${ROOT} abuse. bug #167240.
 
   12 Jun 2007; Christoph Mende <angelos@gentoo.org> webmin-1.350.ebuild:
   Stable on amd64 wrt security bug 181385
diff --git a/app-admin/webmin/Manifest b/app-admin/webmin/Manifest
index 10304d6c077d..aa4dcd794d53 100644
--- a/app-admin/webmin/Manifest
+++ b/app-admin/webmin/Manifest
@@ -70,22 +70,22 @@ DIST webmin-1.340-minimal.tar.gz 1414776 RMD160 74d202d87340a6d9f1339f7dcd5bca41
 DIST webmin-1.340.tar.gz 15851601 RMD160 5f4cfe51e052c2f46dc7f6813e74fb0e5aebff05 SHA1 530bb583824688f24fc4c6d0b8522d43c7f5bb96 SHA256 7d0b1affa548518dc724765578b908da3a2634483c53fb38de4e682e4769a9ac
 DIST webmin-1.350-minimal.tar.gz 1418154 RMD160 8478c31358b290438be7ca5c7219ab448ffb47a8 SHA1 be1f284ddd1837fde98acf3b0b668e31984a8deb SHA256 0d2909161f256d8a7a552ef6224ff1ee2b77118c0fa07ca7e29a59e5f2ed3cab
 DIST webmin-1.350.tar.gz 12832134 RMD160 a2bb929f3ee67a8240697f82a86595d6b415d067 SHA1 9834fce7db5fa3ba6709dcbbac9c812da6883895 SHA256 1941e2cbbd6af6b1d82d046b61a93b6df8ed100b6b0ebf54e6be8f46b7ecbe22
-EBUILD webmin-1.340.ebuild 3985 RMD160 9802cb5f0822813733641bb9e0a746957d06fb0a SHA1 0d874b6f9fed4cdaf08d7a16c1993a1ac54498c2 SHA256 aa852e3804dd58ee9b083fdbaca055e8d2b93d9611d9bc14f05bdb648c5f9142
-MD5 b17c1376782cbd52bbe4401b06d875cd webmin-1.340.ebuild 3985
-RMD160 9802cb5f0822813733641bb9e0a746957d06fb0a webmin-1.340.ebuild 3985
-SHA256 aa852e3804dd58ee9b083fdbaca055e8d2b93d9611d9bc14f05bdb648c5f9142 webmin-1.340.ebuild 3985
-EBUILD webmin-1.350.ebuild 3981 RMD160 e19cd5bc001bab7c680825da54311dbfb0bb888a SHA1 0ffe754f8ac1d79cdc51e2f0093e709c30d6ec89 SHA256 18e6d661600eb46d009174e866695be71fc573b7b560db0c38db5708babc94e9
-MD5 231209a5fb0bb9aae2dadb17bad896dd webmin-1.350.ebuild 3981
-RMD160 e19cd5bc001bab7c680825da54311dbfb0bb888a webmin-1.350.ebuild 3981
-SHA256 18e6d661600eb46d009174e866695be71fc573b7b560db0c38db5708babc94e9 webmin-1.350.ebuild 3981
-MISC ChangeLog 21226 RMD160 7a8a2057fa43b72e529d83abe12160930b750d75 SHA1 e786b6dee0906b854bb74d0787e805ea2f9b7763 SHA256 b2a7f887156e48984d5c662bcdea5cbcc24a0a5f5d9b16389da110be7f7068c7
-MD5 c49178cbe35bbc3418a2d132c03520de ChangeLog 21226
-RMD160 7a8a2057fa43b72e529d83abe12160930b750d75 ChangeLog 21226
-SHA256 b2a7f887156e48984d5c662bcdea5cbcc24a0a5f5d9b16389da110be7f7068c7 ChangeLog 21226
-MISC metadata.xml 233 RMD160 d81ec1a0582856aeac5ef3bfec5c80d9850216f6 SHA1 9b94f113e7f382076b1749c2a856e409c96cade3 SHA256 dce03f6cdd96135caf3c971a5ca4a8c916f44532fe8cfb6df88b7bdade407e8b
-MD5 4eda2fda81ea6a89d8f1f4a2dcd12a85 metadata.xml 233
-RMD160 d81ec1a0582856aeac5ef3bfec5c80d9850216f6 metadata.xml 233
-SHA256 dce03f6cdd96135caf3c971a5ca4a8c916f44532fe8cfb6df88b7bdade407e8b metadata.xml 233
+EBUILD webmin-1.340.ebuild 3818 RMD160 43059da931009fdece24c2d667e3409b531701b1 SHA1 31d6da9491379cc5230a3a39841642caac8a0727 SHA256 f58082c4fd2c92f653e659d70f702ff6409884715906659e46498af03dc396aa
+MD5 cb298f86965f8bcb33b1b99ac9dfae31 webmin-1.340.ebuild 3818
+RMD160 43059da931009fdece24c2d667e3409b531701b1 webmin-1.340.ebuild 3818
+SHA256 f58082c4fd2c92f653e659d70f702ff6409884715906659e46498af03dc396aa webmin-1.340.ebuild 3818
+EBUILD webmin-1.350.ebuild 3817 RMD160 6fea0e095cf67fd2b75a769a91355309e482a235 SHA1 c50a5e730f684b66d37d4c9e9cb628269ca3d008 SHA256 16c88e54adf448957da5c62579ca5fde3d0510931b6f9f9742db083207b2875d
+MD5 0c6bbeca2ffad19b191fe0c5e602c7cf webmin-1.350.ebuild 3817
+RMD160 6fea0e095cf67fd2b75a769a91355309e482a235 webmin-1.350.ebuild 3817
+SHA256 16c88e54adf448957da5c62579ca5fde3d0510931b6f9f9742db083207b2875d webmin-1.350.ebuild 3817
+MISC ChangeLog 21375 RMD160 66dcae55fb8af6d198867b38426f8bd8d44e2064 SHA1 b1da790f4a117d9c8643525b7b17840d44fd2ab2 SHA256 eba2628f93ac2bb5a47286ee0631a5b9e8d25c43c4e20f0b95d31aa86c22b74c
+MD5 ee0704ac865255debeeafeb1d6192c2b ChangeLog 21375
+RMD160 66dcae55fb8af6d198867b38426f8bd8d44e2064 ChangeLog 21375
+SHA256 eba2628f93ac2bb5a47286ee0631a5b9e8d25c43c4e20f0b95d31aa86c22b74c ChangeLog 21375
+MISC metadata.xml 232 RMD160 854b06094287201d0b98f2b21d36054db25d81cd SHA1 cc4f98e9ee0102aea687d71cf3af924cf156edbb SHA256 21382e863647add08888c924279a4b931b2b90ccd0cf5e526ee74a3d5e1fd0df
+MD5 8e53a4e000887f6bb029ca30c434e207 metadata.xml 232
+RMD160 854b06094287201d0b98f2b21d36054db25d81cd metadata.xml 232
+SHA256 21382e863647add08888c924279a4b931b2b90ccd0cf5e526ee74a3d5e1fd0df metadata.xml 232
 MD5 76b0dda2c3a573c214219c83125ed9da files/digest-webmin-1.340 780
 RMD160 9e7165ab0bd7d5febeb5003b562bc0f88edf01d4 files/digest-webmin-1.340 780
 SHA256 efa549b7b193d855ff4dfbcc70e53d4e0d4bc10e6dc34c8e1a68b64b58a3082f files/digest-webmin-1.340 780
@@ -95,7 +95,7 @@ SHA256 9b175b968405dcc5d627e6e917fc7fcceaeaa6997766b2110c615268f14f1376 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGft2fp/wUKkr7RBoRAsY3AJ9sQFz5SiNarMdQnYIes4hYl52LdQCeMCP9
-vWY4i5NzxHw13M5H08ZwS7o=
-=iLeP
+iD8DBQFGfvhnppoStNGKGywRAmTQAJ9RiDMyVYMlcrtTCWYB4rdS9p6wVgCg0qDn
+nm3CsYYMJmS8ydlbRWGkt7k=
+=Vjgf
 -----END PGP SIGNATURE-----
diff --git a/app-admin/webmin/metadata.xml b/app-admin/webmin/metadata.xml
index 73420b6cf0f0..616f0488f72e 100644
--- a/app-admin/webmin/metadata.xml
+++ b/app-admin/webmin/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 <herd>no-herd</herd>
 <maintainer>
-  <email>maintainer-needed@gentoo.org</email>
+	<email>maintainer-needed@gentoo.org</email>
 </maintainer>
 </pkgmetadata>
diff --git a/app-admin/webmin/webmin-1.340.ebuild b/app-admin/webmin/webmin-1.340.ebuild
index 70009d0cbc6f..9ad1d8f389b0 100644
--- a/app-admin/webmin/webmin-1.340.ebuild
+++ b/app-admin/webmin/webmin-1.340.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.340.ebuild,v 1.9 2007/04/18 15:42:19 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.340.ebuild,v 1.10 2007/06/24 23:04:04 peper Exp $
 
 inherit eutils pam
 
@@ -9,8 +9,8 @@ VM_V="3.23"
 DESCRIPTION="Webmin, a web-based system administration interface"
 HOMEPAGE="http://www.webmin.com/"
 SRC_URI="webmin-minimal? ( mirror://sourceforge/webadmin/${P}-minimal.tar.gz )
-	 !webmin-minimal? ( mirror://sourceforge/webadmin/${P}.tar.gz
-	                   http://www.webmin.com/download/virtualmin/virtual-server-${VM_V}.gpl.wbm.gz )"
+	!webmin-minimal? ( mirror://sourceforge/webadmin/${P}.tar.gz
+			http://www.webmin.com/download/virtualmin/virtual-server-${VM_V}.gpl.wbm.gz )"
 
 LICENSE="BSD"
 SLOT="0"
@@ -20,10 +20,10 @@ IUSE="apache2 pam postgres ssl webmin-minimal"
 
 DEPEND="dev-lang/perl"
 RDEPEND="${DEPEND}
-	 ssl? ( dev-perl/Net-SSLeay )
-	 postgres? ( dev-perl/DBD-Pg )
-	 pam? ( dev-perl/Authen-PAM )
-	 dev-perl/XML-Generator"
+	ssl? ( dev-perl/Net-SSLeay )
+	postgres? ( dev-perl/DBD-Pg )
+	pam? ( dev-perl/Authen-PAM )
+	dev-perl/XML-Generator"
 
 src_unpack() {
 	unpack ${A}
@@ -89,7 +89,7 @@ src_install() {
 
 	config_dir=${D}/etc/webmin
 	var_dir=${D}/var/log/webmin
-	perl=${ROOT}/usr/bin/perl
+	perl=/usr/bin/perl
 	autoos=1
 	port=10000
 	login=root
@@ -107,8 +107,8 @@ src_install() {
 	${D}/usr/libexec/webmin/setup.sh > ${T}/webmin-setup.out 2>&1 || die "Failed to create initial webmin configuration."
 
 	# Fixup the config files to use their real locations
-	sed -i -e "s:^pidfile=.*$:pidfile=${ROOT}/var/run/webmin.pid:" ${D}/etc/webmin/miniserv.conf
-	find ${D}/etc/webmin -type f | xargs sed -i -e "s:${D}:${ROOT}:g"
+	sed -i -e "s:^pidfile=.*$:pidfile=/var/run/webmin.pid:" ${D}/etc/webmin/miniserv.conf
+	find ${D}/etc/webmin -type f | xargs sed -i -e "s:${D}:/:g"
 
 	# Cleanup from the config script
 	rm -rf ${D}/var/log/webmin
@@ -123,14 +123,9 @@ pkg_postinst() {
 	local crypt=$(grep "^root:" ${ROOT}/etc/shadow | cut -f 2 -d :)
 	crypt=${crypt//\\/\\\\}
 	crypt=${crypt//\//\\\/}
-	sed -i -e "s/root:XXX/root:${crypt}/" /etc/webmin/miniserv.users
+	sed -i -e "s/root:XXX/root:${crypt}/" "${ROOT}/etc/webmin/miniserv.users"
 
 	einfo "To make webmin start at boot time, run: 'rc-update add webmin default'."
 	use ssl && einfo "Point your web browser to https://localhost:10000 to use webmin."
 	use ssl || einfo "Point your web browser to http://localhost:10000 to use webmin."
 }
-
-pkg_prerm() {
-	# XXX: this is wrong ... prerm is called during upgrades as well
-	"${ROOT}"/etc/init.d/webmin stop >& /dev/null
-}
diff --git a/app-admin/webmin/webmin-1.350.ebuild b/app-admin/webmin/webmin-1.350.ebuild
index e0fdd1f34618..9e6bb19087cf 100644
--- a/app-admin/webmin/webmin-1.350.ebuild
+++ b/app-admin/webmin/webmin-1.350.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.350.ebuild,v 1.8 2007/06/24 21:09:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.350.ebuild,v 1.9 2007/06/24 23:04:04 peper Exp $
 
 inherit eutils pam
 
@@ -9,8 +9,8 @@ VM_V="3.23"
 DESCRIPTION="Webmin, a web-based system administration interface"
 HOMEPAGE="http://www.webmin.com/"
 SRC_URI="webmin-minimal? ( mirror://sourceforge/webadmin/${P}-minimal.tar.gz )
-	 !webmin-minimal? ( mirror://sourceforge/webadmin/${P}.tar.gz
-	                   http://www.webmin.com/download/virtualmin/virtual-server-${VM_V}.gpl.wbm.gz )"
+	!webmin-minimal? ( mirror://sourceforge/webadmin/${P}.tar.gz
+			http://www.webmin.com/download/virtualmin/virtual-server-${VM_V}.gpl.wbm.gz )"
 
 LICENSE="BSD"
 SLOT="0"
@@ -20,10 +20,10 @@ IUSE="apache2 pam postgres ssl webmin-minimal"
 
 DEPEND="dev-lang/perl"
 RDEPEND="${DEPEND}
-	 ssl? ( dev-perl/Net-SSLeay )
-	 postgres? ( dev-perl/DBD-Pg )
-	 pam? ( dev-perl/Authen-PAM )
-	 dev-perl/XML-Generator"
+	ssl? ( dev-perl/Net-SSLeay )
+	postgres? ( dev-perl/DBD-Pg )
+	pam? ( dev-perl/Authen-PAM )
+	dev-perl/XML-Generator"
 
 src_unpack() {
 	unpack ${A}
@@ -89,7 +89,7 @@ src_install() {
 
 	config_dir=${D}/etc/webmin
 	var_dir=${D}/var/log/webmin
-	perl=${ROOT}/usr/bin/perl
+	perl=/usr/bin/perl
 	autoos=1
 	port=10000
 	login=root
@@ -107,8 +107,8 @@ src_install() {
 	${D}/usr/libexec/webmin/setup.sh > ${T}/webmin-setup.out 2>&1 || die "Failed to create initial webmin configuration."
 
 	# Fixup the config files to use their real locations
-	sed -i -e "s:^pidfile=.*$:pidfile=${ROOT}/var/run/webmin.pid:" ${D}/etc/webmin/miniserv.conf
-	find ${D}/etc/webmin -type f | xargs sed -i -e "s:${D}:${ROOT}:g"
+	sed -i -e "s:^pidfile=.*$:pidfile=/var/run/webmin.pid:" ${D}/etc/webmin/miniserv.conf
+	find ${D}/etc/webmin -type f | xargs sed -i -e "s:${D}:/:g"
 
 	# Cleanup from the config script
 	rm -rf ${D}/var/log/webmin
@@ -123,14 +123,9 @@ pkg_postinst() {
 	local crypt=$(grep "^root:" ${ROOT}/etc/shadow | cut -f 2 -d :)
 	crypt=${crypt//\\/\\\\}
 	crypt=${crypt//\//\\\/}
-	sed -i -e "s/root:XXX/root:${crypt}/" /etc/webmin/miniserv.users
+	sed -i -e "s/root:XXX/root:${crypt}/" "${ROOT}/etc/webmin/miniserv.users"
 
 	einfo "To make webmin start at boot time, run: 'rc-update add webmin default'."
 	use ssl && einfo "Point your web browser to https://localhost:10000 to use webmin."
 	use ssl || einfo "Point your web browser to http://localhost:10000 to use webmin."
 }
-
-pkg_prerm() {
-	# XXX: this is wrong ... prerm is called during upgrades as well
-	"${ROOT}"/etc/init.d/webmin stop >& /dev/null
-}