diff options
| author |   Jeremy Huddleston <eradicator@gentoo.org> | 2004-07-26 08:34:48 +0000 |
|---|---|---|
| committer | Jeremy Huddleston <eradicator@gentoo.org> | 2004-07-26 08:34:48 +0000 |
| commit | 2755979b948ebfece1de08d9dc69db3668bfec4a (patch) | |
| tree | 2c3d8e0d30eaa34c37bb6ce2ca22577e3095d994 /app-admin | |
| parent | Initial import. Thanks to Joseph Booker <joe@neoturbine.net>, Leander <leande... (diff) | |
| download | gentoo-2-2755979b948ebfece1de08d9dc69db3668bfec4a.tar.gz gentoo-2-2755979b948ebfece1de08d9dc69db3668bfec4a.tar.bz2 gentoo-2-2755979b948ebfece1de08d9dc69db3668bfec4a.zip | |
Add a test to setup.sh's stop command to fix possible borkage on upgrade.
Diffstat (limited to 'app-admin')
| -rw-r--r-- | app-admin/usermin/ChangeLog | 6 | ||||
| -rw-r--r-- | app-admin/usermin/files/usermin-1.080-safestop.patch | 12 | ||||
| -rw-r--r-- | app-admin/usermin/usermin-1.080-r1.ebuild | 4 |
3 files changed, 20 insertions, 2 deletions
diff --git a/app-admin/usermin/ChangeLog b/app-admin/usermin/ChangeLog index 59c6e4786218..0d59a2cddd78 100644 --- a/app-admin/usermin/ChangeLog +++ b/app-admin/usermin/ChangeLog @@ -1,6 +1,10 @@ # 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.33 2004/07/08 19:14:19 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/ChangeLog,v 1.34 2004/07/26 08:34:48 eradicator Exp $ + + 26 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> + +files/usermin-1.080-safestop.patch, usermin-1.080-r1.ebuild: + Add a test to setup.sh's stop command to fix possible borkage on upgrade. 08 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> usermin-1.080-r1.ebuild: diff --git a/app-admin/usermin/files/usermin-1.080-safestop.patch b/app-admin/usermin/files/usermin-1.080-safestop.patch new file mode 100644 index 000000000000..2cfd7e25e7fb --- /dev/null +++ b/app-admin/usermin/files/usermin-1.080-safestop.patch @@ -0,0 +1,12 @@ +diff -Naur usermin-1.080.orig/setup.sh usermin-1.080/setup.sh +--- usermin-1.080.orig/setup.sh 2004-06-03 16:18:07.000000000 -0700 ++++ usermin-1.080/setup.sh 2004-07-26 01:27:23.959104711 -0700 +@@ -487,7 +487,7 @@ + echo "#!/bin/sh" >>$config_dir/stop + echo "echo Stopping Usermin server in $wadir" >>$config_dir/stop + echo "pidfile=\`grep \"^pidfile=\" $config_dir/miniserv.conf | sed -e 's/pidfile=//g'\`" >>$config_dir/stop +-echo "kill \`cat \$pidfile\`" >>$config_dir/stop ++echo "test -z \"\$pidfile\" || kill \`cat \$pidfile\`" >>$config_dir/stop + chmod 755 $config_dir/start $config_dir/stop + echo "..done" + echo "" diff --git a/app-admin/usermin/usermin-1.080-r1.ebuild b/app-admin/usermin/usermin-1.080-r1.ebuild index 0e11513d048a..8d3e4ea9ec22 100644 --- a/app-admin/usermin/usermin-1.080-r1.ebuild +++ b/app-admin/usermin/usermin-1.080-r1.ebuild @@ -1,6 +1,6 @@ # 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.080-r1.ebuild,v 1.5 2004/07/08 19:14:19 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/usermin-1.080-r1.ebuild,v 1.6 2004/07/26 08:34:48 eradicator Exp $ inherit eutils @@ -30,6 +30,8 @@ src_unpack() { # Bug #46273... missing config for gentoo cp quota/generic-linux-lib.pl quota/gentoo-linux-lib.p + + epatch ${FILESDIR}/${P}-safestop.patch } src_install() { |