Version bump.

(Portage version: 2.1_pre6-r3)

5 files changed, 228 insertions, 12 deletions

diff --git a/app-admin/webmin/ChangeLog b/app-admin/webmin/ChangeLog
index 103c1dad74bf..47025b4ea47e 100644
--- a/app-admin/webmin/ChangeLog
+++ b/app-admin/webmin/ChangeLog
@@ -1,6 +1,12 @@
 # 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.109 2006/01/03 10:29:43 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.110 2006/03/18 10:23:39 eradicator Exp $
+
+*webmin-1.260 (18 Mar 2006)
+
+  18 Mar 2006; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/virtual-server-2.610-checkip.patch, +webmin-1.260.ebuild:
+  Version bump.
 
   03 Jan 2006; Jeremy Huddleston <eradicator@gentoo.org>
   -webmin-1.230.ebuild:
diff --git a/app-admin/webmin/Manifest b/app-admin/webmin/Manifest
index 1035714fd97a..7c0fbcfe04e0 100644
--- a/app-admin/webmin/Manifest
+++ b/app-admin/webmin/Manifest
@@ -1,30 +1,69 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 70aad6afdca18cce32266ab4835e73b3 ChangeLog 4184
+MD5 c97d9b04f65fe7f8e6a11a3c5e44e997 ChangeLog 4311
+RMD160 d57a5be6ac1d6ea24b2f29546a4de4f6d7e4abf9 ChangeLog 4311
+SHA256 0acba5f67ecd1bbf4306d0c021a71facdcbf150658447d96ff38559c9971ed4d ChangeLog 4311
 MD5 6d9dfc76f788500ff3c85cbb42667487 files/digest-webmin-1.170-r3 209
+RMD160 8fabcf0652529ea4036153c96788b43abdce391f files/digest-webmin-1.170-r3 209
+SHA256 f230d544c2143d7449820d904ea2633eeeb23302f4cc6e4fc522451908e7bf19 files/digest-webmin-1.170-r3 209
 MD5 960512668a4e3d56a9e2ad43881852fc files/digest-webmin-1.250 210
+RMD160 58f3df617e01a7bbb9789e73988ad389e7d030af files/digest-webmin-1.250 210
+SHA256 90801d7c4b3e3324a6d2bde54356af86824ae2a1fe797611c15f7c6a1d54346f files/digest-webmin-1.250 210
+MD5 28d68449bf3cd72301a98b9a302edfed files/digest-webmin-1.260 768
+RMD160 c2d1fdef6acd64c1a86c448e9272f47986df7066 files/digest-webmin-1.260 768
+SHA256 8e722f8fd1071136fc0f3c02405ff8ce0518a209c5359f15bc2a10f122081f36 files/digest-webmin-1.260 768
 MD5 54dc8937e05bd76ad86a6c5f5ae6a333 files/init.d.webmin 859
+RMD160 3b08582c897721d9511d2cdb34b259ade6bf8225 files/init.d.webmin 859
+SHA256 8a96c59989ba2a3ae116b9155f72c058dc56be24da355ee1fae43588096520e8 files/init.d.webmin 859
 MD5 bc8eb1c9de103599fc00b140b0ed1f9f files/uninstall.sh 260
+RMD160 57b7230cda3c1fbc3ee0cff5bc6d5e1ce157bbaa files/uninstall.sh 260
+SHA256 91a47a503b8ded8eb14d1e1960729e9909004eb20382201fc91e2a884800160d files/uninstall.sh 260
 MD5 082b9fc08240293b2b7b3609ba8e0cfd files/virtual-server-2.31-checkip.patch 607
+RMD160 6152008443ac70af7734219ffb14db5d24745c97 files/virtual-server-2.31-checkip.patch 607
+SHA256 4d82ef62ac9e4bd7d92ddf21931f00bc6c36a364ca471ee96e9c62c4fa85df41 files/virtual-server-2.31-checkip.patch 607
 MD5 cc16dcb159f84c912365504002444a08 files/virtual-server-2.31-namevirtual.patch 2951
+RMD160 1c2f888bedb57dc5a999115cb5ccb321acc84136 files/virtual-server-2.31-namevirtual.patch 2951
+SHA256 51babd5be584606601eb9d8b0921240b6dfc452000712661eb0934fd61df2184 files/virtual-server-2.31-namevirtual.patch 2951
 MD5 cad6a5577a4c4b3773702ab1bd8d6461 files/virtual-server-2.31-nocgibin.patch 1073
+RMD160 2213688fa357efacaff06424efceebcdf70e3fd0 files/virtual-server-2.31-nocgibin.patch 1073
+SHA256 afc35d28644070dadf93339530c48bd5c84d34f5ef35738b77c62ec7e88385a2 files/virtual-server-2.31-nocgibin.patch 1073
 MD5 4f5dc10c2c1d19218cecfc2a678a0ce4 files/virtual-server-2.31-pgsql.patch 579
+RMD160 3ee322cec151ce88326ed1a138bf7992c4133b41 files/virtual-server-2.31-pgsql.patch 579
+SHA256 33df7ca51ae9f5d7addd43e640c95b7506d595f4a07fe25548ec5f231bda4b37 files/virtual-server-2.31-pgsql.patch 579
 MD5 5a13292127e1353674038bffda8e4a70 files/virtual-server-2.60-nocgibin.patch 1277
+RMD160 b434d3bf825b8e321502acffe1221dbc8a55f690 files/virtual-server-2.60-nocgibin.patch 1277
+SHA256 7a364f75c9dca9ac230ecc88098f61410715fb1416e589513a6ddd575e77765a files/virtual-server-2.60-nocgibin.patch 1277
+MD5 2e5e13d75a542015f01283316fdcf16d files/virtual-server-2.610-checkip.patch 703
+RMD160 21c32714ba93c489b545362e65d02c06cc28c92f files/virtual-server-2.610-checkip.patch 703
+SHA256 dbaebb30bc221aba099f2ea7f1a865edb82d9af8dcadbb4e616b04283257075d files/virtual-server-2.610-checkip.patch 703
 MD5 bb2acab90ada721c723d91a5a97c193c files/webmin-1.130-webalizer.patch 615
+RMD160 23a2182303240e0512b044d28dbfb44e8a3be40d files/webmin-1.130-webalizer.patch 615
+SHA256 3cd7587d93abd0113e3802672c67dffa98bb413c51fdfd7b5923b5d2b7276d0b files/webmin-1.130-webalizer.patch 615
 MD5 395e49092aa7b9e808d3e9d723508884 files/webmin-1.140-apache2.patch 1250
+RMD160 d6085f73b3631f28e4d8154288271fd911bce491 files/webmin-1.140-apache2.patch 1250
+SHA256 024291db8cd2606cdaeee3e6688c2abd75516f9ed8de6fceb337338e1601b6ac files/webmin-1.140-apache2.patch 1250
 MD5 0ebd73f1cd5948ec1c3532a2f59f2c53 files/webmin-1.170-postfix.patch 868
+RMD160 c73c4be29a203431bb6a7314e63ffb65823a81d7 files/webmin-1.170-postfix.patch 868
+SHA256 3bab332f0a2605d6bbc7130a8a00d2743a9ab7c31870daf0419d9e4ef8aa5e28 files/webmin-1.170-postfix.patch 868
 MD5 512204473654b6eb41308d3319ba6144 files/webmin-1.170-setup-nocheck.patch 943
+RMD160 a6fdb34184261c63ed738f9435c4a31f4d988cff files/webmin-1.170-setup-nocheck.patch 943
+SHA256 5bb71c9a5eb76d98757b2892cd3a0b656593f5136d5109f49bc7191b9a7f3aa1 files/webmin-1.170-setup-nocheck.patch 943
 MD5 c53333c5a45f347207179bd957253b86 files/webmin-1.230-ldap-useradmin.patch 905
+RMD160 cd3f6812d5e7cf0bac7d9d9a43a43a1f4ea6b8b0 files/webmin-1.230-ldap-useradmin.patch 905
+SHA256 fea76b9353770fff0240bfb0bbe4f531d638861fb1021b2fdbe6950f8b79dc41 files/webmin-1.230-ldap-useradmin.patch 905
 MD5 6a55026b21c4da9284b31236deeceda7 files/webmin-gentoo-init 864
+RMD160 6e584eb9bb77b014e688cc13bdce99f315fec41b files/webmin-gentoo-init 864
+SHA256 f27fb9f944f32994858a3d27aa78d03742618c53267f31bca85d9f65da1c757b files/webmin-gentoo-init 864
 MD5 7d80c86adbd36eeb8f220b9efdd30819 files/webmin-pam 101
+RMD160 f2e1f98eae4cfb1dc485675e60cd73aba6e6ca47 files/webmin-pam 101
+SHA256 93df67451eae9866fcbc23453c18c4fe23a7b5c8dd879de16c09b476d1db597f files/webmin-pam 101
 MD5 3923b6ae9bc25fc124e24e7747c8a802 metadata.xml 226
+RMD160 5ae23077f29775d25714161f12bee0773317ea90 metadata.xml 226
+SHA256 2dedab96a5432a22169e538ec05751e1631088c658b557056de4d6ab4b89013f metadata.xml 226
 MD5 c6d3309b62a5ba19e3aa3893e0cca346 webmin-1.170-r3.ebuild 3681
+RMD160 ebf73f83cf4f2e1001ea0fa2646790f67f5633cc webmin-1.170-r3.ebuild 3681
+SHA256 f2750857cd1ed6304198a4551ce06ea08ff4caf69785c9f21f91842ca257f536 webmin-1.170-r3.ebuild 3681
 MD5 feeac49d3448abf1d8e155f3a63d3b11 webmin-1.250.ebuild 4106
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDulIkOpjtAl+gMRURAi7ZAKCey4b0lWM25My5UH2oj5PxJnUY9wCdH+2b
-lUe5KxbjZCnjZ/Mhn2sEO+U=
-=N7qn
------END PGP SIGNATURE-----
+RMD160 50a3307e3c3f14e8d049304a4936d36465fb0d45 webmin-1.250.ebuild 4106
+SHA256 2a10a6f7f2bee1838d5fbef929c5cfc799a64f8fc40b7e3a8c55a1c0ee60686b webmin-1.250.ebuild 4106
+MD5 17f911acabb733112ab869098300caa8 webmin-1.260.ebuild 4117
+RMD160 59260b1530e7466b7d635deb0e51067465946f27 webmin-1.260.ebuild 4117
+SHA256 8037d09e73f6fc806c027b8e280d910de36b8932f7f9f3a60ac7beafcf1f2410 webmin-1.260.ebuild 4117
diff --git a/app-admin/webmin/files/digest-webmin-1.260 b/app-admin/webmin/files/digest-webmin-1.260
new file mode 100644
index 000000000000..905538536ed8
--- /dev/null
+++ b/app-admin/webmin/files/digest-webmin-1.260
@@ -0,0 +1,9 @@
+MD5 df46d1f7b075cf32fa8ca4bdf121354a virtual-server-2.610.wbm.gz 281828
+RMD160 03ceb41b68ca454138fd41fbce135c5f20f2473d virtual-server-2.610.wbm.gz 281828
+SHA256 7ed07d52fe6697217835aa97f63422aafc4ff166693482e93aa9a6adb55ce489 virtual-server-2.610.wbm.gz 281828
+MD5 72c68b700eb5f7d16cfa50fd2b22d382 webmin-1.260-minimal.tar.gz 1258472
+RMD160 8e7598c9a24478e6513a968ff62c7b18562a04e2 webmin-1.260-minimal.tar.gz 1258472
+SHA256 8b61208ea9b16f063a1d0daf05727475cc2a9e705fd0f3fa0a4a4e1364ed4949 webmin-1.260-minimal.tar.gz 1258472
+MD5 c45fe387902405cb36a1a5c6a240ad0d webmin-1.260.tar.gz 9014687
+RMD160 5b4719f59933dc24957b7c26e177e57e688393cb webmin-1.260.tar.gz 9014687
+SHA256 876e37bc6e1792451e982704749580ff2363c5aef0b9e5a04fcf93d2a367df84 webmin-1.260.tar.gz 9014687
diff --git a/app-admin/webmin/files/virtual-server-2.610-checkip.patch b/app-admin/webmin/files/virtual-server-2.610-checkip.patch
new file mode 100644
index 000000000000..70cc065a20ca
--- /dev/null
+++ b/app-admin/webmin/files/virtual-server-2.610-checkip.patch
@@ -0,0 +1,16 @@
+diff -Naurp webmin-1.260.orig/virtual-server/virtual-server-lib.pl webmin-1.260/virtual-server/virtual-server-lib.pl
+--- webmin-1.260.orig/virtual-server/virtual-server-lib.pl	2005-12-18 14:42:40.000000000 -0800
++++ webmin-1.260/virtual-server/virtual-server-lib.pl	2006-03-18 02:15:48.000000000 -0800
+@@ -2080,7 +2080,12 @@ if (!$config{'iface_manual'}) {
+ 		$vmax = $b->{'virtual'}
+ 			if ($b->{'name'} eq $iface->{'name'} &&
+ 			    $b->{'virtual'} > $vmax);
++
++		if($b->{'address'} eq $_[0]->{'ip'}) {
++			print "IP address is already active.<p>\n";
++			return;
+ 		}
++	}
+ 	local $virt = { 'address' => $_[0]->{'ip'},
+ 			'netmask' => $net::virtual_netmask || $iface->{'netmask'},
+ 			'broadcast' =>
diff --git a/app-admin/webmin/webmin-1.260.ebuild b/app-admin/webmin/webmin-1.260.ebuild
new file mode 100644
index 000000000000..a70e66f4d992
--- /dev/null
+++ b/app-admin/webmin/webmin-1.260.ebuild
@@ -0,0 +1,146 @@
+# 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.260.ebuild,v 1.1 2006/03/18 10:23:39 eradicator Exp $
+
+IUSE="apache2 postgres ssl webmin-minimal"
+
+inherit eutils pam
+
+VM_V="2.610"
+
+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}.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"
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}
+	 ssl? ( dev-perl/Net-SSLeay )
+	 postgres? ( dev-perl/DBD-Pg )
+	 dev-perl/XML-Generator"
+
+# See bug #62123
+#	 pam? ( dev-perl/Authen-PAM )
+
+
+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.230-ldap-useradmin.patch
+
+		# Postfix should modify the last entry of the maps file
+		epatch ${FILESDIR}/${PN}-1.170-postfix.patch
+
+		mv ${WORKDIR}/virtual-server-${VM_V}.wbm ${T}/vs.tar
+		tar -xf ${T}/vs.tar
+
+		# Don't create ${HOME}/cgi-bin on new accounts
+		epatch ${FILESDIR}/virtual-server-2.60-nocgibin.patch
+
+		# Check if a newly added IP is already active
+		epatch ${FILESDIR}/virtual-server-2.610-checkip.patch
+
+		# Verify Postgres usernames
+		epatch ${FILESDIR}/virtual-server-2.31-pgsql.patch
+
+		# Fix some all name virtual items
+		epatch ${FILESDIR}/virtual-server-2.31-namevirtual.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
+}