bump for 142293, fix webmin-pam

(Portage version: 2.1.2_pre3-r9)

6 files changed, 303 insertions, 1 deletions

diff --git a/app-admin/webmin/ChangeLog b/app-admin/webmin/ChangeLog
index 7b40d957680d..14e1f7207c67 100644
--- a/app-admin/webmin/ChangeLog
+++ b/app-admin/webmin/ChangeLog
@@ -1,6 +1,13 @@
 # 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.134 2006/10/24 10:47:58 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.135 2006/12/02 01:28:41 antarus Exp $
+
+*webmin-1.300-r1 (02 Dec 2006)
+*webmin-1.290-r1 (02 Dec 2006)
+
+  02 Dec 2006; Alec Warner <antarus@gentoo.org> files/webmin-pam,
+  +webmin-1.290-r1.ebuild, +webmin-1.300-r1.ebuild:
+  bump for 142293, fix webmin-pam
 
   24 Oct 2006; Thomas Cort <tcort@gentoo.org> webmin-1.300.ebuild:
   Stable on alpha wrt security Bug #145829.
diff --git a/app-admin/webmin/files/digest-webmin-1.290-r1 b/app-admin/webmin/files/digest-webmin-1.290-r1
new file mode 100644
index 000000000000..7109d2ac3c80
--- /dev/null
+++ b/app-admin/webmin/files/digest-webmin-1.290-r1
@@ -0,0 +1,9 @@
+MD5 aa7274ebecc8d0df6704546ed13709d6 virtual-server-2.611.wbm.gz 283217
+RMD160 bbcee33f9398a78d7e8a68168316f011d2cf391d virtual-server-2.611.wbm.gz 283217
+SHA256 f7579da94a6b356ce4548a0ed8fcc366e1d8e7e7199e5337e8d703bf4f92090a virtual-server-2.611.wbm.gz 283217
+MD5 668883b2dd72cb0935c4191d59d8c439 webmin-1.290-minimal.tar.gz 1397131
+RMD160 87d043f5a4aadd00066e6f9bb8d300732e340a4f webmin-1.290-minimal.tar.gz 1397131
+SHA256 e9f7afdc67ab3f96ac9fe8cdeed986e98c25de7c9d55c6b90b8617e90a078614 webmin-1.290-minimal.tar.gz 1397131
+MD5 2e15ce21f6d459f16d21595225a7d4ee webmin-1.290.tar.gz 10324511
+RMD160 ecf80a2abf295ad9b3f05034da47a500202ee0e0 webmin-1.290.tar.gz 10324511
+SHA256 98a547d1a1aeeca4fb71a529b55514e7a8b35471de884e169c549df65923d321 webmin-1.290.tar.gz 10324511
diff --git a/app-admin/webmin/files/digest-webmin-1.300-r1 b/app-admin/webmin/files/digest-webmin-1.300-r1
new file mode 100644
index 000000000000..bd5a7c8ef3f1
--- /dev/null
+++ b/app-admin/webmin/files/digest-webmin-1.300-r1
@@ -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/webmin-pam b/app-admin/webmin/files/webmin-pam
index 4bb7cb8a5721..c9a20b05f6e4 100644
--- a/app-admin/webmin/files/webmin-pam
+++ b/app-admin/webmin/files/webmin-pam
@@ -1,4 +1,5 @@
 #%PAM-1.0
+auth 	include		system-auth
 auth	required	pam_unix.so	nullok
 account	required	pam_unix.so
 session	required	pam_unix.so
diff --git a/app-admin/webmin/webmin-1.290-r1.ebuild b/app-admin/webmin/webmin-1.290-r1.ebuild
new file mode 100644
index 000000000000..3cee2c9b978f
--- /dev/null
+++ b/app-admin/webmin/webmin-1.290-r1.ebuild
@@ -0,0 +1,141 @@
+# 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.290-r1.ebuild,v 1.1 2006/12/02 01:28:41 antarus Exp $
+
+inherit eutils pam
+
+VM_V="2.611"
+
+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"
+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.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
+}
diff --git a/app-admin/webmin/webmin-1.300-r1.ebuild b/app-admin/webmin/webmin-1.300-r1.ebuild
new file mode 100644
index 000000000000..d11b8acb7671
--- /dev/null
+++ b/app-admin/webmin/webmin-1.300-r1.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-r1.ebuild,v 1.1 2006/12/02 01:28:41 antarus 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
+}