Change maintainership, add mysql use flag for perl deps, webmin-minimal to minimal use flag

(Portage version: 2.1.4.4)

3 files changed, 139 insertions, 2 deletions

diff --git a/app-admin/webmin/ChangeLog b/app-admin/webmin/ChangeLog
index 6bca3c423d25..6525977c5153 100644
--- a/app-admin/webmin/ChangeLog
+++ b/app-admin/webmin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/webmin
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.169 2008/02/20 04:22:47 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.170 2008/03/12 20:13:58 beandog Exp $
+
+*webmin-1.400-r1 (12 Mar 2008)
+
+  12 Mar 2008; Steve Dibb <beandog@gentoo.org> metadata.xml,
+  +webmin-1.400-r1.ebuild:
+  Change maintainership, add mysql use flag for perl deps, webmin-minimal to
+  minimal use flag
 
   20 Feb 2008; Steve Dibb <beandog@gentoo.org> webmin-1.400.ebuild:
   amd64 stable, security bug 209453
diff --git a/app-admin/webmin/metadata.xml b/app-admin/webmin/metadata.xml
index 616f0488f72e..e0fb7da44300 100644
--- a/app-admin/webmin/metadata.xml
+++ b/app-admin/webmin/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 <herd>no-herd</herd>
 <maintainer>
-	<email>maintainer-needed@gentoo.org</email>
+	<email>beandog@gentoo.org</email>
 </maintainer>
 </pkgmetadata>
diff --git a/app-admin/webmin/webmin-1.400-r1.ebuild b/app-admin/webmin/webmin-1.400-r1.ebuild
new file mode 100644
index 000000000000..0e8b161b8300
--- /dev/null
+++ b/app-admin/webmin/webmin-1.400-r1.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.400-r1.ebuild,v 1.1 2008/03/12 20:13:58 beandog Exp $
+
+inherit eutils pam
+
+VM_V="3.23"
+
+DESCRIPTION="Webmin, a web-based system administration interface"
+HOMEPAGE="http://www.webmin.com/"
+SRC_URI="minimal? ( mirror://sourceforge/webadmin/${P}-minimal.tar.gz )
+	!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 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="apache2 mysql pam postgres ssl minimal"
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}
+	ssl? ( dev-perl/Net-SSLeay )
+	mysql? ( dev-perl/DBD-mysql )
+	postgres? ( dev-perl/DBD-Pg )
+	pam? ( dev-perl/Authen-PAM )
+	dev-perl/XML-Generator
+	virtual/logger"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+
+	# in webmin-minimal apache2 are not present
+	if ! use 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
+
+		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=/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}:/: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}/" "${ROOT}/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."
+}