Security bug #7731.

diff --git a/app-admin/usermin/Manifest b/app-admin/usermin/Manifest
index aa2ddacf495bc04fcb858a80b601fa003ab9cc76..5559fedaa2370f82746b2064c67625ebed32f784 100644 (file)
--- a/app-admin/usermin/Manifest
+++ b/app-admin/usermin/Manifest
@@ -1,8 +1,11 @@
-MD5 8cf7fcb4d9db2e7e85cc72946781f37f ChangeLog 6397
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ac345cd0bac1dc2abb84afcb10515267 ChangeLog 6648
 MD5 3923b6ae9bc25fc124e24e7747c8a802 metadata.xml 226
 MD5 ed352920c6cae2b2f75de6313fbdbca5 usermin-1.100.ebuild 2292
 MD5 6ec8ad8e6b2690a219e62d9b52ee8577 usermin-1.090.ebuild 2224
-MD5 d306fa1e82d5f95cd336b0e2d737e251 usermin-1.100-r1.ebuild 2442
+MD5 0f796cae9aab4e24fbfbc1cdb9565b97 usermin-1.100-r1.ebuild 2525
 MD5 b3ae782d361d5f450212191c25bf4623 files/digest-usermin-1.100 66
 MD5 bd4b2cc177b4fb7b0f96edc60008a6b5 files/usermin-1.080-safestop.patch 620
 MD5 4a8c93084becc5ae5beb4488282df537 files/digest-usermin-1.090 66
@@ -10,3 +13,10 @@ MD5 b3ae782d361d5f450212191c25bf4623 files/digest-usermin-1.100-r1 66
 MD5 e93705fc1a8b2d9410a920a777890624 files/usermin-1.100-setup-nocheck.patch 951
 MD5 1a376ef687089bf1d727a6b403a17627 files/init.d.usermin 822
 MD5 a5311bbc9c1fc378a6b0bfb3ca1b2394 files/usermin.pam 431
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFB5nW/ArHZZzCEUG0RAl1kAJ9+uLWR5/O935rLv9gpK/R2Cgv5cQCfcqOd
+44CfEMNx6y/N2xIMxiaJRWA=
+=rouC
+-----END PGP SIGNATURE-----

diff --git a/app-admin/webmin/ChangeLog b/app-admin/webmin/ChangeLog
index 25d80939ab821a00efa5799e988537780a3fe356..9ab9d518b5b996839b463dcc434dcbc3732ad260 100644 (file)
--- a/app-admin/webmin/ChangeLog
+++ b/app-admin/webmin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/webmin
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.70 2005/01/01 11:35:37 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.71 2005/01/13 13:19:13 eradicator Exp $
+
+*webmin-1.170-r3 (13 Jan 2005)
+
+  13 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -webmin-1.170-r2.ebuild, +webmin-1.170-r3.ebuild:
+  Security bug #7731.
 
   31 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
   +files/webmin-1.170-setup-nocheck.patch, webmin-1.170-r2.ebuild:

diff --git a/app-admin/webmin/Manifest b/app-admin/webmin/Manifest
index d27e72d8eb91be0022e9c85f2794644622e2d1e2..c315cb14da971edad612f65bbb621f607a736d53 100644 (file)
--- a/app-admin/webmin/Manifest
+++ b/app-admin/webmin/Manifest
@@ -1,13 +1,16 @@
-MD5 fa69b8bbe8422d5ef32168e3832dded8 ChangeLog 10236
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 3923b6ae9bc25fc124e24e7747c8a802 metadata.xml 226
 MD5 71f6129acd61d2e8309c7d4c3e962659 webmin-1.170.ebuild 2697
+MD5 f0e3049b6840ef1a15f7095626964640 webmin-1.170-r3.ebuild 3670
 MD5 e626ba52c08958842e196639ca78255e webmin-1.160.ebuild 2689
-MD5 7bb63cba20f40be40ad7c0ab3ddcf65a webmin-1.170-r2.ebuild 3587
+MD5 be297c895aa2c00246c2bd2d2a45a505 ChangeLog 10400
 MD5 7d80c86adbd36eeb8f220b9efdd30819 files/webmin-pam 101
 MD5 54dc8937e05bd76ad86a6c5f5ae6a333 files/init.d.webmin 859
 MD5 58f9530c780e652271313555858ad909 files/digest-webmin-1.170 138
+MD5 6d9dfc76f788500ff3c85cbb42667487 files/digest-webmin-1.170-r3 209
 MD5 17e9cccc95647ba080bd69785db85ac1 files/digest-webmin-1.160 137
-MD5 6d9dfc76f788500ff3c85cbb42667487 files/digest-webmin-1.170-r2 209
 MD5 bc8eb1c9de103599fc00b140b0ed1f9f files/uninstall.sh 260
 MD5 bb2acab90ada721c723d91a5a97c193c files/webmin-1.130-webalizer.patch 615
 MD5 a01d77a867d5469c7211685bfd04f6f6 files/webmin-1.140-apache2.patch 1227
@@ -18,3 +21,10 @@ MD5 082b9fc08240293b2b7b3609ba8e0cfd files/virtual-server-2.31-checkip.patch 607
 MD5 4f5dc10c2c1d19218cecfc2a678a0ce4 files/virtual-server-2.31-pgsql.patch 579
 MD5 cc16dcb159f84c912365504002444a08 files/virtual-server-2.31-namevirtual.patch 2951
 MD5 512204473654b6eb41308d3319ba6144 files/webmin-1.170-setup-nocheck.patch 943
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFB5nW3ArHZZzCEUG0RAii8AJwKowvK2hEfOKxxvNhxJu0EAr9n2wCfSuAS
+9SJVkeHPXOlN9qlbfrAMMh0=
+=hHS+
+-----END PGP SIGNATURE-----

diff --git a/app-admin/webmin/files/digest-webmin-1.170-r2 b/app-admin/webmin/files/digest-webmin-1.170-r3
similarity index 100%
rename from app-admin/webmin/files/digest-webmin-1.170-r2
rename to app-admin/webmin/files/digest-webmin-1.170-r3

diff --git a/app-admin/webmin/webmin-1.170-r2.ebuild b/app-admin/webmin/webmin-1.170-r3.ebuild
similarity index 94%
rename from app-admin/webmin/webmin-1.170-r2.ebuild
rename to app-admin/webmin/webmin-1.170-r3.ebuild
index b901bab88dbcb7d8cdb47dbe752a3b766afa856f..1868ba791b120eb069d0703e4e32be803af2cbc1 100644 (file)
--- a/app-admin/webmin/webmin-1.170-r2.ebuild
+++ b/app-admin/webmin/webmin-1.170-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.170-r2.ebuild,v 1.3 2005/01/01 11:35:37 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.170-r3.ebuild,v 1.1 2005/01/13 13:19:13 eradicator Exp $
 
 IUSE="ssl apache2 webmin-minimal"
 
@@ -94,7 +94,7 @@ src_install() {
        autoos=1
        port=10000
        login=root
-       crypt=`grep "^root:" ${ROOT}/etc/shadow | cut -f 2 -d :`
+       crypt="XXX"
        host=`hostname`
        use ssl && ssl=1 || ssl=0
        atboot=0
@@ -117,6 +117,9 @@ src_install() {
 }
 
 pkg_postinst() {
+       local crypt=$(grep "^root:" ${ROOT}/etc/shadow | cut -f 2 -d :)
+       dosed "s/root:XXX/root:${crypt}/" /etc/webmin/miniserv.users
+
        einfo "To make webmin start at boot time, run: 'rc-update add webmin default'."
        einfo "Point your web browser to http://localhost:10000 to use webmin."
 }