Revbump to fix init script borkage.

5 files changed, 15 insertions, 7 deletions

diff --git a/app-admin/usermin/ChangeLog b/app-admin/usermin/ChangeLog
index ea2a3f2c2819..2b659c19b903 100644
--- a/app-admin/usermin/ChangeLog
+++ b/app-admin/usermin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/usermin
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/ChangeLog,v 1.28 2004/06/16 17:20:55 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/ChangeLog,v 1.29 2004/06/16 17:51:32 eradicator Exp $
+
+*usermin-1.080-r1 (16 Jun 2004)
+
+  16 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org> files/init.d.usermin,
+  +usermin-1.080-r1.ebuild, -usermin-1.080.ebuild:
+  Revbump to fix init script borkage.
 
   16 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
   -files/usermin-1.070-gentoo.patch, -files/patch/setup.sh,
diff --git a/app-admin/usermin/Manifest b/app-admin/usermin/Manifest
index 600d93136b10..aa5eb21e667d 100644
--- a/app-admin/usermin/Manifest
+++ b/app-admin/usermin/Manifest
@@ -1,6 +1,6 @@
 MD5 7128fe3341d30112e680405f71c5337f ChangeLog 4427
 MD5 3923b6ae9bc25fc124e24e7747c8a802 metadata.xml 226
-MD5 445f9299bcc97dd39ec60a3f333d0656 usermin-1.080.ebuild 2089
-MD5 e6e25dc89f0ccd9ce1af4b508d27a5d6 files/digest-usermin-1.080 66
-MD5 27cf4d988e5a6b52ed95aa6477f02858 files/init.d.usermin 877
+MD5 667b5f35aa4a95ff9efd0c9fd8c27e2d usermin-1.080-r1.ebuild 2172
+MD5 e6e25dc89f0ccd9ce1af4b508d27a5d6 files/digest-usermin-1.080-r1 66
+MD5 ac46862afa58f90702ba544a0e4f5766 files/init.d.usermin 831
 MD5 a5311bbc9c1fc378a6b0bfb3ca1b2394 files/usermin.pam 431
diff --git a/app-admin/usermin/files/digest-usermin-1.080 b/app-admin/usermin/files/digest-usermin-1.080-r1
index 7d64a154fe5b..7d64a154fe5b 100644
--- a/app-admin/usermin/files/digest-usermin-1.080
+++ b/app-admin/usermin/files/digest-usermin-1.080-r1
diff --git a/app-admin/usermin/files/init.d.usermin b/app-admin/usermin/files/init.d.usermin
index d0ad079c0cdf..6ec7bd1378ee 100644
--- a/app-admin/usermin/files/init.d.usermin
+++ b/app-admin/usermin/files/init.d.usermin
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/files/init.d.usermin,v 1.2 2004/04/23 00:29:56 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/files/init.d.usermin,v 1.3 2004/06/16 17:51:32 eradicator Exp $
 
 depend() {
 	need net logger
@@ -26,7 +26,7 @@ start() { # copied from /etc/usermin/start
 
 	unset PERLIO
 	export PERLIO
-	start-stop-daemon --start --pidfile /var/run/usermin.pid --make-pidfile --quiet \
+	start-stop-daemon --start --quiet \
 		--exec /usr/libexec/usermin/miniserv.pl /etc/usermin/miniserv.conf
 	eend $?
 }
diff --git a/app-admin/usermin/usermin-1.080.ebuild b/app-admin/usermin/usermin-1.080-r1.ebuild
index d1e05a0eee33..2aa24d468b98 100644
--- a/app-admin/usermin/usermin-1.080.ebuild
+++ b/app-admin/usermin/usermin-1.080-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/usermin-1.080.ebuild,v 1.3 2004/06/16 16:05:28 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/usermin-1.080-r1.ebuild,v 1.1 2004/06/16 17:51:32 eradicator Exp $
 
 inherit eutils
 
@@ -77,6 +77,8 @@ pkg_postinst() {
 		/etc/init.d/usermin start
 	fi
 
+	sed -i 's:^pidfile=.*$:pidfile=/var/run/usermin.pid:' /etc/usermin/miniserv.conf
+
 	einfo "Add usermin to your boot-time services with 'rc-update add usermin'."
 	einfo "Point your web browser to http://localhost:20000 to use usermin."
 }