Version bump for bug #106705.

(Portage version: 2.0.52-r1)

8 files changed, 62 insertions, 164 deletions

diff --git a/app-admin/webmin/ChangeLog b/app-admin/webmin/ChangeLog
index 3f18f10dfb6c..0e309e5d9f6d 100644
--- a/app-admin/webmin/ChangeLog
+++ b/app-admin/webmin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/webmin
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.98 2005/09/09 14:17:52 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.99 2005/09/21 23:57:57 eradicator Exp $
+
+*webmin-1.230 (21 Sep 2005)
+
+  21 Sep 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/webmin-1.230-ldap-useradmin.patch, +webmin-1.230.ebuild:
+  Version bump for bug #106705.
 
   09 Sep 2005; Aron Griffis <agriffis@gentoo.org> webmin-1.210-r1.ebuild:
   Mark 1.210-r1 stable on alpha
diff --git a/app-admin/webmin/Manifest b/app-admin/webmin/Manifest
index 2cdf79bd60c5..06eb43f17eb0 100644
--- a/app-admin/webmin/Manifest
+++ b/app-admin/webmin/Manifest
@@ -1,23 +1,26 @@
-MD5 c6d3309b62a5ba19e3aa3893e0cca346 webmin-1.170-r3.ebuild 3681
+MD5 e9f38250aa981f91cd0cb3ac91950ea4 webmin-1.220.ebuild 3977
 MD5 3923b6ae9bc25fc124e24e7747c8a802 metadata.xml 226
+MD5 c6d3309b62a5ba19e3aa3893e0cca346 webmin-1.170-r3.ebuild 3681
+MD5 52f14f458161c1ba80820f4fd26807d2 webmin-1.230.ebuild 4108
+MD5 12670d89aecc1330362cb34bc653bd9e webmin-1.200.ebuild 3829
 MD5 57cc56e4ca4f7b9f37032666e9d421e4 ChangeLog 2898
-MD5 e9f38250aa981f91cd0cb3ac91950ea4 webmin-1.220.ebuild 3977
 MD5 f967ac80dd5964238529b77dfc8ea37f webmin-1.210-r1.ebuild 4048
-MD5 12670d89aecc1330362cb34bc653bd9e webmin-1.200.ebuild 3829
+MD5 171e9e052878636913441103aac011b0 files/digest-webmin-1.210-r1 209
+MD5 6d9dfc76f788500ff3c85cbb42667487 files/digest-webmin-1.170-r3 209
+MD5 eee259ae52a25169e6cd54a746f4865e files/digest-webmin-1.200 209
 MD5 4606e734c7cf033a25cfd679fa68ef31 files/digest-webmin-1.220 210
-MD5 bb2acab90ada721c723d91a5a97c193c files/webmin-1.130-webalizer.patch 615
+MD5 54dc8937e05bd76ad86a6c5f5ae6a333 files/init.d.webmin 859
+MD5 bc8eb1c9de103599fc00b140b0ed1f9f files/uninstall.sh 260
+MD5 082b9fc08240293b2b7b3609ba8e0cfd files/virtual-server-2.31-checkip.patch 607
+MD5 cc16dcb159f84c912365504002444a08 files/virtual-server-2.31-namevirtual.patch 2951
+MD5 cad6a5577a4c4b3773702ab1bd8d6461 files/virtual-server-2.31-nocgibin.patch 1073
 MD5 4f5dc10c2c1d19218cecfc2a678a0ce4 files/virtual-server-2.31-pgsql.patch 579
-MD5 512204473654b6eb41308d3319ba6144 files/webmin-1.170-setup-nocheck.patch 943
-MD5 eee259ae52a25169e6cd54a746f4865e files/digest-webmin-1.200 209
 MD5 5a13292127e1353674038bffda8e4a70 files/virtual-server-2.60-nocgibin.patch 1277
-MD5 7d80c86adbd36eeb8f220b9efdd30819 files/webmin-pam 101
+MD5 bb2acab90ada721c723d91a5a97c193c files/webmin-1.130-webalizer.patch 615
 MD5 395e49092aa7b9e808d3e9d723508884 files/webmin-1.140-apache2.patch 1250
-MD5 cad6a5577a4c4b3773702ab1bd8d6461 files/virtual-server-2.31-nocgibin.patch 1073
-MD5 6d9dfc76f788500ff3c85cbb42667487 files/digest-webmin-1.170-r3 209
 MD5 0ebd73f1cd5948ec1c3532a2f59f2c53 files/webmin-1.170-postfix.patch 868
-MD5 bc8eb1c9de103599fc00b140b0ed1f9f files/uninstall.sh 260
+MD5 512204473654b6eb41308d3319ba6144 files/webmin-1.170-setup-nocheck.patch 943
 MD5 6a55026b21c4da9284b31236deeceda7 files/webmin-gentoo-init 864
-MD5 082b9fc08240293b2b7b3609ba8e0cfd files/virtual-server-2.31-checkip.patch 607
-MD5 171e9e052878636913441103aac011b0 files/digest-webmin-1.210-r1 209
-MD5 cc16dcb159f84c912365504002444a08 files/virtual-server-2.31-namevirtual.patch 2951
-MD5 54dc8937e05bd76ad86a6c5f5ae6a333 files/init.d.webmin 859
+MD5 7d80c86adbd36eeb8f220b9efdd30819 files/webmin-pam 101
+MD5 1b791b42466b4d6db599c2b8fed29871 files/digest-webmin-1.230 210
+MD5 73662f8b42bfc57da6aac49af62625f2 files/webmin-1.230-ldap-useradmin.patch 678
diff --git a/app-admin/webmin/files/digest-webmin-1.200 b/app-admin/webmin/files/digest-webmin-1.200
deleted file mode 100644
index 889e1cb9dd6e..000000000000
--- a/app-admin/webmin/files/digest-webmin-1.200
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4df07c16715458f9873f07ec92fbbbda webmin-1.200-minimal.tar.gz 1077249
-MD5 371711be0c2bf0ff30c1c01192425b3c webmin-1.200.tar.gz 7835665
-MD5 956142bcbe1d50896d9a22411c05e918 virtual-server-2.50.wbm.gz 247382
diff --git a/app-admin/webmin/files/digest-webmin-1.220 b/app-admin/webmin/files/digest-webmin-1.220
deleted file mode 100644
index ae982ae466a0..000000000000
--- a/app-admin/webmin/files/digest-webmin-1.220
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 fdf59d6570c1aaba526d8d2b71149237 webmin-1.220-minimal.tar.gz 1182630
-MD5 8f32efc42488639519dfc4ca1ec200f4 webmin-1.220.tar.gz 8579545
-MD5 a6e5127a67b0b5bfca58d33334aceb55 virtual-server-2.601.wbm.gz 275382
diff --git a/app-admin/webmin/files/digest-webmin-1.230 b/app-admin/webmin/files/digest-webmin-1.230
new file mode 100644
index 000000000000..3bec412f7326
--- /dev/null
+++ b/app-admin/webmin/files/digest-webmin-1.230
@@ -0,0 +1,3 @@
+MD5 6075f13ac3839b6a78af155009f88835 webmin-1.230-minimal.tar.gz 1219630
+MD5 de55064c8bc590b4dfdb3df8aa95c422 webmin-1.230.tar.gz 8705548
+MD5 a6e5127a67b0b5bfca58d33334aceb55 virtual-server-2.601.wbm.gz 275382
diff --git a/app-admin/webmin/files/webmin-1.230-ldap-useradmin.patch b/app-admin/webmin/files/webmin-1.230-ldap-useradmin.patch
new file mode 100644
index 000000000000..bc7562db4720
--- /dev/null
+++ b/app-admin/webmin/files/webmin-1.230-ldap-useradmin.patch
@@ -0,0 +1,23 @@
+diff -Naurp webmin-1.230.orig/ldap-useradmin/save_user.cgi webmin-1.230/ldap-useradmin/save_user.cgi
+--- webmin-1.230.orig/ldap-useradmin/save_user.cgi	2005-09-19 05:32:05.000000000 -0700
++++ webmin-1.230/ldap-useradmin/save_user.cgi	2005-09-21 16:54:26.000000000 -0700
+@@ -301,7 +301,7 @@ else {
+ 		$shadow = &shadow_fields();
+ 
+ 		# Add to the ldap database
+-		@classes = ( "posixAccount", "shadowAccount" );
++		@classes = ( "posixAccount", "shadowAccount", "person" );
+ 
+ 		push(@classes, split(/\s+/, $config{'other_class'}));
+ 		push(@classes, $samba_class) if ($in{'samba'});
+@@ -718,8 +718,8 @@ if ($config{'given'}) {
+ 		if ($lastname && &in_schema($schema, "sn"));
+ 	}
+ else {
+-	#push(@props, "sn", $in{'real'})
+-	#	if (&in_schema($schema, "sn"));
++	push(@props, "sn", $in{'real'})
++		if (&in_schema($schema, "sn"));
+ 	}
+ if (&in_schema($schema, "gecos")) {
+ 	push(@props, "gecos", $in{'real'});
diff --git a/app-admin/webmin/webmin-1.200.ebuild b/app-admin/webmin/webmin-1.200.ebuild
deleted file mode 100644
index a2d096c12189..000000000000
--- a/app-admin/webmin/webmin-1.200.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# 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.200.ebuild,v 1.8 2005/07/13 20:56:47 eradicator Exp $
-
-IUSE="apache2 postgres ssl webmin-minimal"
-
-inherit eutils
-
-VM_V="2.50"
-
-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 hppa ppc ppc64 s390 sparc x86"
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
-	 ssl? ( dev-perl/Net-SSLeay )
-	 postgres? ( dev-perl/DBD-Pg )
-	 dev-perl/XML-Generator"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-
-	# in webmin-minimal webalizer and apache2 are not present
-	if ! use webmin-minimal ; then
-		# Bug #47020
-		epatch ${FILESDIR}/${PN}-1.130-webalizer.patch
-
-		# Bug #50810, #51943
-		if use apache2; then
-			epatch ${FILESDIR}/${PN}-1.140-apache2.patch
-		fi
-
-		# 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.31-nocgibin.patch
-
-		# Check if a newly added IP is already active
-		epatch ${FILESDIR}/virtual-server-2.31-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() {
-	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
-
-	# 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
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/init.d.webmin webmin
-
-	insinto /etc/pam.d/
-	newins ${FILESDIR}/webmin-pam webmin
-	echo gentoo > ${D}/usr/libexec/webmin/install-type
-
-	# Fix ownership
-	chown -R root:root ${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 's:^pidfile=.*$:pidfile=/var/run/webmin.pid:' ${D}/etc/webmin/miniserv.conf
-	find ${D}/etc/webmin -type f -exec sed -i "s:${D}:${ROOT}:g" {} \;
-
-	# Cleanup from the config script
-	rm -rf ${D}/var/log/webmin
-	keepdir /var/log/webmin/
-}
-
-pkg_postinst() {
-	local crypt=$(grep "^root:" ${ROOT}/etc/shadow | cut -f 2 -d :)
-	crypt=${crypt//\\/\\\\}
-	crypt=${crypt//\//\\\/}
-	sed -i "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."
-}
-
-pkg_prerm() {
-	${ROOT}/etc/init.d/webmin stop >& /dev/null
-}
diff --git a/app-admin/webmin/webmin-1.220.ebuild b/app-admin/webmin/webmin-1.230.ebuild
index a18f04ef0774..75bba8262c68 100644
--- a/app-admin/webmin/webmin-1.220.ebuild
+++ b/app-admin/webmin/webmin-1.230.ebuild
@@ -1,8 +1,8 @@
 # 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.220.ebuild,v 1.1 2005/09/03 23:32:33 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.230.ebuild,v 1.1 2005/09/21 23:57:57 eradicator Exp $
 
-IUSE="apache2 pam postgres ssl webmin-minimal"
+IUSE="apache2 postgres ssl webmin-minimal"
 
 inherit eutils pam
 
@@ -18,15 +18,18 @@ LICENSE="BSD"
 SLOT="0"
 
 # ~mips removed because of broken deps. Bug #86085
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~s390 sparc x86"
 
 DEPEND="dev-lang/perl"
 RDEPEND="${DEPEND}
-	 pam? ( virtual/pam )
 	 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}
 
@@ -39,6 +42,9 @@ src_unpack() {
 			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
 
@@ -112,13 +118,14 @@ src_install() {
 	${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=/var/run/webmin.pid:' ${D}/etc/webmin/miniserv.conf
+	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
 }