4 files changed, 103 insertions, 11 deletions
diff --git a/app-admin/usermin/ChangeLog b/app-admin/usermin/ChangeLog
index 81db1ccfa792..a8134a6c728d 100644
--- a/app-admin/usermin/ChangeLog
+++ b/app-admin/usermin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/usermin
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/ChangeLog,v 1.55 2005/04/08 21:40:04 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/ChangeLog,v 1.56 2005/04/15 00:23:24 eradicator Exp $
+
+*usermin-1.130 (15 Apr 2005)
+
+  15 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +usermin-1.130.ebuild:
+  Version bump.  Security bug #89141.
 
 *usermin-1.120 (08 Apr 2005)
 
diff --git a/app-admin/usermin/Manifest b/app-admin/usermin/Manifest
index 517e6818e661..e93658178d96 100644
--- a/app-admin/usermin/Manifest
+++ b/app-admin/usermin/Manifest
@@ -1,6 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 58f6296c4ba73d107efb8f88319a9332 usermin-1.130.ebuild 2549
 MD5 3923b6ae9bc25fc124e24e7747c8a802 metadata.xml 226
 MD5 ec24d8da9b33f3d9a0b8f7618d7ef901 usermin-1.090.ebuild 2224
 MD5 265e9776e08e5937b984ad1c1e79a746 usermin-1.100-r1.ebuild 2524
@@ -17,10 +15,4 @@ MD5 e93705fc1a8b2d9410a920a777890624 files/usermin-1.100-setup-nocheck.patch 951
 MD5 a5311bbc9c1fc378a6b0bfb3ca1b2394 files/usermin.pam 431
 MD5 397fe538ed67636d61c7e6fd286d0da1 files/digest-usermin-1.110 66
 MD5 9e9982fbb9deedb2b36ea4400a817334 files/digest-usermin-1.120 66
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCVvpIArHZZzCEUG0RArCgAJ95hVOjMGGWycbxuZoSzq/gGKY6pwCeJZgU
-obs3haRREnB8mcGSly9LBPA=
-=jMJl
------END PGP SIGNATURE-----
+MD5 790e601fcd965a2804ac85e89d9dee35 files/digest-usermin-1.130 66
diff --git a/app-admin/usermin/files/digest-usermin-1.130 b/app-admin/usermin/files/digest-usermin-1.130
new file mode 100644
index 000000000000..3cac66fa1070
--- /dev/null
+++ b/app-admin/usermin/files/digest-usermin-1.130
@@ -0,0 +1 @@
+MD5 16166839af85b53272817f436c6cb310 usermin-1.130.tar.gz 2264410
diff --git a/app-admin/usermin/usermin-1.130.ebuild b/app-admin/usermin/usermin-1.130.ebuild
new file mode 100644
index 000000000000..202d17870478
--- /dev/null
+++ b/app-admin/usermin/usermin-1.130.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/usermin-1.130.ebuild,v 1.1 2005/04/15 00:23:24 eradicator Exp $
+
+IUSE="ssl"
+
+inherit eutils
+
+DESCRIPTION="a web-based user administration interface"
+HOMEPAGE="http://www.webmin.com/index6.html"
+SRC_URI="mirror://sourceforge/webadmin/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 sparc x86"
+
+DEPEND="dev-lang/perl"
+
+RDEPEND="${DEPEND}
+	 sys-process/lsof
+	 >=sys-apps/sed-4
+	 dev-perl/Authen-PAM
+	 ssl? ( dev-perl/Net-SSLeay )"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+
+	# Point to the correct mysql location
+	sed -i "s:/usr/local/mysql:/usr:g" mysql/config
+
+	epatch ${FILESDIR}/${PN}-1.080-safestop.patch
+	epatch ${FILESDIR}/${PN}-1.100-setup-nocheck.patch
+}
+
+src_install() {
+	# Change /usr/local/bin/perl references
+	find . -type f | xargs sed -i 's:^#!.*/usr/local/bin/perl:#!/usr/bin/perl:'
+
+	dodir /usr/libexec/usermin
+	cp -a * ${D}/usr/libexec/usermin
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/init.d.usermin usermin
+
+	insinto /etc/pam.d
+	newins ${FILESDIR}/${PN}.pam ${PN}
+
+	# Fix ownership
+	chown -R root:root ${D}
+
+	dodir /etc/usermin
+	dodir /var/log/usermin
+
+	config_dir=${D}/etc/usermin
+	var_dir=${D}/var/log/usermin
+	perl=${ROOT}/usr/bin/perl
+	autoos=1
+	port=20000
+	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 nochown autothird nouninstall nostart noperlpath tempdir
+	${D}/usr/libexec/usermin/setup.sh > ${T}/usermin-setup.out 2>&1 || die "Failed to create initial usermin configuration."
+
+	# Fixup the config files to use their real locations
+	sed -i 's:^pidfile=.*$:pidfile=${ROOT}/var/run/usermin.pid:' ${D}/etc/usermin/miniserv.conf
+	find ${D}/etc/usermin -type f -exec sed -i "s:${D}:${ROOT}:g" {} \;
+
+	# Cleanup from the config script
+	rm -rf ${D}/var/log/usermin
+	keepdir /var/log/usermin/
+}
+
+pkg_postinst() {
+	local crypt=$(grep "^root:" ${ROOT}/etc/shadow | cut -f 2 -d :)
+	dosed "s/root:XXX/root:${crypt}/" /etc/usermin/miniserv.users
+	einfo "To make usermin start at boot time, run: 'rc-update add usermin default'."
+	einfo "Point your web browser to http://localhost:20000 to use usermin."
+}
+
+pkg_prerm() {
+	${ROOT}/etc/init.d/usermin stop >& /dev/null
+}