x86 stable, security bug #209453 and quotes

Package-Manager: portage-2.1.4.2

3 files changed, 34 insertions, 21 deletions

diff --git a/app-admin/webmin/ChangeLog b/app-admin/webmin/ChangeLog
index 9d66b8931e96..7d7292e581b9 100644
--- a/app-admin/webmin/ChangeLog
+++ b/app-admin/webmin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-admin/webmin
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.163 2008/02/09 20:07:20 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.164 2008/02/10 16:10:02 maekke Exp $
+
+  10 Feb 2008; Markus Meier <maekke@gentoo.org> webmin-1.400.ebuild:
+  x86 stable, security bug #209453 and quotes
 
 *webmin-1.400 (09 Feb 2008)
 
diff --git a/app-admin/webmin/Manifest b/app-admin/webmin/Manifest
index b79e5a1ec46d..b208bd66e650 100644
--- a/app-admin/webmin/Manifest
+++ b/app-admin/webmin/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 1.390-iptables-gentoo.patch 447 RMD160 7bb5adab1c39d66b9c4a8833370f5560bc47f2a2 SHA1 5ddb35a219927062b0ca8969920a531d3c8e5a57 SHA256 b405740f35aff6ce90d257f8e64f705b56ae1c68365ac89f73ef2f30b8a3c070
 AUX init.d.webmin 880 RMD160 9aab2eb11c28dfde803f5e5913ed7003fb2e8e0e SHA1 02d0708fc712b3f1c6702a0b4a26472b2878d8ca SHA256 aa09a0e8810611146f35f7c954f5c72449c7ea14b9d4b19d0591560a7a2d95de
 AUX uninstall.sh 260 RMD160 57b7230cda3c1fbc3ee0cff5bc6d5e1ce157bbaa SHA1 4a775779dad3c7392ce4283a6d0525cc8b1b3cd4 SHA256 91a47a503b8ded8eb14d1e1960729e9909004eb20382201fc91e2a884800160d
@@ -24,6 +27,13 @@ DIST webmin-1.400-minimal.tar.gz 1570083 RMD160 3dab583852f374af5016e211a6460026
 DIST webmin-1.400.tar.gz 13457079 RMD160 4af2ca5eab965fc6f78d9745fa4d2b0c6565a088 SHA1 bf38da1278f0e2e0e468d60de7230b686dece224 SHA256 d937900de2ab2ae0bc63ba08cb4cd6f61e674ac6b7f9db6315f7adddd5e7a280
 EBUILD webmin-1.350.ebuild 3835 RMD160 7484624b98c2e304f1c55cf714448c60f93affa2 SHA1 c18711670b8e599c884b9d31d89869ac786db42d SHA256 bc85dfd87b7e4a462a8ed59915bde4fbd798f6376f13ac4cca65809578ccf387
 EBUILD webmin-1.390.ebuild 3818 RMD160 25fc2932657c1e38a9b71dc95f94810a9d45f286 SHA1 8853b158d6488215c47c9109f862834b4f050314 SHA256 d00293ddf81472d06e2d7e34b6f48991ab34df33578e09ec79de3e1e45c56df7
-EBUILD webmin-1.400.ebuild 3743 RMD160 2256b144049e9d6b23cb9f5821a553468c108cc4 SHA1 afa311d3704246beba54e48fad42ffdf4b555f99 SHA256 bffb299a5f8a2de0d830026e008608a1503d9135abe06c2d14775aa8b3655c85
-MISC ChangeLog 22818 RMD160 fdfa4382a88ea8098e8396ee10dc21de1581aec7 SHA1 88ba9d86bf6df7875e96e73a7ef02a85cd5cb3f0 SHA256 259d7351d47282a395451b6cb802fd44d72a2076b429d2ee04897174886ddf3b
+EBUILD webmin-1.400.ebuild 3777 RMD160 53b26fe1050fe96e792db1d3cc9b2de8494a58fb SHA1 fbf724217d89d5afee11a220dacb1a3a16b12e32 SHA256 c4c5de8586cf1e4d7c2bc24a4a9c888c4da387c246f67252cece154e59b68566
+MISC ChangeLog 22933 RMD160 cbef5f25e3f93afc600af083f4dd801e2af5e0eb SHA1 62b1c5953e3b3c079166de83dd2e396466f652df SHA256 22a30ee2bd8693a5ee9fee52cd5a0f5fa5747632cbc3ff95f638611ba0f10e80
 MISC metadata.xml 232 RMD160 854b06094287201d0b98f2b21d36054db25d81cd SHA1 cc4f98e9ee0102aea687d71cf3af924cf156edbb SHA256 21382e863647add08888c924279a4b931b2b90ccd0cf5e526ee74a3d5e1fd0df
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHryIikKaRLQcq0GIRAs98AKCc0JBbeckFgge/EswZMVSJ1DSriACglNPU
+GvINdHOXCj1VhLb/beEqZwA=
+=uCwY
+-----END PGP SIGNATURE-----
diff --git a/app-admin/webmin/webmin-1.400.ebuild b/app-admin/webmin/webmin-1.400.ebuild
index e79bd19dba3d..a15794badc3b 100644
--- a/app-admin/webmin/webmin-1.400.ebuild
+++ b/app-admin/webmin/webmin-1.400.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.400.ebuild,v 1.1 2008/02/09 20:07:20 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.400.ebuild,v 1.2 2008/02/10 16:10:02 maekke Exp $
 
 inherit eutils pam
 
@@ -15,7 +15,7 @@ SRC_URI="webmin-minimal? ( mirror://sourceforge/webadmin/${P}-minimal.tar.gz )
 LICENSE="BSD"
 SLOT="0"
 # ~mips removed because of broken deps. Bug #86085
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 IUSE="apache2 pam postgres ssl webmin-minimal"
 
 DEPEND="dev-lang/perl"
@@ -41,8 +41,8 @@ src_unpack() {
 		# Correct ldapness
 		epatch "${FILESDIR}"/${PN}-1.270-ldap-useradmin.patch
 
-		mv ${WORKDIR}/virtual-server-${VM_V}.gpl.wbm ${T}/vs.tar
-		tar -xf ${T}/vs.tar
+		mv "${WORKDIR}"/virtual-server-${VM_V}.gpl.wbm "${T}"/vs.tar
+		tar -xf "${T}"/vs.tar
 
 		# Don't create ${HOME}/cgi-bin on new accounts
 		epatch "${FILESDIR}"/virtual-server-3.23-nocgibin.patch
@@ -66,27 +66,27 @@ src_install() {
 	dodir /usr/libexec/webmin
 	dodir /var
 
-	cp -rp * ${D}/usr/libexec/webmin
+	cp -rp * "${D}"/usr/libexec/webmin
 
 	# in webmin-minimal openslp is not present
 	if [ ! -f "${D}/usr/libexec/webmin/openslp/config-gentoo-linux" ] ; then
-		cp ${D}/usr/libexec/webmin/openslp/config \
-			${D}/usr/libexec/webmin/openslp/config-gentoo-linux
+		cp "${D}"/usr/libexec/webmin/openslp/config \
+			"${D}"/usr/libexec/webmin/openslp/config-gentoo-linux
 	fi
 
 	newinitd "${FILESDIR}"/init.d.webmin webmin
 
 	newpamd "${FILESDIR}"/webmin-pam webmin
-	echo gentoo > ${D}/usr/libexec/webmin/install-type
+	echo gentoo > "${D}"/usr/libexec/webmin/install-type
 
 	# Fix ownership
-	chown -R root:0 ${D}
+	chown -R root:0 "${D}"
 
 	dodir /etc/webmin
 	dodir /var/log/webmin
 
-	config_dir=${D}/etc/webmin
-	var_dir=${D}/var/log/webmin
+	config_dir="${D}"/etc/webmin
+	var_dir="${D}"/var/log/webmin
 	perl=/usr/bin/perl
 	autoos=1
 	port=10000
@@ -102,23 +102,23 @@ src_install() {
 	noperlpath=1
 	tempdir="${T}"
 	export config_dir var_dir perl autoos port login crypt host ssl atboot nostart nochown autothird nouninstall noperlpath tempdir
-	${D}/usr/libexec/webmin/setup.sh > ${T}/webmin-setup.out 2>&1 || die "Failed to create initial webmin configuration."
+	"${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=/var/run/webmin.pid:" ${D}/etc/webmin/miniserv.conf
-	find ${D}/etc/webmin -type f | xargs sed -i -e "s:${D}:/: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
+	rm -rf "${D}"/var/log/webmin
 	keepdir /var/log/webmin/
 
 	# Get rid of this crap...
-	rm -rf ${D}/usr/libexec/webmin/acl/Authen-SolarisRBAC-0.1
-	rm -f ${D}/usr/libexec/webmin/acl/Authen-SolarisRBAC-0.1.tar.gz
+	rm -rf "${D}"/usr/libexec/webmin/acl/Authen-SolarisRBAC-0.1
+	rm -f "${D}"/usr/libexec/webmin/acl/Authen-SolarisRBAC-0.1.tar.gz
 }
 
 pkg_postinst() {
-	local crypt=$(grep "^root:" ${ROOT}/etc/shadow | cut -f 2 -d :)
+	local crypt=$(grep "^root:" "${ROOT}"/etc/shadow | cut -f 2 -d :)
 	crypt=${crypt//\\/\\\\}
 	crypt=${crypt//\//\\\/}
 	sed -i -e "s/root:XXX/root:${crypt}/" "${ROOT}/etc/webmin/miniserv.users"