summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <eradicator@gentoo.org>2005-01-13 13:19:13 +0000
committerJeremy Huddleston <eradicator@gentoo.org>2005-01-13 13:19:13 +0000
commit1301852d3cd2a89a39724f3c48c2a31b58d237eb (patch)
tree6a00c3c2bc85c3be5f0af48544d78b5f1c6feb92 /app-admin
parentapache herd package refresh (Manifest recommit) (diff)
downloadgentoo-2-1301852d3cd2a89a39724f3c48c2a31b58d237eb.tar.gz
gentoo-2-1301852d3cd2a89a39724f3c48c2a31b58d237eb.tar.bz2
gentoo-2-1301852d3cd2a89a39724f3c48c2a31b58d237eb.zip
Security bug #7731.
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/webmin/ChangeLog8
-rw-r--r--app-admin/webmin/Manifest4
-rw-r--r--app-admin/webmin/files/digest-webmin-1.170-r3 (renamed from app-admin/webmin/files/digest-webmin-1.170-r2)0
-rw-r--r--app-admin/webmin/webmin-1.170-r3.ebuild (renamed from app-admin/webmin/webmin-1.170-r2.ebuild)7
4 files changed, 15 insertions, 4 deletions
diff --git a/app-admin/webmin/ChangeLog b/app-admin/webmin/ChangeLog
index 25d80939ab82..9ab9d518b5b9 100644
--- 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 d27e72d8eb91..5c40f6df93b6 100644
--- a/app-admin/webmin/Manifest
+++ b/app-admin/webmin/Manifest
@@ -1,11 +1,13 @@
MD5 fa69b8bbe8422d5ef32168e3832dded8 ChangeLog 10236
MD5 3923b6ae9bc25fc124e24e7747c8a802 metadata.xml 226
MD5 71f6129acd61d2e8309c7d4c3e962659 webmin-1.170.ebuild 2697
+MD5 fbebd53ff3fc6c43b199765e6cdd1c1f webmin-1.170-r3.ebuild 3670
MD5 e626ba52c08958842e196639ca78255e webmin-1.160.ebuild 2689
-MD5 7bb63cba20f40be40ad7c0ab3ddcf65a webmin-1.170-r2.ebuild 3587
+MD5 fbebd53ff3fc6c43b199765e6cdd1c1f webmin-1.170-r2.ebuild 3670
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
diff --git a/app-admin/webmin/files/digest-webmin-1.170-r2 b/app-admin/webmin/files/digest-webmin-1.170-r3
index c4fddb6774a1..c4fddb6774a1 100644
--- a/app-admin/webmin/files/digest-webmin-1.170-r2
+++ b/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
index b901bab88dbc..1868ba791b12 100644
--- 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."
}