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

(Portage version: 2.1.3_rc5)

4 files changed, 23 insertions, 31 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/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
-}