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

Package-Manager: portage-2.1.3_rc5

5 files changed, 49 insertions, 47 deletions

diff --git a/app-admin/usermin/ChangeLog b/app-admin/usermin/ChangeLog
index ce99e66ad3d7..5f489f8c79b9 100644
--- a/app-admin/usermin/ChangeLog
+++ b/app-admin/usermin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/usermin
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/ChangeLog,v 1.111 2007/04/18 15:41:54 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/ChangeLog,v 1.112 2007/06/24 22:46:57 peper Exp $
+
+  24 Jun 2007; Piotr Jaroszyński <peper@gentoo.org> usermin-1.220.ebuild,
+  usermin-1.230.ebuild, usermin-1.270.ebuild:
+  (QA) Fix ${ROOT} abuse. bug #167240.
 
   18 Apr 2007; Tobias Scherbaum <dertobi123@gentoo.org>
   usermin-1.270.ebuild:
diff --git a/app-admin/usermin/Manifest b/app-admin/usermin/Manifest
index 5e30acd38f92..ba73aca1808b 100644
--- a/app-admin/usermin/Manifest
+++ b/app-admin/usermin/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX init.d.usermin 825 RMD160 e3b471844d7dfdfaaa00d3da73d679514f29e5a0 SHA1 65701d01c9b880587d279f8b77711e3551ef175e SHA256 b1103d5c733a0c49a19c407a718617454342b19c34f238f11dc20be3356d38bf
 MD5 2e7c19bb66f99c168fc2e86b4bb4862c files/init.d.usermin 825
 RMD160 e3b471844d7dfdfaaa00d3da73d679514f29e5a0 files/init.d.usermin 825
@@ -17,22 +20,22 @@ SHA256 5c5a78f5c04dbf033c129054af7741769d23be4887533800515c9bcacffd6bf1 files/us
 DIST usermin-1.220.tar.gz 3154583 RMD160 ee6fcd1892a2d67d06e5a0c13f3448bf6bccf7a8 SHA1 950d3b82ff4f58d966dc0c29db8e669ced4e71c9 SHA256 f94466cab791745bcdac3f6d4d2c32e46db8ab8009d5ea63488f432181536ba1
 DIST usermin-1.230.tar.gz 3173021 RMD160 e5181d85369a5cf06b377a1729fe6ab3b5fa6c13 SHA1 102c8ddd10753a4fce9133455645d51479456483 SHA256 40748c01cb77a308e11238e326d8522421e24e48a644a599c61bb67f52115cc1
 DIST usermin-1.270.tar.gz 8205679 RMD160 083fc693096aa70a75360de33e1c162965dda354 SHA1 700bd86cc6bc7e8b3e7acb32045250c0c1950f44 SHA256 0d3c2d09d27418909aa1e4704b60cf5d07e8e7c2fac4c6020530aa5ffe35b1d0
-EBUILD usermin-1.220.ebuild 2288 RMD160 174224fe0fc589f37c156348b1ee9f215f0413e4 SHA1 58f4c54e6405bd2b54906330ec1241450f4546c6 SHA256 4a932249d65cfccd2ddd6dafd386a4692a13bd78ff569643988592efd2525ff2
-MD5 bbb7c8b6ae12ded40ff74c32b48eefea usermin-1.220.ebuild 2288
-RMD160 174224fe0fc589f37c156348b1ee9f215f0413e4 usermin-1.220.ebuild 2288
-SHA256 4a932249d65cfccd2ddd6dafd386a4692a13bd78ff569643988592efd2525ff2 usermin-1.220.ebuild 2288
-EBUILD usermin-1.230.ebuild 2288 RMD160 df15e7626e8c64cb1e645d8b9f29fb50feb7844d SHA1 f964d4b8086a8bb1700dc0c1e5f10e8213ed1c31 SHA256 64d064d8f9ad35037d4fabbfa12447db7bdd663c06cceba09d68abe746da8080
-MD5 5dee52b9becf6c887b878b5734d77f84 usermin-1.230.ebuild 2288
-RMD160 df15e7626e8c64cb1e645d8b9f29fb50feb7844d usermin-1.230.ebuild 2288
-SHA256 64d064d8f9ad35037d4fabbfa12447db7bdd663c06cceba09d68abe746da8080 usermin-1.230.ebuild 2288
-EBUILD usermin-1.270.ebuild 2293 RMD160 76cb7f32da37a84885b628d61096742a94b8cd7c SHA1 0f0ab7299339daeff10971a683f5b39c0bc41a52 SHA256 35e352833bfad898cb6d9e5ce558a7a325206cb852289fa9a95057aac9bceaac
-MD5 b2ea5581f142530dab2c65c6aaa7c5c4 usermin-1.270.ebuild 2293
-RMD160 76cb7f32da37a84885b628d61096742a94b8cd7c usermin-1.270.ebuild 2293
-SHA256 35e352833bfad898cb6d9e5ce558a7a325206cb852289fa9a95057aac9bceaac usermin-1.270.ebuild 2293
-MISC ChangeLog 14646 RMD160 4faac659c2d940448cbe8f2fb9f8006db751133f SHA1 e362311db3336f12d2be68614a03ff6182a19c31 SHA256 b22d0b679b3440f0644d86087d13455ed369d5bf5d289353a75719e60fec705c
-MD5 51db4fc781ff2c73689f6a2009f1fa87 ChangeLog 14646
-RMD160 4faac659c2d940448cbe8f2fb9f8006db751133f ChangeLog 14646
-SHA256 b22d0b679b3440f0644d86087d13455ed369d5bf5d289353a75719e60fec705c ChangeLog 14646
+EBUILD usermin-1.220.ebuild 2202 RMD160 cc63b45fb28627188fda0a9ce55abd3a7f980917 SHA1 fccdf145e4522acd00c9601eee9944a42eb499f6 SHA256 8a8664d72cb657960eea49f230264bafec47e15d01d1470a9c34d4b18e619ed2
+MD5 d5a0e0626dc3226a3cb94d915c456cb1 usermin-1.220.ebuild 2202
+RMD160 cc63b45fb28627188fda0a9ce55abd3a7f980917 usermin-1.220.ebuild 2202
+SHA256 8a8664d72cb657960eea49f230264bafec47e15d01d1470a9c34d4b18e619ed2 usermin-1.220.ebuild 2202
+EBUILD usermin-1.230.ebuild 2202 RMD160 f1b28c7b3e713c4e53e2e725edf32bedef993ed4 SHA1 2ae918236eeacb37127b50fe805010d714802266 SHA256 d9e105d9a409ebe180a01891a47f0720be123d0ba123d12144b9c280e97229b5
+MD5 06d54ba364500a333c708af5e18780b1 usermin-1.230.ebuild 2202
+RMD160 f1b28c7b3e713c4e53e2e725edf32bedef993ed4 usermin-1.230.ebuild 2202
+SHA256 d9e105d9a409ebe180a01891a47f0720be123d0ba123d12144b9c280e97229b5 usermin-1.230.ebuild 2202
+EBUILD usermin-1.270.ebuild 2204 RMD160 57e9cef2a32fa5058aa4fb3db195c914071c6547 SHA1 d275e24ab2f4c14cc6e891bfd23ffadf3d4e8b52 SHA256 86e194c1deac94dd123e64a3b2fa0b30a18ca366704c79a22e7958fb0df04e25
+MD5 e31265893dcca3b463404160bb20ae30 usermin-1.270.ebuild 2204
+RMD160 57e9cef2a32fa5058aa4fb3db195c914071c6547 usermin-1.270.ebuild 2204
+SHA256 86e194c1deac94dd123e64a3b2fa0b30a18ca366704c79a22e7958fb0df04e25 usermin-1.270.ebuild 2204
+MISC ChangeLog 14802 RMD160 57c1829c79e3aa9953cd88c646a65655e6f6568e SHA1 6beef3932c13e3210c3bde29bd435e4cceb25b95 SHA256 3227d0ef6a1cbc52b70b97f646a2a0ace441dc908d60077aa28daf8d45b85a35
+MD5 ee2b041e86f5df9ec5f3e533c3c01ac8 ChangeLog 14802
+RMD160 57c1829c79e3aa9953cd88c646a65655e6f6568e ChangeLog 14802
+SHA256 3227d0ef6a1cbc52b70b97f646a2a0ace441dc908d60077aa28daf8d45b85a35 ChangeLog 14802
 MISC metadata.xml 219 RMD160 d143b9bfc730a60b09531271e6fba3ed40f71245 SHA1 06fba309d7f5cc3fce67ad01b88cde3a8de44876 SHA256 cbaa8798606262e312a9367341221d7816ad29d8fd446baab796f519b7c30437
 MD5 1f90ee0a7bcf20ac86ec307846fb298e metadata.xml 219
 RMD160 d143b9bfc730a60b09531271e6fba3ed40f71245 metadata.xml 219
@@ -46,3 +49,10 @@ SHA256 e936ac6b1c2aceec189ff5b5d18b1fdeea29dba445f103bb955bc414e331fbc9 files/di
 MD5 3361a46b7a50a5ef39aa186391ce4d45 files/digest-usermin-1.270 244
 RMD160 39c1690349d11312a7465ddd7fedfe5d01b42660 files/digest-usermin-1.270 244
 SHA256 6cc5e394f41a93441bb765e796ea15074b91722a59cbcaf429eeaa72b438aa7a files/digest-usermin-1.270 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGfvRkppoStNGKGywRAtKxAJ9RJZwgAxvXx++IkHKFNvFhxHuREwCdEBlr
+uf0ZceP+cXDX58GNb8BI4wo=
+=Xied
+-----END PGP SIGNATURE-----
diff --git a/app-admin/usermin/usermin-1.220.ebuild b/app-admin/usermin/usermin-1.220.ebuild
index 7bf9fef0d1f5..d3cf7d368d29 100644
--- a/app-admin/usermin/usermin-1.220.ebuild
+++ b/app-admin/usermin/usermin-1.220.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/usermin/usermin-1.220.ebuild,v 1.6 2007/01/24 15:07:40 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/usermin-1.220.ebuild,v 1.7 2007/06/24 22:46:57 peper Exp $
 
 IUSE="ssl"
 
@@ -17,8 +17,8 @@ KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
 DEPEND="dev-lang/perl"
 
 RDEPEND="${DEPEND}
-	 sys-process/lsof
-	 ssl? ( dev-perl/Net-SSLeay )"
+	sys-process/lsof
+	ssl? ( dev-perl/Net-SSLeay )"
 
 #	 pam? ( dev-perl/Authen-PAM )
 
@@ -54,7 +54,7 @@ src_install() {
 
 	config_dir=${D}/etc/usermin
 	var_dir=${D}/var/log/usermin
-	perl=${ROOT}/usr/bin/perl
+	perl=/usr/bin/perl
 	autoos=1
 	port=20000
 	login=root
@@ -72,8 +72,8 @@ src_install() {
 	${D}/usr/libexec/usermin/setup.sh > ${T}/usermin-setup.out 2>&1 || die "Failed to create initial usermin configuration."
 
 	# Fixup the config files to use their real locations
-	sed -i -e "s:^pidfile=.*$:pidfile=${ROOT}/var/run/usermin.pid:" ${D}/etc/usermin/miniserv.conf
-	find ${D}/etc/usermin -type f | xargs sed -i -e "s:${D}:${ROOT}:g"
+	sed -i -e "s:^pidfile=.*$:pidfile=/var/run/usermin.pid:" ${D}/etc/usermin/miniserv.conf
+	find ${D}/etc/usermin -type f | xargs sed -i -e "s:${D}:/:g"
 
 	# Cleanup from the config script
 	rm -rf ${D}/var/log/usermin
@@ -84,7 +84,3 @@ pkg_postinst() {
 	elog "To make usermin start at boot time, run: 'rc-update add usermin default'."
 	elog "Point your web browser to http://localhost:20000 to use usermin."
 }
-
-pkg_prerm() {
-	${ROOT}/etc/init.d/usermin stop >& /dev/null
-}
diff --git a/app-admin/usermin/usermin-1.230.ebuild b/app-admin/usermin/usermin-1.230.ebuild
index 1189e7d4e240..493d111b0149 100644
--- a/app-admin/usermin/usermin-1.230.ebuild
+++ b/app-admin/usermin/usermin-1.230.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/usermin/usermin-1.230.ebuild,v 1.8 2007/01/24 15:07:40 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/usermin-1.230.ebuild,v 1.9 2007/06/24 22:46:57 peper Exp $
 
 IUSE="ssl"
 
@@ -17,8 +17,8 @@ KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
 DEPEND="dev-lang/perl"
 
 RDEPEND="${DEPEND}
-	 sys-process/lsof
-	 ssl? ( dev-perl/Net-SSLeay )"
+	sys-process/lsof
+	ssl? ( dev-perl/Net-SSLeay )"
 
 #	 pam? ( dev-perl/Authen-PAM )
 
@@ -54,7 +54,7 @@ src_install() {
 
 	config_dir=${D}/etc/usermin
 	var_dir=${D}/var/log/usermin
-	perl=${ROOT}/usr/bin/perl
+	perl=/usr/bin/perl
 	autoos=1
 	port=20000
 	login=root
@@ -72,8 +72,8 @@ src_install() {
 	${D}/usr/libexec/usermin/setup.sh > ${T}/usermin-setup.out 2>&1 || die "Failed to create initial usermin configuration."
 
 	# Fixup the config files to use their real locations
-	sed -i -e "s:^pidfile=.*$:pidfile=${ROOT}/var/run/usermin.pid:" ${D}/etc/usermin/miniserv.conf
-	find ${D}/etc/usermin -type f | xargs sed -i -e "s:${D}:${ROOT}:g"
+	sed -i -e "s:^pidfile=.*$:pidfile=/var/run/usermin.pid:" ${D}/etc/usermin/miniserv.conf
+	find ${D}/etc/usermin -type f | xargs sed -i -e "s:${D}:/:g"
 
 	# Cleanup from the config script
 	rm -rf ${D}/var/log/usermin
@@ -84,7 +84,3 @@ pkg_postinst() {
 	elog "To make usermin start at boot time, run: 'rc-update add usermin default'."
 	elog "Point your web browser to http://localhost:20000 to use usermin."
 }
-
-pkg_prerm() {
-	${ROOT}/etc/init.d/usermin stop >& /dev/null
-}
diff --git a/app-admin/usermin/usermin-1.270.ebuild b/app-admin/usermin/usermin-1.270.ebuild
index bc4056d9a53b..0831c0e4b69e 100644
--- a/app-admin/usermin/usermin-1.270.ebuild
+++ b/app-admin/usermin/usermin-1.270.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/usermin/usermin-1.270.ebuild,v 1.9 2007/04/18 15:41:54 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/usermin-1.270.ebuild,v 1.10 2007/06/24 22:46:57 peper Exp $
 
 IUSE="ssl"
 
@@ -17,8 +17,8 @@ KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
 DEPEND="dev-lang/perl"
 
 RDEPEND="${DEPEND}
-	 sys-process/lsof
-	 ssl? ( dev-perl/Net-SSLeay )"
+	sys-process/lsof
+	ssl? ( dev-perl/Net-SSLeay )"
 
 #	 pam? ( dev-perl/Authen-PAM )
 
@@ -54,7 +54,7 @@ src_install() {
 
 	config_dir=${D}/etc/usermin
 	var_dir=${D}/var/log/usermin
-	perl=${ROOT}/usr/bin/perl
+	perl=/usr/bin/perl
 	autoos=1
 	port=20000
 	login=root
@@ -72,8 +72,8 @@ src_install() {
 	${D}/usr/libexec/usermin/setup.sh > ${T}/usermin-setup.out 2>&1 || die "Failed to create initial usermin configuration."
 
 	# Fixup the config files to use their real locations
-	sed -i -e "s:^pidfile=.*$:pidfile=${ROOT}/var/run/usermin.pid:" ${D}/etc/usermin/miniserv.conf
-	find ${D}/etc/usermin -type f | xargs sed -i -e "s:${D}:${ROOT}:g"
+	sed -i -e "s:^pidfile=.*$:pidfile=/var/run/usermin.pid:" ${D}/etc/usermin/miniserv.conf
+	find ${D}/etc/usermin -type f | xargs sed -i -e "s:${D}:/:g"
 
 	# Cleanup from the config script
 	rm -rf ${D}/var/log/usermin
@@ -84,7 +84,3 @@ pkg_postinst() {
 	elog "To make usermin start at boot time, run: 'rc-update add usermin default'."
 	elog "Point your web browser to https://localhost:20000 to use usermin."
 }
-
-pkg_prerm() {
-	${ROOT}/etc/init.d/usermin stop >& /dev/null
-}