Config files are now installed with src_install().

6 files changed, 150 insertions, 14 deletions

diff --git a/app-admin/torsmo/Manifest b/app-admin/torsmo/Manifest
index 7bcf99035180..ef4a12ef4a2c 100644
--- a/app-admin/torsmo/Manifest
+++ b/app-admin/torsmo/Manifest
@@ -1,21 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 bd0dd434f60799d6f3fcc02713ddb09c torsmo-0.17.ebuild 1334
-MD5 0dd5f1b998cdf2f2945b4b6a47349847 ChangeLog 3498
+MD5 7a2556b95496bf7e5e0d50be6cd48535 torsmo-0.17.ebuild 1340
+MD5 c9e747430115f0a5df516b72d4d0d1bc ChangeLog 3952
 MD5 e62755aeb2fcd53a4426e99d3af550ed metadata.xml 549
-MD5 ea8478bba16bc3d4a42bcc75fbc8df1c torsmo-0.17-r1.ebuild 1481
-MD5 fd7a47efdb3d94a376445e6fdd1588fc torsmo-0.18.ebuild 1348
+MD5 54314b9d79bb7baa1a44fac3b66b6317 torsmo-0.17-r1.ebuild 1481
+MD5 09130da23bc92b86c3ef533c981578a7 torsmo-0.18.ebuild 1343
+MD5 e0409bfec69e82251365f9913d12677e torsmo-0.18-r1.ebuild 1460
 MD5 19932267a722d71554454bb3779a9ae0 files/digest-torsmo-0.18 62
+MD5 19932267a722d71554454bb3779a9ae0 files/digest-torsmo-0.18-r1 62
 MD5 38f2bbcb59c900a0fc2a2f0ec2f75463 files/digest-torsmo-0.17-r1 62
 MD5 38f2bbcb59c900a0fc2a2f0ec2f75463 files/digest-torsmo-0.17 62
 MD5 552e015366516a5ff2034d10b083c303 files/torsmo-0.17-mozilla.patch 601
 MD5 d27874dbf963063e13d6387d8ef3912f files/torsmo-0.17-kernel2.4.patch 2388
 MD5 39312a5c71ba9590531a7c0ccd9aaee9 files/torsmo-0.17-mldonkey.patch 15411
+MD5 3345892556d2bc8fddf510c86d3c70f0 files/torsmo-0.18.xwin.patch 575
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
+Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFB0KE3mdTrptrqvGERAlLFAJ9N60ScLqkK90UcTxMCECbwKrOrCwCfSiIf
-zkelOqc5kGKTrMhFUxlb1nw=
-=p5uz
+iD8DBQFB1dT8mdTrptrqvGERArMsAKCFEj7yk/9HJ3MExhrFg3DH1GudnwCdFzOn
+idKfhYD6anzZOzZul+t/fAE=
+=NfnI
 -----END PGP SIGNATURE-----
diff --git a/app-admin/usermin/ChangeLog b/app-admin/usermin/ChangeLog
index 975d22205eb3..e93dfa455922 100644
--- a/app-admin/usermin/ChangeLog
+++ b/app-admin/usermin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/usermin
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/ChangeLog,v 1.44 2004/12/28 19:52:22 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/ChangeLog,v 1.45 2004/12/31 22:38:00 eradicator Exp $
+
+*usermin-1.100-r1 (31 Dec 2004)
+
+  31 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/usermin-1.100-setup-nocheck.patch, +usermin-1.100-r1.ebuild:
+  Config files are now installed with src_install().
 
   28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/app-admin/usermin/Manifest b/app-admin/usermin/Manifest
index 5dfbdbe2a6ab..419e863b7a0e 100644
--- a/app-admin/usermin/Manifest
+++ b/app-admin/usermin/Manifest
@@ -1,9 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 8c92a844579bcf930112311cf61caba7 ChangeLog 6397
+MD5 3923b6ae9bc25fc124e24e7747c8a802 metadata.xml 226
 MD5 7081238466a7da1afddde34ada131f0f usermin-1.100.ebuild 2292
-MD5 133f839a9951ff4a1dad91408c8723d5 ChangeLog 6180
 MD5 64c324d876af78b5ae970340f00290a3 usermin-1.090.ebuild 2219
-MD5 3923b6ae9bc25fc124e24e7747c8a802 metadata.xml 226
-MD5 a5311bbc9c1fc378a6b0bfb3ca1b2394 files/usermin.pam 431
-MD5 4a8c93084becc5ae5beb4488282df537 files/digest-usermin-1.090 66
+MD5 05c55dcf57131dd569e2c9fd3f5a1126 usermin-1.100-r1.ebuild 2442
+MD5 b3ae782d361d5f450212191c25bf4623 files/digest-usermin-1.100 66
 MD5 bd4b2cc177b4fb7b0f96edc60008a6b5 files/usermin-1.080-safestop.patch 620
+MD5 4a8c93084becc5ae5beb4488282df537 files/digest-usermin-1.090 66
+MD5 b3ae782d361d5f450212191c25bf4623 files/digest-usermin-1.100-r1 66
+MD5 e93705fc1a8b2d9410a920a777890624 files/usermin-1.100-setup-nocheck.patch 951
 MD5 1a376ef687089bf1d727a6b403a17627 files/init.d.usermin 822
-MD5 b3ae782d361d5f450212191c25bf4623 files/digest-usermin-1.100 66
+MD5 a5311bbc9c1fc378a6b0bfb3ca1b2394 files/usermin.pam 431
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFB1dTTArHZZzCEUG0RAmcOAJwNLvTgVyLb/pXr8JVM5TmiXEonwQCeLvJ+
+bd+j8cUHk+t54j8pfc2rafw=
+=QuH1
+-----END PGP SIGNATURE-----
diff --git a/app-admin/usermin/files/digest-usermin-1.100-r1 b/app-admin/usermin/files/digest-usermin-1.100-r1
new file mode 100644
index 000000000000..f6d3156a83c3
--- /dev/null
+++ b/app-admin/usermin/files/digest-usermin-1.100-r1
@@ -0,0 +1 @@
+MD5 0c419acc17ff5c3d623d5e319af06f23 usermin-1.100.tar.gz 2224193
diff --git a/app-admin/usermin/files/usermin-1.100-setup-nocheck.patch b/app-admin/usermin/files/usermin-1.100-setup-nocheck.patch
new file mode 100644
index 000000000000..732064f09c59
--- /dev/null
+++ b/app-admin/usermin/files/usermin-1.100-setup-nocheck.patch
@@ -0,0 +1,21 @@
+--- usermin-1.100/setup.sh.orig	2004-12-31 14:33:05.359008295 -0800
++++ usermin-1.100/setup.sh	2004-12-31 14:33:35.975968539 -0800
+@@ -342,12 +342,12 @@
+ 		echo ""
+ 		exit 12
+ 	fi
+-	$perl -e 'use Socket; socket(FOO, PF_INET, SOCK_STREAM, getprotobyname("tcp")); setsockopt(FOO, SOL_SOCKET, SO_REUSEADDR, pack("l", 1)); bind(FOO, pack_sockaddr_in($ARGV[0], INADDR_ANY)) || exit(1); exit(0);' $port
+-	if [ $? != "0" ]; then
+-		echo "ERROR: TCP port $port is already in use by another program"
+-		echo ""
+-		exit 13
+-	fi
++	#$perl -e 'use Socket; socket(FOO, PF_INET, SOCK_STREAM, getprotobyname("tcp")); setsockopt(FOO, SOL_SOCKET, SO_REUSEADDR, pack("l", 1)); bind(FOO, pack_sockaddr_in($ARGV[0], INADDR_ANY)) || exit(1); exit(0);' $port
++	#if [ $? != "0" ]; then
++	#	echo "ERROR: TCP port $port is already in use by another program"
++	#	echo ""
++	#	exit 13
++	#fi
+ 	if [ "$ssl" = "" ]; then
+ 		ssl=0
+ 		$perl -e 'use Net::SSLeay' >/dev/null 2>/dev/null
diff --git a/app-admin/usermin/usermin-1.100-r1.ebuild b/app-admin/usermin/usermin-1.100-r1.ebuild
new file mode 100644
index 000000000000..928323a2947e
--- /dev/null
+++ b/app-admin/usermin/usermin-1.100-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/usermin-1.100-r1.ebuild,v 1.1 2004/12/31 22:38:00 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"
+
+RDEPEND="dev-lang/perl
+	sys-apps/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
+
+	# Bug #46273... missing config for gentoo
+	cp quota/generic-linux-lib.pl quota/gentoo-linux-lib.p
+
+	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=`grep "^root:" ${ROOT}/etc/shadow | cut -f 2 -d :`
+	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() {
+	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
+}