Security fix. See bug #53375.

4 files changed, 114 insertions, 12 deletions

diff --git a/app-admin/webmin/ChangeLog b/app-admin/webmin/ChangeLog
index e9a2a0ed7e40..be03421f57ed 100644
--- a/app-admin/webmin/ChangeLog
+++ b/app-admin/webmin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/webmin
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.46 2004/05/31 07:51:50 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.47 2004/06/12 09:14:59 eradicator Exp $
+
+*webmin-1.150 (12 Jun 2004)
+
+  12 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org> +webmin-1.150.ebuild:
+  Security fix.  See bug #53375.  Stable on x86 and amd64.
 
   31 May 2004; Jeremy Huddleston <eradicator@gentoo.org>
   webmin-1.140-r1.ebuild, files/webmin-1.140-apache2.patch:
diff --git a/app-admin/webmin/Manifest b/app-admin/webmin/Manifest
index 98d4a3e2645b..3ca9861dc475 100644
--- a/app-admin/webmin/Manifest
+++ b/app-admin/webmin/Manifest
@@ -1,16 +1,18 @@
-MD5 0f65bf15f4b028483180906cd8f47edc webmin-1.140.ebuild 2021
-MD5 e1448effc29a46897c48b774ec52a127 webmin-1.080.ebuild 1760
-MD5 f5f16f198582b89165595878bb861c64 webmin-1.130-r1.ebuild 1980
-MD5 871a442fb0428ebaeb78601de262b8b5 webmin-1.110.ebuild 1869
-MD5 53ea944a7ed1ac2159846c77d4a96bef webmin-1.140-r1.ebuild 2280
-MD5 33bf0c82436db05fe88793989022c1af ChangeLog 6946
+MD5 06de5969d7907e5b7782ff4ed8dee8d9 ChangeLog 6945
 MD5 3923b6ae9bc25fc124e24e7747c8a802 metadata.xml 226
-MD5 805b49679c94953e708f9322cbb11865 files/webmin-gentoo-init 870
-MD5 bc8eb1c9de103599fc00b140b0ed1f9f files/uninstall.sh 260
+MD5 254acea3420a135d0044af7bbdaa8a6b webmin-1.080.ebuild 1759
+MD5 72ca96d43323ef968706faadce9d22e3 webmin-1.110.ebuild 1868
+MD5 a1a3175908a9ede368948b421aee6320 webmin-1.130-r1.ebuild 1979
+MD5 db1ef482bb44b94ef23d110580332e40 webmin-1.140-r1.ebuild 2279
+MD5 e49f3cd481ff2d46345a0884c6ce119e webmin-1.140.ebuild 2020
+MD5 36188d430a7e0da75b1703df0ea67688 webmin-1.150.ebuild 2420
 MD5 c2e70e10958f50cd84c377b5963a8ced files/digest-webmin-1.080 65
 MD5 7f0f3de1fc4601b588dc143645df86b7 files/digest-webmin-1.110 65
-MD5 764bde81bfa9cb97e455324ea0033759 files/digest-webmin-1.140 65
-MD5 a01d77a867d5469c7211685bfd04f6f6 files/webmin-1.140-apache2.patch 1227
-MD5 bb2acab90ada721c723d91a5a97c193c files/webmin-1.130-webalizer.patch 615
 MD5 45eacf952391438a2db6170312783f32 files/digest-webmin-1.130-r1 65
+MD5 764bde81bfa9cb97e455324ea0033759 files/digest-webmin-1.140 65
 MD5 764bde81bfa9cb97e455324ea0033759 files/digest-webmin-1.140-r1 65
+MD5 bc8eb1c9de103599fc00b140b0ed1f9f files/uninstall.sh 260
+MD5 bb2acab90ada721c723d91a5a97c193c files/webmin-1.130-webalizer.patch 615
+MD5 a01d77a867d5469c7211685bfd04f6f6 files/webmin-1.140-apache2.patch 1227
+MD5 eac6dcbf7b7c320c635d472f23db74e2 files/webmin-gentoo-init 869
+MD5 03f188f36a9989ff035a883155a82e0b files/digest-webmin-1.150 65
diff --git a/app-admin/webmin/files/digest-webmin-1.150 b/app-admin/webmin/files/digest-webmin-1.150
new file mode 100644
index 000000000000..c79b69d9cf6e
--- /dev/null
+++ b/app-admin/webmin/files/digest-webmin-1.150
@@ -0,0 +1 @@
+MD5 5566f3b761b5e9498b3da7c7587f9f75 webmin-1.150.tar.gz 7153367
diff --git a/app-admin/webmin/webmin-1.150.ebuild b/app-admin/webmin/webmin-1.150.ebuild
new file mode 100644
index 000000000000..3b026137b8d0
--- /dev/null
+++ b/app-admin/webmin/webmin-1.150.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.150.ebuild,v 1.1 2004/06/12 09:14:59 eradicator Exp $
+
+inherit eutils
+
+IUSE="ssl apache2"
+
+DESCRIPTION="Webmin, a web-based system administration interface"
+SRC_URI="mirror://sourceforge/webadmin/${P}.tar.gz"
+RESTRICT="nomirror"
+HOMEPAGE="http://www.webmin.com/"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="x86 ~ppc ~sparc amd64 ~s390 ~hppa"
+
+DEPEND=""
+RDEPEND="dev-lang/perl
+	ssl? ( dev-perl/Net-SSLeay )
+	dev-perl/XML-Generator"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	# Bug #47020
+	epatch ${FILESDIR}/${PN}-1.130-webalizer.patch
+
+	# Bug #50810, #51943
+	if use apache2; then
+		epatch ${FILESDIR}/${PN}-1.140-apache2.patch
+	fi
+}
+
+src_install() {
+	rm -f mount/freebsd-mounts*
+	rm -f mount/openbsd-mounts*
+	rm -f mount/macos-mounts*
+	(find . -name '*.cgi' ; find . -name '*.pl') | perl perlpath.pl /usr/bin/perl -
+	dodir /usr/libexec/webmin
+	dodir /etc/init.d
+	dodir /var
+	dodir /etc/pam.d
+	cp -rp * ${D}/usr/libexec/webmin
+	mv ${D}/usr/libexec/webmin/openslp/config \
+		${D}/usr/libexec/webmin/openslp/config-gentoo-linux
+
+	exeinto /etc/init.d
+	newexe webmin-gentoo-init webmin
+
+	insinto /etc/pam.d/
+	newins webmin-pam webmin
+	echo gentoo > ${D}/usr/libexec/webmin/install-type
+
+	exeinto /etc/webmin
+	doexe ${FILESDIR}/uninstall.sh
+}
+
+pkg_postinst() {
+	/etc/init.d/webmin stop >/dev/null 2>&1
+	stopstatus=$?
+	cd /usr/libexec/webmin
+	config_dir=/etc/webmin
+	var_dir=/var/log/webmin
+	perl=/usr/bin/perl
+	autoos=1
+	port=10000
+	login=root
+	crypt=`grep "^root:" /etc/shadow | cut -f 2 -d :`
+	host=`hostname`
+	use ssl && ssl=1 || ssl=0
+	atboot=0
+	nostart=1
+	nochown=1
+	autothird=1
+	nouninstall=1
+	noperlpath=1
+	export config_dir var_dir perl autoos port login crypt host ssl nochown autothird nouninstall nostart noperlpath
+	perl /usr/libexec/webmin/maketemp.pl
+	./setup.sh >/tmp/.webmin/webmin-setup.out 2>&1
+
+	if [ "$stopstatus" = "0" ]; then
+		# Start if it was running before
+		/etc/init.d/webmin start
+	fi
+
+	einfo "Add webmin to your boot-time services with 'rc-update add webmin'."
+	einfo "Point your web browser to http://localhost:10000 to use webmin."
+}
+
+pkg_prerm() {
+	/etc/init.d/webmin stop >& /dev/null
+}