Version bump for security bug #145829.

(Portage version: 2.1.2_pre1)

6 files changed, 202 insertions, 1 deletions

diff --git a/app-admin/webmin/ChangeLog b/app-admin/webmin/ChangeLog
index 0f2cbe9be204..c4830edca86f 100644
--- a/app-admin/webmin/ChangeLog
+++ b/app-admin/webmin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-admin/webmin
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.126 2006/08/04 16:55:04 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.127 2006/10/16 19:14:58 eradicator Exp $
+
+*webmin-1.300 (16 Oct 2006)
+
+  16 Oct 2006; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/webmin-1.300-postfix.patch,
+  +files/virtual-server-3.23-nocgibin.patch,
+  +files/virtual-server-3.23-pgsql.patch, +webmin-1.300.ebuild:
+  Version bump for security bug #145829.
 
   04 Aug 2006; Thomas Cort <tcort@gentoo.org> webmin-1.290.ebuild:
   Stable on amd64 wrt security Bug #138552.
diff --git a/app-admin/webmin/files/digest-webmin-1.300 b/app-admin/webmin/files/digest-webmin-1.300
new file mode 100644
index 000000000000..bd5a7c8ef3f1
--- /dev/null
+++ b/app-admin/webmin/files/digest-webmin-1.300
@@ -0,0 +1,9 @@
+MD5 f74d252d7fa9c736895fb3a257dd3edc virtual-server-3.23.gpl.wbm.gz 379417
+RMD160 912ba4ff66b7644f05e7e5b52286b5a41cf7163d virtual-server-3.23.gpl.wbm.gz 379417
+SHA256 c5631f73921058df40a08b0d248bad1acf1dd5b7ded451c7c6f9fff1d923a360 virtual-server-3.23.gpl.wbm.gz 379417
+MD5 5d232a887529aa0376fe281d9027f9a5 webmin-1.300-minimal.tar.gz 1404945
+RMD160 cb5bab5a5f34b9bc256d7ed91677441018ef6d6a webmin-1.300-minimal.tar.gz 1404945
+SHA256 29cc112d99995acc74a2dc69aaa6cf0eb2b1169307b0485d70661b7c03a40c98 webmin-1.300-minimal.tar.gz 1404945
+MD5 b1c170a8e62705ba7a376a8bff90c422 webmin-1.300.tar.gz 10782513
+RMD160 1259e16725ea7f2491dd91d2d6eef8e80f1240d8 webmin-1.300.tar.gz 10782513
+SHA256 d5ce8bb7ef0c3e0d38ebd43e962aba984276dc6f23f8f913f712aaac2f17b1a4 webmin-1.300.tar.gz 10782513
diff --git a/app-admin/webmin/files/virtual-server-3.23-nocgibin.patch b/app-admin/webmin/files/virtual-server-3.23-nocgibin.patch
new file mode 100644
index 000000000000..f527efc9ae98
--- /dev/null
+++ b/app-admin/webmin/files/virtual-server-3.23-nocgibin.patch
@@ -0,0 +1,13 @@
+diff -Naurp webmin-1.300.orig/virtual-server/feature-dir.pl webmin-1.300/virtual-server/feature-dir.pl
+--- webmin-1.300.orig/virtual-server/feature-dir.pl	2006-10-01 17:21:42.000000000 -0700
++++ webmin-1.300/virtual-server/feature-dir.pl	2006-10-16 12:01:09.000000000 -0700
+@@ -262,8 +262,8 @@ sub virtual_server_directories
+ {
+ local $tmpl = &get_template($_[0]->{'template'});
+ local $perms = $tmpl->{'web_html_perms'};
++#         [ 'cgi-bin', $perms ],
+ return ( [ &public_html_dir($_[0], 1), $perms ],
+-         [ 'cgi-bin', $perms ],
+          [ 'logs', '750' ],
+          [ $config{'homes_dir'}, '755' ] );
+ }
diff --git a/app-admin/webmin/files/virtual-server-3.23-pgsql.patch b/app-admin/webmin/files/virtual-server-3.23-pgsql.patch
new file mode 100644
index 000000000000..3f10f5daa9af
--- /dev/null
+++ b/app-admin/webmin/files/virtual-server-3.23-pgsql.patch
@@ -0,0 +1,14 @@
+diff -Naurp webmin-1.300.orig/virtual-server/domain_setup.cgi webmin-1.300/virtual-server/domain_setup.cgi
+--- webmin-1.300.orig/virtual-server/domain_setup.cgi	2006-10-01 17:21:42.000000000 -0700
++++ webmin-1.300/virtual-server/domain_setup.cgi	2006-10-16 12:07:09.000000000 -0700
+@@ -81,6 +81,10 @@ if (!$parentuser) {
+ 		defined(getpwnam($user)) && &error($text{'setup_euser'});
+ 		}
+ 
++	if ($config{'postgres'} && $in{'postgres'}) {
++		$user =~ /^[A-Za-z]/ || &error("Username must begin with a letter if you are using postgres.");
++		}
++
+ 	# Parse mail group name
+ 	if ($in{'mgroup_def'}) {
+ 		$in{'dom'} =~ /^([^\.]+)/;
diff --git a/app-admin/webmin/files/webmin-1.300-postfix.patch b/app-admin/webmin/files/webmin-1.300-postfix.patch
new file mode 100644
index 000000000000..15384d689012
--- /dev/null
+++ b/app-admin/webmin/files/webmin-1.300-postfix.patch
@@ -0,0 +1,22 @@
+diff -Naurp webmin-1.300.orig/postfix/postfix-lib.pl webmin-1.300/postfix/postfix-lib.pl
+--- webmin-1.300.orig/postfix/postfix-lib.pl	2006-09-14 15:21:43.000000000 -0700
++++ webmin-1.300/postfix/postfix-lib.pl	2006-10-16 11:55:45.000000000 -0700
+@@ -682,15 +682,15 @@ sub create_mapping
+ {
+ &get_maps($_[0], $_[2]);	# force cache init
+ my @maps_files = $_[2] ? @{$_[2]} : &get_maps_files(&get_real_value($_[0]));
+-local $lref = &read_file_lines($maps_files[0]);
++local $lref = &read_file_lines($maps_files[$#maps_files]);
+ $_[1]->{'line'} = scalar(@$lref);
+ push(@$lref, &make_table_comment($_[1]->{'cmt'}));
+ push(@$lref, "$_[1]->{'name'}\t$_[1]->{'value'}");
+ $_[1]->{'eline'} = scalar(@$lref)-1;
+ &flush_file_lines();
+ 
+-$_[1]->{'map_file'} = $maps_files[0];
+-$_[1]->{'file'} = $maps_files[0];
++$_[1]->{'map_file'} = $maps_files[$#maps_files];
++$_[1]->{'file'} = $maps_files[$#maps_files];
+ $_[1]->{'number'} = scalar(@{$maps_cache{$_[0]}});
+ push(@{$maps_cache{$_[0]}}, $_[1]);
+ }
diff --git a/app-admin/webmin/webmin-1.300.ebuild b/app-admin/webmin/webmin-1.300.ebuild
new file mode 100644
index 000000000000..daed0d4b7e85
--- /dev/null
+++ b/app-admin/webmin/webmin-1.300.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.300.ebuild,v 1.1 2006/10/16 19:14:58 eradicator Exp $
+
+inherit eutils pam
+
+VM_V="3.23"
+
+DESCRIPTION="Webmin, a web-based system administration interface"
+HOMEPAGE="http://www.webmin.com/"
+SRC_URI="webmin-minimal? ( mirror://sourceforge/webadmin/${P}-minimal.tar.gz )
+	 !webmin-minimal? ( mirror://sourceforge/webadmin/${P}.tar.gz
+	                   http://www.webmin.com/download/virtualmin/virtual-server-${VM_V}.gpl.wbm.gz )"
+
+LICENSE="BSD"
+SLOT="0"
+# ~mips removed because of broken deps. Bug #86085
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="apache2 pam postgres ssl webmin-minimal"
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}
+	 ssl? ( dev-perl/Net-SSLeay )
+	 postgres? ( dev-perl/DBD-Pg )
+	 pam? ( dev-perl/Authen-PAM )
+	 dev-perl/XML-Generator"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+
+	# in webmin-minimal apache2 are not present
+	if ! use webmin-minimal ; then
+		# Bug #50810, #51943
+		if use apache2; then
+			epatch "${FILESDIR}"/${PN}-1.140-apache2.patch
+		fi
+
+		# Correct ldapness
+		epatch "${FILESDIR}"/${PN}-1.270-ldap-useradmin.patch
+
+		# Postfix should modify the last entry of the maps file
+		epatch "${FILESDIR}"/${PN}-1.300-postfix.patch
+
+		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
+
+		# Verify Postgres usernames
+		epatch "${FILESDIR}"/virtual-server-3.23-pgsql.patch
+	fi
+
+	epatch "${FILESDIR}"/${PN}-1.170-setup-nocheck.patch
+}
+
+src_install() {
+	# Bug #97212
+	addpredict /var/lib/rpm
+
+	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 /var
+
+	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
+	fi
+
+	newinitd "${FILESDIR}"/init.d.webmin webmin
+
+	newpamd "${FILESDIR}"/webmin-pam webmin
+	echo gentoo > ${D}/usr/libexec/webmin/install-type
+
+	# Fix ownership
+	chown -R root:0 ${D}
+
+	dodir /etc/webmin
+	dodir /var/log/webmin
+
+	config_dir=${D}/etc/webmin
+	var_dir=${D}/var/log/webmin
+	perl=${ROOT}/usr/bin/perl
+	autoos=1
+	port=10000
+	login=root
+	crypt="XXX"
+	host=`hostname`
+	use ssl && ssl=1 || ssl=0
+	atboot=0
+	nostart=1
+	nochown=1
+	autothird=1
+	nouninstall=1
+	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."
+
+	# Fixup the config files to use their real locations
+	sed -i -e "s:^pidfile=.*$:pidfile=${ROOT}/var/run/webmin.pid:" ${D}/etc/webmin/miniserv.conf
+	find ${D}/etc/webmin -type f | xargs sed -i -e "s:${D}:${ROOT}:g"
+
+	# Cleanup from the config script
+	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
+}
+
+pkg_postinst() {
+	local crypt=$(grep "^root:" ${ROOT}/etc/shadow | cut -f 2 -d :)
+	crypt=${crypt//\\/\\\\}
+	crypt=${crypt//\//\\\/}
+	sed -i -e "s/root:XXX/root:${crypt}/" /etc/webmin/miniserv.users
+
+	einfo "To make webmin start at boot time, run: 'rc-update add webmin default'."
+	use ssl && einfo "Point your web browser to https://localhost:10000 to use webmin."
+	use ssl || einfo "Point your web browser to http://localhost:10000 to use webmin."
+}
+
+pkg_prerm() {
+	"${ROOT}"/etc/init.d/webmin stop >& /dev/null
+}