Package: sysklogd Version: 1.4.1-17 Severity: normal Tags: patch I've NMUed syslogd to fix all the RC bugs (except #334295). The NMU has been uploaded to the 4 day delayed queue in accordance with the wishes in the NMU disclaimer.
BTW, I have some experience with the internals of syslogd and would be happy to comaintain this package if desired. Patch is attached. -- see shy jo
diff -ur old/sysklogd-1.4.1/debian/NMU-Disclaimer
sysklogd-1.4.1/debian/NMU-Disclaimer
--- old/sysklogd-1.4.1/debian/NMU-Disclaimer 2006-01-09 23:40:54.000000000
-0500
+++ sysklogd-1.4.1/debian/NMU-Disclaimer 2006-01-09 23:37:53.000000000
-0500
@@ -34,7 +34,7 @@
potential solution which could probably improved into a real
solution.
- 8. NEVER change the way a package is maintainer in an NMU, i.e. don't
+ 8. NEVER change the way a package is maintained in an NMU, i.e. don't
remove dh_* stuff or switch to dh_* respectively. This rule
applies to all NMU's, not only to an NMU for this package.
diff -ur old/sysklogd-1.4.1/debian/changelog sysklogd-1.4.1/debian/changelog
--- old/sysklogd-1.4.1/debian/changelog 2006-01-09 23:40:54.000000000 -0500
+++ sysklogd-1.4.1/debian/changelog 2006-01-09 23:59:44.000000000 -0500
@@ -1,3 +1,16 @@
+sysklogd (1.4.1-17.1) unstable; urgency=low
+
+ * NMU
+ * patch from Chris Stromsoe to fix use of getconf LFS_CFLAGS.
+ Closes: #320119
+ * Use a start-stop-daemon schedule in klogd init script to avoid returning
+ until klogd exits and the various associated races. Closes: 284914
+ * Finish /usr/share/doc transition with patch by Julien Cristau.
+ Closes: #337712, #322769, #255590
+ * Corrected typo in NMU disclaimer. Closes: #225895
+
+ -- Joey Hess <[EMAIL PROTECTED]> Mon, 9 Jan 2006 22:53:07 -0500
+
sysklogd (1.4.1-17) unstable; urgency=high
* Use $(getconf LFS_CFLAGS) for large file support
diff -ur old/sysklogd-1.4.1/debian/postinst sysklogd-1.4.1/debian/postinst
--- old/sysklogd-1.4.1/debian/postinst 2006-01-09 23:40:54.000000000 -0500
+++ sysklogd-1.4.1/debian/postinst 2006-01-09 23:01:24.000000000 -0500
@@ -74,15 +74,6 @@
fi
set -e
fi
-
- # Maintain transition to FHS
- if [ "$1" = "configure" ]
- then
- if [ -d /usr/doc -a ! -e /usr/doc/sysklogd -a -d
/usr/share/doc/sysklogd ]
- then
- ln -sf ../share/doc/sysklogd /usr/doc/sysklogd
- fi
- fi
fi
diff -ur old/sysklogd-1.4.1/debian/postinst.klogd
sysklogd-1.4.1/debian/postinst.klogd
--- old/sysklogd-1.4.1/debian/postinst.klogd 2006-01-09 23:40:54.000000000
-0500
+++ sysklogd-1.4.1/debian/postinst.klogd 2006-01-09 23:01:59.000000000
-0500
@@ -26,15 +26,6 @@
fi
set -e
fi
-
- # Maintain transition to FHS
- if [ "$1" = "configure" ]
- then
- if [ -d /usr/doc -a ! -e /usr/doc/klogd -a -d /usr/share/doc/klogd ]
- then
- ln -sf ../share/doc/klogd /usr/doc/klogd
- fi
- fi
fi
exit 0
diff -ur old/sysklogd-1.4.1/debian/rc.klogd sysklogd-1.4.1/debian/rc.klogd
--- old/sysklogd-1.4.1/debian/rc.klogd 2006-01-09 23:40:54.000000000 -0500
+++ sysklogd-1.4.1/debian/rc.klogd 2006-01-09 23:58:20.000000000 -0500
@@ -55,13 +55,12 @@
;;
stop)
echo -n "Stopping kernel log daemon: klogd"
- start-stop-daemon --stop --quiet --exec $binpath --pidfile $pidfile
+ start-stop-daemon --stop --retry TERM/1/TERM/1/TERM/4/KILL/1/KILL --quiet
--exec $binpath --pidfile $pidfile
echo "."
;;
restart|force-reload)
echo -n "Restarting kernel log daemon: klogd"
- start-stop-daemon --stop --quiet --exec $binpath --pidfile $pidfile
- sleep 1
+ start-stop-daemon --stop --retry TERM/1/TERM/1/TERM/4/KILL/1/KILL --quiet
--exec $binpath --pidfile $pidfile
start-stop-daemon --start --quiet --exec $binpath -- $KLOGD
echo "."
;;
diff -ur old/sysklogd-1.4.1/debian/rules sysklogd-1.4.1/debian/rules
--- old/sysklogd-1.4.1/debian/rules 2006-01-09 23:40:54.000000000 -0500
+++ sysklogd-1.4.1/debian/rules 2006-01-09 22:58:40.000000000 -0500
@@ -28,9 +28,9 @@
installdoc = install -g root -o root -m 644
ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-CFLAGS = -g -O2 -Wall $(getconf LFS_CFLAGS) -D_LARGEFILE_SOURCE
+CFLAGS = -g -O2 -Wall $(shell getconf LFS_CFLAGS) -D_LARGEFILE_SOURCE
else
-CFLAGS = -O2 -Wall $(getconf LFS_CFLAGS) -D_LARGEFILE_SOURCE
+CFLAGS = -O2 -Wall $(shell getconf LFS_CFLAGS) -D_LARGEFILE_SOURCE
endif
ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
STRIP = -s
signature.asc
Description: Digital signature
