Version bump.

(Portage version: 2.1_pre7-r5)

5 files changed, 183 insertions, 11 deletions

diff --git a/app-admin/webmin/ChangeLog b/app-admin/webmin/ChangeLog
index 572af20092da..38fb4d7deaa2 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.111 2006/04/03 05:02:00 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.112 2006/04/12 08:16:00 eradicator Exp $
+
+*webmin-1.270 (12 Apr 2006)
+
+  12 Apr 2006; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/webmin-1.270-ldap-useradmin.patch, +webmin-1.270.ebuild:
+  Version bump.
 
 *webmin-1.260 (18 Mar 2006)
 
diff --git a/app-admin/webmin/Manifest b/app-admin/webmin/Manifest
index db04a42df602..ccf5f0d5beba 100644
--- a/app-admin/webmin/Manifest
+++ b/app-admin/webmin/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 9595236d63e057f5e4bcfa6dc20ff018 ChangeLog 15642
 RMD160 dc995a56642b4f80edcb8e8ad459f496f09e7ae2 ChangeLog 15642
 SHA256 3b876d14d55933ea458f3e5c1f72265770b8becfb0d7cacec394b34acb9f7bf9 ChangeLog 15642
@@ -13,6 +10,9 @@ SHA256 90801d7c4b3e3324a6d2bde54356af86824ae2a1fe797611c15f7c6a1d54346f files/di
 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 d478f0f75fb839a02edbc2a1e9d008f3 files/digest-webmin-1.270 768
+RMD160 c2c57695c52cad904f2c57ceab943badb0d29107 files/digest-webmin-1.270 768
+SHA256 fceb1c6c2e5229f69399838b121acdd0873705946ea237aec90d6c64b6e5fbb4 files/digest-webmin-1.270 768
 MD5 54dc8937e05bd76ad86a6c5f5ae6a333 files/init.d.webmin 859
 RMD160 3b08582c897721d9511d2cdb34b259ade6bf8225 files/init.d.webmin 859
 SHA256 8a96c59989ba2a3ae116b9155f72c058dc56be24da355ee1fae43588096520e8 files/init.d.webmin 859
@@ -52,6 +52,9 @@ SHA256 5bb71c9a5eb76d98757b2892cd3a0b656593f5136d5109f49bc7191b9a7f3aa1 files/we
 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 5d06113bd08dbb7320efb398aa6ca1d2 files/webmin-1.270-ldap-useradmin.patch 582
+RMD160 a61b31b787aa1e8c4c63f04c00736ac574262fbe files/webmin-1.270-ldap-useradmin.patch 582
+SHA256 57c8766c7c46a3d9a34099ba4285b39f23b538241f563455c83866945d3a73ef files/webmin-1.270-ldap-useradmin.patch 582
 MD5 6a55026b21c4da9284b31236deeceda7 files/webmin-gentoo-init 864
 RMD160 6e584eb9bb77b014e688cc13bdce99f315fec41b files/webmin-gentoo-init 864
 SHA256 f27fb9f944f32994858a3d27aa78d03742618c53267f31bca85d9f65da1c757b files/webmin-gentoo-init 864
@@ -70,10 +73,6 @@ SHA256 2a10a6f7f2bee1838d5fbef929c5cfc799a64f8fc40b7e3a8c55a1c0ee60686b webmin-1
 MD5 e9a8505e8d22d3c4bd4a66bd532a3ea1 webmin-1.260.ebuild 4121
 RMD160 84ab4b0e19bb9555d0fc856f0e1f4539107dc690 webmin-1.260.ebuild 4121
 SHA256 0983ba5df86c37ef988ae91a3922fd5ec33e748aae125aa7f4f686728a18fb65 webmin-1.260.ebuild 4121
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEMKxiOpjtAl+gMRURAiOTAJwIxBV4DKoCnw6TSxUAOfG4kBEQGgCbBkiT
-+BVTWfnIXp4WYY4DrXW7R+0=
-=C8Xn
------END PGP SIGNATURE-----
+MD5 b1a6d8fa9ea3bca8839f4965e3a30775 webmin-1.270.ebuild 4121
+RMD160 67b33d7239ca661284e2649bca120e025d1c885b webmin-1.270.ebuild 4121
+SHA256 3efd230722e640b7fc9cfbd6ca6f349dda9a76a6e7a545e9002a887a955282b6 webmin-1.270.ebuild 4121
diff --git a/app-admin/webmin/files/digest-webmin-1.270 b/app-admin/webmin/files/digest-webmin-1.270
new file mode 100644
index 000000000000..e9283f22d8a9
--- /dev/null
+++ b/app-admin/webmin/files/digest-webmin-1.270
@@ -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 65b48e116fbd5a2aa5c8fce4f776d86b webmin-1.270-minimal.tar.gz 1301974
+RMD160 94847d56eb9aebefc234178656dc53daa3af91c6 webmin-1.270-minimal.tar.gz 1301974
+SHA256 ee55df6476812289a42d75d5b7833bb666500d0321a80056fa4ba006032083dc webmin-1.270-minimal.tar.gz 1301974
+MD5 f9e103f7ee20a77e540335986c2c3f01 webmin-1.270.tar.gz 9418746
+RMD160 9fd621f1a9e418940d3c8ebcad7e21ee28b8e0d1 webmin-1.270.tar.gz 9418746
+SHA256 aa9bbf6589af5bb6b8e2203492c24b885b5ffed555ceab63a08bef07c6e3a311 webmin-1.270.tar.gz 9418746
diff --git a/app-admin/webmin/files/webmin-1.270-ldap-useradmin.patch b/app-admin/webmin/files/webmin-1.270-ldap-useradmin.patch
new file mode 100644
index 000000000000..5fc3f31ff868
--- /dev/null
+++ b/app-admin/webmin/files/webmin-1.270-ldap-useradmin.patch
@@ -0,0 +1,12 @@
+diff -Naurp webmin-1.270.orig/ldap-useradmin/save_user.cgi webmin-1.270/ldap-useradmin/save_user.cgi
+--- webmin-1.270.orig/ldap-useradmin/save_user.cgi	2006-04-04 16:16:16.000000000 -0700
++++ webmin-1.270/ldap-useradmin/save_user.cgi	2006-04-12 01:11:04.000000000 -0700
+@@ -319,7 +319,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'});
diff --git a/app-admin/webmin/webmin-1.270.ebuild b/app-admin/webmin/webmin-1.270.ebuild
new file mode 100644
index 000000000000..3c31d27786e6
--- /dev/null
+++ b/app-admin/webmin/webmin-1.270.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.270.ebuild,v 1.1 2006/04/12 08:16:00 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.270-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
+}