Added OpenPAM (and amd64) compatibility as per bug #93174 and cleaned the ebuild up a bit.

(Portage version: 2.0.51.22-r1)

5 files changed, 114 insertions, 2 deletions

diff --git a/app-admin/usermin/ChangeLog b/app-admin/usermin/ChangeLog
index 56cefe864198..d2089892851e 100644
--- a/app-admin/usermin/ChangeLog
+++ b/app-admin/usermin/ChangeLog
@@ -1,6 +1,13 @@
 # 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.62 2005/04/23 23:10:34 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/ChangeLog,v 1.63 2005/06/19 23:10:03 flameeyes Exp $
+
+*usermin-1.130-r1 (19 Jun 2005)
+
+  19 Jun 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/usermin.pam-include, +usermin-1.130-r1.ebuild:
+  Added OpenPAM (and amd64) compatibility as per bug #93174 and cleaned the
+  ebuild up a bit.
 
   24 Apr 2005; Guy Martin <gmsoft@gentoo.org> usermin-1.130.ebuild:
   Stable on hppa.
diff --git a/app-admin/usermin/Manifest b/app-admin/usermin/Manifest
index 7b606681b1ab..08d755bb4e71 100644
--- a/app-admin/usermin/Manifest
+++ b/app-admin/usermin/Manifest
@@ -1,10 +1,13 @@
 MD5 c15240ff355d34f01495de1cfbc7ed67 ChangeLog 8497
 MD5 3923b6ae9bc25fc124e24e7747c8a802 metadata.xml 226
 MD5 265e9776e08e5937b984ad1c1e79a746 usermin-1.100-r1.ebuild 2524
+MD5 5ce275fde7d1b60c4af9a61a25ec4734 usermin-1.130-r1.ebuild 2299
 MD5 caaf0682be8a96c5cc4ec28fad42eaf1 usermin-1.130.ebuild 2317
 MD5 b3ae782d361d5f450212191c25bf4623 files/digest-usermin-1.100-r1 66
+MD5 790e601fcd965a2804ac85e89d9dee35 files/digest-usermin-1.130 66
 MD5 1a376ef687089bf1d727a6b403a17627 files/init.d.usermin 822
 MD5 bd4b2cc177b4fb7b0f96edc60008a6b5 files/usermin-1.080-safestop.patch 620
 MD5 e93705fc1a8b2d9410a920a777890624 files/usermin-1.100-setup-nocheck.patch 951
 MD5 a5311bbc9c1fc378a6b0bfb3ca1b2394 files/usermin.pam 431
-MD5 790e601fcd965a2804ac85e89d9dee35 files/digest-usermin-1.130 66
+MD5 4b7d75b12f1bea9f349dff4c48c18b8b files/usermin.pam-include 245
+MD5 790e601fcd965a2804ac85e89d9dee35 files/digest-usermin-1.130-r1 66
diff --git a/app-admin/usermin/files/digest-usermin-1.130-r1 b/app-admin/usermin/files/digest-usermin-1.130-r1
new file mode 100644
index 000000000000..3cac66fa1070
--- /dev/null
+++ b/app-admin/usermin/files/digest-usermin-1.130-r1
@@ -0,0 +1 @@
+MD5 16166839af85b53272817f436c6cb310 usermin-1.130.tar.gz 2264410
diff --git a/app-admin/usermin/files/usermin.pam-include b/app-admin/usermin/files/usermin.pam-include
new file mode 100644
index 000000000000..9d2167793cc5
--- /dev/null
+++ b/app-admin/usermin/files/usermin.pam-include
@@ -0,0 +1,12 @@
+#%PAM-1.0
+
+auth       required	pam_securetty.so
+auth       include	system-auth
+auth       required	pam_nologin.so
+
+account    include	system-auth
+
+password   include	system-auth
+
+session    include	system-auth
+session    optional	pam_console.so
diff --git a/app-admin/usermin/usermin-1.130-r1.ebuild b/app-admin/usermin/usermin-1.130-r1.ebuild
new file mode 100644
index 000000000000..26fd1fb81709
--- /dev/null
+++ b/app-admin/usermin/usermin-1.130-r1.ebuild
@@ -0,0 +1,89 @@
+# 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-r1.ebuild,v 1.1 2005/06/19 23:10:03 flameeyes Exp $
+
+IUSE="ssl"
+
+inherit eutils pam
+
+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
+	 dev-perl/Authen-PAM
+	 virtual/pam
+	 ssl? ( dev-perl/Net-SSLeay )"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+
+	# Point to the correct mysql location
+	sed -i -e "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 -e 's:^#!.*/usr/local/bin/perl:#!/usr/bin/perl:'
+
+	dodir /usr/libexec/usermin
+	cp -pR * ${D}/usr/libexec/usermin
+
+	newinitd ${FILESDIR}/init.d.usermin usermin
+
+	newpamd ${FILESDIR}/${PN}.pam-include ${PN}
+
+	# Fix ownership
+	chown -R root:0 ${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 atboot nostart nochown autothird nouninstall 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 -e 's:^pidfile=.*$:pidfile=${ROOT}/var/run/usermin.pid:' ${D}/etc/usermin/miniserv.conf
+	find ${D}/etc/usermin -type f | xargs sed -i -e "s:${D}:${ROOT}:g"
+
+	# Cleanup from the config script
+	rm -rf ${D}/var/log/usermin
+	keepdir /var/log/usermin/
+}
+
+pkg_postinst() {
+	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
+}