Added pam use flag for pam dependency. Bumped webmin and virtualmin versions for small feature additions and bugfixes. Fixes bugs #95670 and #96698.

(Portage version: 2.0.51.22-r1)

6 files changed, 181 insertions, 17 deletions

diff --git a/app-admin/webmin/ChangeLog b/app-admin/webmin/ChangeLog
index c7b4f6376dc6..62c7aa5b504a 100644
--- a/app-admin/webmin/ChangeLog
+++ b/app-admin/webmin/ChangeLog
@@ -1,6 +1,14 @@
 # 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.87 2005/06/19 23:29:47 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.88 2005/06/24 17:07:33 eradicator Exp $
+
+*webmin-1.210 (24 Jun 2005)
+
+  24 Jun 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/virtual-server-2.60-nocgibin.patch, webmin-1.200-r1.ebuild,
+  +webmin-1.210.ebuild:
+  Added pam use flag for pam dependency. Bumped webmin and virtualmin versions
+  for small feature additions and bugfixes. Fixes bugs #95670 and #96698.
 
 *webmin-1.200-r1 (19 Jun 2005)
 
diff --git a/app-admin/webmin/Manifest b/app-admin/webmin/Manifest
index f35d827d63a7..a730062534ee 100644
--- a/app-admin/webmin/Manifest
+++ b/app-admin/webmin/Manifest
@@ -1,15 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 46a130d8ba9d271fe46a07ee138e4bbc ChangeLog 1199
+MD5 45afdb1f76b111e96fe37f790b9dca3d ChangeLog 1457
 MD5 3923b6ae9bc25fc124e24e7747c8a802 metadata.xml 226
 MD5 e626ba52c08958842e196639ca78255e webmin-1.160.ebuild 2689
 MD5 416cafa8e535089fc1064454241e0346 webmin-1.170-r3.ebuild 3715
 MD5 f8e5d72eb3c26fae697123be63aa66a4 webmin-1.200.ebuild 3834
-MD5 f591834331b5c9284ce6b0ea6f96504c webmin-1.200-r1.ebuild 3791
+MD5 48bd8fba61245fba08a07167bf40c66f webmin-1.210.ebuild 3805
+MD5 f3cbd75d176d89ed105206fe495a0b67 webmin-1.200-r1.ebuild 3805
 MD5 17e9cccc95647ba080bd69785db85ac1 files/digest-webmin-1.160 137
-MD5 6d9dfc76f788500ff3c85cbb42667487 files/digest-webmin-1.170-r3 209
 MD5 eee259ae52a25169e6cd54a746f4865e files/digest-webmin-1.200 209
+MD5 6d9dfc76f788500ff3c85cbb42667487 files/digest-webmin-1.170-r3 209
 MD5 54dc8937e05bd76ad86a6c5f5ae6a333 files/init.d.webmin 859
 MD5 bc8eb1c9de103599fc00b140b0ed1f9f files/uninstall.sh 260
 MD5 082b9fc08240293b2b7b3609ba8e0cfd files/virtual-server-2.31-checkip.patch 607
@@ -23,10 +21,5 @@ MD5 512204473654b6eb41308d3319ba6144 files/webmin-1.170-setup-nocheck.patch 943
 MD5 e7e3780c0bf03968b380535064c54213 files/webmin-gentoo-init 859
 MD5 7d80c86adbd36eeb8f220b9efdd30819 files/webmin-pam 101
 MD5 eee259ae52a25169e6cd54a746f4865e files/digest-webmin-1.200-r1 209
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCtf/5j5H05b2HAEkRAq1PAJwMs8aJ194oBjutEc1a6eaC1NQY8gCfRhP0
-7eXubP0/9XENpRMX6juWVsI=
-=TNpZ
------END PGP SIGNATURE-----
+MD5 171e9e052878636913441103aac011b0 files/digest-webmin-1.210 209
+MD5 5a13292127e1353674038bffda8e4a70 files/virtual-server-2.60-nocgibin.patch 1277
diff --git a/app-admin/webmin/files/digest-webmin-1.210 b/app-admin/webmin/files/digest-webmin-1.210
new file mode 100644
index 000000000000..8814573c40ec
--- /dev/null
+++ b/app-admin/webmin/files/digest-webmin-1.210
@@ -0,0 +1,3 @@
+MD5 7d16a59550ed4ac1edf5ec11ea3bd748 webmin-1.210-minimal.tar.gz 1140870
+MD5 afffc264915bf3084561627bc71d68fa webmin-1.210.tar.gz 8447509
+MD5 0a312dbc15a8c6c25764ef51f0094202 virtual-server-2.60.wbm.gz 275367
diff --git a/app-admin/webmin/files/virtual-server-2.60-nocgibin.patch b/app-admin/webmin/files/virtual-server-2.60-nocgibin.patch
new file mode 100644
index 000000000000..3379dffbf0fb
--- /dev/null
+++ b/app-admin/webmin/files/virtual-server-2.60-nocgibin.patch
@@ -0,0 +1,26 @@
+diff -Naurp webmin-1.210.orig/virtual-server/feature-dir.pl webmin-1.210/virtual-server/feature-dir.pl
+--- webmin-1.210.orig/virtual-server/feature-dir.pl	2005-04-12 17:27:34.000000000 -0700
++++ webmin-1.210/virtual-server/feature-dir.pl	2005-06-24 10:00:03.000000000 -0700
+@@ -38,8 +38,8 @@ if ($tmpl->{'skel'} ne "none") {
+ # Setup web directories
+ local $d;
+ local $perms = $tmpl->{'web_html_perms'};
++#             [ 'cgi-bin', '755' ],
+ foreach $d ( [ &public_html_dir($_[0], 1), $perms ],
+-             [ 'cgi-bin', '755' ],
+              [ 'logs', '755' ],
+              [ $config{'homes_dir'}, '755' ] ) {
+         &system_logged("mkdir -p $qh/$d->[0] 2>/dev/null");
+diff -Naurp webmin-1.210.orig/virtual-server/import.cgi webmin-1.210/virtual-server/import.cgi
+--- webmin-1.210.orig/virtual-server/import.cgi	2005-02-21 21:01:02.000000000 -0800
++++ webmin-1.210/virtual-server/import.cgi	2005-06-24 10:00:24.000000000 -0700
+@@ -164,8 +164,8 @@ if ($in{'confirm'}) {
+ 
+ 	# Setup web directories
+ 	print $text{'import_dirs'},"<br>\n";
++#		     [ 'cgi-bin', '755' ],
+ 	foreach $d ( [ $config{'html_dir'} || 'public_html', '755' ],
+-		     [ 'cgi-bin', '755' ],
+ 		     [ 'logs', '755' ],
+ 		     [ $config{'homes_dir'}, '755' ] ) {
+ 		if (!-d "$uinfo{'home'}/$d->[0]") {
diff --git a/app-admin/webmin/webmin-1.200-r1.ebuild b/app-admin/webmin/webmin-1.200-r1.ebuild
index c54f977bf7ea..654e894c950e 100644
--- a/app-admin/webmin/webmin-1.200-r1.ebuild
+++ b/app-admin/webmin/webmin-1.200-r1.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.200-r1.ebuild,v 1.1 2005/06/19 23:29:47 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.200-r1.ebuild,v 1.2 2005/06/24 17:07:33 eradicator Exp $
 
-IUSE="apache2 postgres ssl webmin-minimal"
+IUSE="apache2 pam postgres ssl webmin-minimal"
 
 inherit eutils pam
 
@@ -21,7 +21,7 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 DEPEND="dev-lang/perl"
 RDEPEND="${DEPEND}
-	virtual/pam
+	 pam? ( virtual/pam )
 	 ssl? ( dev-perl/Net-SSLeay )
 	 postgres? ( dev-perl/DBD-Pg )
 	 dev-perl/XML-Generator"
diff --git a/app-admin/webmin/webmin-1.210.ebuild b/app-admin/webmin/webmin-1.210.ebuild
new file mode 100644
index 000000000000..22b6b5c929f9
--- /dev/null
+++ b/app-admin/webmin/webmin-1.210.ebuild
@@ -0,0 +1,134 @@
+# 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.210.ebuild,v 1.1 2005/06/24 17:07:33 eradicator Exp $
+
+IUSE="apache2 pam postgres ssl webmin-minimal"
+
+inherit eutils pam
+
+VM_V="2.60"
+
+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 and ~s390 removed because of broken deps. Bug #86085
+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"
+
+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.60-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 /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=/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/
+}
+
+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'."
+	einfo "Point your web browser to http://localhost:10000 to use webmin."
+}
+
+pkg_prerm() {
+	${ROOT}/etc/init.d/webmin stop >& /dev/null
+}