Update the rc-script to properly stop/start

5 files changed, 74 insertions, 8 deletions

diff --git a/app-admin/sysklogd/ChangeLog b/app-admin/sysklogd/ChangeLog
index 9168290a6c94..5846730552d9 100644
--- a/app-admin/sysklogd/ChangeLog
+++ b/app-admin/sysklogd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/sysklogd
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sysklogd/ChangeLog,v 1.10 2003/02/24 22:23:47 zwelch Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysklogd/ChangeLog,v 1.11 2003/05/11 21:06:32 azarah Exp $
+
+*sysklogd-1.4.1-r4 (11 May 2003)
+
+  11 May 2003; Martin Schlemmer <azarah@gentoo.org> sysklogd-1.4.1-r4.ebuild,
+  files/sysklogd.rc6:
+  Update the rc-script to properly stop/start especially when changing to the
+  single runlevel and back.
 
   12 Feb 2003; Guy Martin <gmsoft@gentoo.org> sysklogd-1.4.1-r3.ebuild :
   Added hppa to keywords.
diff --git a/app-admin/sysklogd/Manifest b/app-admin/sysklogd/Manifest
new file mode 100644
index 000000000000..2c6e0fdc3a9b
--- /dev/null
+++ b/app-admin/sysklogd/Manifest
@@ -0,0 +1,15 @@
+MD5 cece172ab895059b8024efb6d89279c1 ChangeLog 1926
+MD5 6c758e41705cff969c27e1b710ae3551 sysklogd-1.4.1-r1.ebuild 1122
+MD5 5c001cd888088d1ad96c56dc513faded sysklogd-1.4.1-r2.ebuild 1139
+MD5 61b54e47ad4df21a608c7260503ff84e sysklogd-1.4.1-r3.ebuild 1169
+MD5 61b54e47ad4df21a608c7260503ff84e sysklogd-1.4.1-r4.ebuild 1169
+MD5 01d7ea5644c29972a910ab27e3ab4738 files/digest-sysklogd-1.4.1-r1 65
+MD5 01d7ea5644c29972a910ab27e3ab4738 files/digest-sysklogd-1.4.1-r2 65
+MD5 e25d7b583b7e4bd8be503b89e1771e90 files/sysklogd.confd 113
+MD5 d3c02415aca3dbe4f54e358e10537d0c files/sysklogd.rc6 1007
+MD5 4ebbba13c01a5c6df2d787a01a658b24 files/syslog-cron 709
+MD5 a4ca2a78eecd855928cc313d7c243819 files/syslog.conf 2332
+MD5 39526162728783b83aabc6754a6df208 files/syslogd-listfiles 2759
+MD5 5d4b89ceb689887a6cbb582b875bf3e7 files/syslogd-listfiles.8 2540
+MD5 01d7ea5644c29972a910ab27e3ab4738 files/digest-sysklogd-1.4.1-r3 65
+MD5 01d7ea5644c29972a910ab27e3ab4738 files/digest-sysklogd-1.4.1-r4 65
diff --git a/app-admin/sysklogd/files/digest-sysklogd-1.4.1-r4 b/app-admin/sysklogd/files/digest-sysklogd-1.4.1-r4
new file mode 100644
index 000000000000..9e53804f2d1c
--- /dev/null
+++ b/app-admin/sysklogd/files/digest-sysklogd-1.4.1-r4
@@ -0,0 +1 @@
+MD5 d214aa40beabf7bdb0c9b3c64432c774 sysklogd-1.4.1.tar.gz 81784
diff --git a/app-admin/sysklogd/files/sysklogd.rc6 b/app-admin/sysklogd/files/sysklogd.rc6
index 32511389081d..e1c1829ab5d1 100644
--- a/app-admin/sysklogd/files/sysklogd.rc6
+++ b/app-admin/sysklogd/files/sysklogd.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sysklogd/files/sysklogd.rc6,v 1.3 2003/02/14 22:34:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysklogd/files/sysklogd.rc6,v 1.4 2003/05/11 21:06:32 azarah Exp $
 
 # NB: Config is in /etc/conf.d/sysklogd
 
@@ -14,11 +14,15 @@ depend() {
 start() {
 
 	ebegin "Starting syslogd, klogd"
-	start-stop-daemon --start --quiet --exec /usr/sbin/syslogd -- ${SYSLOGD}
+	start-stop-daemon --start --quiet --background --exec /usr/sbin/syslogd \
+		-- ${SYSLOGD}
 	retval=$?
+	
 	# klogd do not always start proper if started too early
-	sleep 2
-	start-stop-daemon --start --quiet --exec /usr/sbin/klogd -- ${KLOGD}
+	sleep 1
+	
+	start-stop-daemon --start --quiet --exec /usr/sbin/klogd \
+		-- ${KLOGD}
 	retval=$(( ${retval} + $? ))
 	eend ${retval} "Failed to start syslogd, klogd"
 }
@@ -26,9 +30,9 @@ start() {
 stop() {
 
 	ebegin "Stopping klogd, syslogd"
-	start-stop-daemon --stop --quiet --pidfile /var/run/klogd.pid
+	start-stop-daemon --stop --retry 1 --quiet --pidfile /var/run/klogd.pid
 	retval=$?
-	start-stop-daemon --stop --quiet --pidfile /var/run/syslogd.pid
+	start-stop-daemon --stop --retry 1 --quiet --pidfile /var/run/syslogd.pid
 	retval=$(( ${retval} + $? ))
 	eend ${retval} "Failed to stop klogd, syslogd"
 }
diff --git a/app-admin/sysklogd/sysklogd-1.4.1-r4.ebuild b/app-admin/sysklogd/sysklogd-1.4.1-r4.ebuild
new file mode 100644
index 000000000000..0cabd38be3b6
--- /dev/null
+++ b/app-admin/sysklogd/sysklogd-1.4.1-r4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysklogd/sysklogd-1.4.1-r4.ebuild,v 1.1 2003/05/11 21:06:32 azarah Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="Standard log daemons"
+SRC_URI="ftp://metalab.unc.edu/pub/Linux/system/daemons/${P}.tar.gz"
+HOMEPAGE="http://www.infodrom.org/projects/sysklogd/"
+KEYWORDS="x86 ppc sparc alpha hppa arm"
+SLOT="0"
+LICENSE="BSD"
+DEPEND="virtual/glibc"
+RDEPEND="dev-lang/perl sys-apps/debianutils"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	mv Makefile Makefile.orig
+	sed -e "s:-O3:${CFLAGS}:" Makefile.orig > Makefile
+}
+
+src_compile() {
+	emake LDFLAGS="" || die
+}
+
+src_install() {
+	dosbin syslogd klogd ${FILESDIR}/syslogd-listfiles
+	doman *.[1-9] ${FILESDIR}/syslogd-listfiles.8
+	exeinto /etc/cron.daily
+	newexe ${FILESDIR}/syslog-cron syslog.cron
+	dodoc ANNOUNCE CHANGES COPYING MANIFEST NEWS README.1st README.linux
+	dodoc ${FILESDIR}/syslog.conf
+	insinto /etc
+  	doins ${FILESDIR}/syslog.conf
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/sysklogd.rc6 sysklogd
+	insinto /etc/conf.d
+	newins ${FILESDIR}/sysklogd.confd sysklogd
+}