Debian Bug report logs - #35586
[PATCH] Split into syslogd and klogd

Toggle useless messages

Message #5 received at submit@bugs.debian.org (full text, mbox, reply):

From: tv@debian.org

To: submit@bugs.debian.org

Subject: sysklogd: Should be split into syslogd and klogd so one can replace syslogd

Date: 5 Apr 1999 15:37:48 -0000

Package: sysklogd
Version: 1.3-31
Severity: wishlist

	I'm trying to package syslog-ng, which provides
	authentication etc. for syslogd (please see
	http://www.balabit.hu/products/syslog-ng.html
	for more).

	I am currently at loss how to replace syslogd
	while still keeping klogd functionality. I would
	not want to divert any of sysklogd files (it is
	a bit too critical package for that to feel good
	for me). I could Conflict: sysklogd, but then
	anyone installing syslog-ng would miss klogd.

	Can you build two packages from sysklogd sourcess,
	klogd and syslogd? Then I could Conflict and Provide
	syslogd.

	Thank you for your time.

Message #10 received at 35586@bugs.debian.org (full text, mbox, reply):

From: SZALAY Attila <sasa@pheniscidae.satimex.tvnet.hu>

To: 35586@bugs.debian.org

Subject: One possible solution

Date: Wed, 3 Nov 1999 16:12:33 +0100 (CET)

[Message part 1 (text/plain, inline)]

Hi!

I make a "stupid, but working" patch for sysklogd.
It's not a very good solution (becouse sysklogd start klogd) but I can't
any find better by now.


bye
      Sasa             

PGP ID 0x8D143771, /C5 95 43 F8 6F 19 E8 29  53 5E 96 61 05 63 42 D0

[sysklogdiff (text/plain, inline)]

diff -ur sysklogd-1.3/debian/control sysklogd-1.3.sasa/debian/control
--- sysklogd-1.3/debian/control	Wed Nov  3 15:18:41 1999
+++ sysklogd-1.3.sasa/debian/control	Wed Nov  3 00:13:10 1999
@@ -2,21 +2,25 @@
 Section: base
 Priority: required
 Maintainer: Martin Schulze <joey@debian.org>
-Standards-Version: 2.4.0.0
+Standards-Version: 3.0.0
 
 Package: sysklogd
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: klogd, ${shlibs:Depends}
 Conflicts: syslogd
 Provides: syslogd
 Replaces: syslogd
-Description: Kernel and system logging daemons
+Description: System logging daemon
  This package implements two system log daemons.  The syslogd daemon is
  an enhanced version of the standard Berkeley utility program.  This
  daemon is responsible for providing logging of messages received from
  programs and facilities on the local host as well as from remote
  hosts.
- .
+
+Package: klogd
+Architecture: any
+Depends: syslogd, ${shlibs:Depends}
+Description: Kernel logging daemon
  The klogd daemon listens to kernel message sources and is responsible
  for prioritizing and processing operating system messages.  The klogd
  daemon can run as a client of syslogd or optionally as a standalone
Only in sysklogd-1.3/debian: files.
Only in sysklogd-1.3.sasa/debian: init
Only in sysklogd-1.3.sasa/debian: klogd.files
diff -ur sysklogd-1.3/debian/postinst sysklogd-1.3.sasa/debian/postinst
--- sysklogd-1.3/debian/postinst	Wed Nov  3 15:18:41 1999
+++ sysklogd-1.3.sasa/debian/postinst	Wed Nov  3 00:14:59 1999
@@ -75,4 +75,6 @@
     fi
 fi
 
+#DEBHELPER#
+
 exit 0
diff -ur sysklogd-1.3/debian/postrm sysklogd-1.3.sasa/debian/postrm
--- sysklogd-1.3/debian/postrm	Wed Nov  3 15:18:41 1999
+++ sysklogd-1.3.sasa/debian/postrm	Wed Nov  3 00:15:31 1999
@@ -6,3 +6,5 @@
 then
   update-rc.d sysklogd remove >/dev/null
 fi
+
+#DEBHELPER#
diff -ur sysklogd-1.3/debian/preinst sysklogd-1.3.sasa/debian/preinst
--- sysklogd-1.3/debian/preinst	Wed Nov  3 15:18:41 1999
+++ sysklogd-1.3.sasa/debian/preinst	Wed Nov  3 00:15:52 1999
@@ -13,4 +13,6 @@
     fi
 fi
 
+#DEBHELPER#
+
 exit 0
Only in sysklogd-1.3/debian: rc
diff -ur sysklogd-1.3/debian/rules sysklogd-1.3.sasa/debian/rules
--- sysklogd-1.3/debian/rules	Wed Nov  3 15:18:41 1999
+++ sysklogd-1.3.sasa/debian/rules	Wed Nov  3 14:42:01 1999
@@ -1,120 +1,131 @@
-#! /usr/bin/make -f
-
-#   Copyright 1994-98   joey@infodrom.north.de (Martin Schulze)
-#
-#   This program is free software; you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation; version 2 dated June, 1991.
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
 #
-#   This program is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#   GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program;  if not, write to the Free Software
-#   Foundation Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA
+# This version is for a multibinary package. It also allows you to build any
+# of the binary packages independantly, via binary-<package> targets.
+
+# Uncomment this to turn on verbose mode. 
+# export DH_VERBOSE=1
+
+# This is the debhelper compatability version to use.
+# export DH_COMPAT=2
+
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
 SHELL=/bin/bash
 
-# The name and version of the source
-#
 source = $(shell grep "^Source: " debian/control|head -1|sed 's/Source: \(.*\)/\1/g')
-package = $(shell grep "^Package: " debian/control|head -1|sed 's/Package: \(.*\)/\1/g')
+#package = $(shell grep "^Package: " debian/control|head -1|sed 's/Package: \(.*\)/\1/g')
 version = $(shell grep "^$(source) " debian/changelog|head -1 |sed 's/.*(\(.*\)\-[^\-]*).*/\1/g')
 revision = $(shell grep "^$(source) " debian/changelog|head -1 |sed 's/.*([^\-]*\-\(.*\)).*/\1/g')
 
 installbin = install -g root -o root -m 755
 installdoc = install -g root -o root -m 644
 
-build:
+build: build-stamp
+build-stamp:
+	dh_testdir
+
+	# Add here commands to compile the package.
 	$(MAKE) DEB="-DDEBRELEASE=\\\"$(revision)\\\""
 	pod2man --section=8 --lax --center="Debian GNU/Linux" \
-	  --release="Debian Project" debian/syslog-facility.pod \
-	  > syslog-facility.8
+		--release="Debian Project" debian/syslog-facility.pod \
+		> syslog-facility.8
 	(cat README.linux; printf "\n\n"; cat README.1st; \
-	  printf "\n\nThe following important changes have been reported by the developers:\n\n"; \
-	  cat NEWS debian/readme) \
-	  > readme.txt
+		printf "\n\nThe following important changes have been reported by the developers:\n\n"; \
+		cat NEWS debian/readme) \
+		> readme.txt
 	(cat debian/copyright; \
-	  printf "Syslogd stays under the following copyright:\n\n"; \
-	    sed -e '/^$$/,$$d' < syslogd.c; \
-	  printf "\nKlogd has the following copyright notice:\n\n"; \
-	    sed -e '/^$$/,$$d' < klogd.c ) \
-	  > copyright
-	touch stamp-build
+		printf "Syslogd stays under the following copyright:\n\n"; \
+		sed -e '/^$$/,$$d' < syslogd.c; \
+		printf "\nKlogd has the following copyright notice:\n\n"; \
+		sed -e '/^$$/,$$d' < klogd.c ) \
+		> copyright
+
+
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp
 
-clean: debclean
-	rm -f stamp-build
+	# Add here commands to clean up after the build process.
 	$(MAKE) clobber
 	rm -rf *~ syslog-facility.8 readme.txt copyright
+	#-$(MAKE) clean
+	#-$(MAKE) distclean
 
-debclean:
-# Cleans debian binary directories to allow binary creation
-	rm -rf debian/tmp
-	rm -f debian/{files,substvars}
+	dh_clean
 
-binary-indep:
-# Nothing to be done here
-
-binary-arch: debclean
-	test -f stamp-build || $(MAKE) -f debian/rules build
-	$(installbin) -d debian/tmp/DEBIAN
-	chown -R root.root debian/tmp
-	chmod -R g-ws debian/tmp
-	$(installbin) -d debian/tmp/usr/doc/$(package)
-	$(installbin) debian/{preinst,postinst,postrm} debian/tmp/DEBIAN/
-	$(installdoc) debian/conffiles debian/tmp/DEBIAN/
-	$(installdoc) debian/changelog debian/tmp/usr/doc/$(package)/changelog.Debian
-	#
-	$(installdoc) copyright debian/tmp/usr/doc/$(package)/
-	$(installdoc) readme.txt debian/tmp/usr/doc/$(package)/
-	gzip -9f debian/tmp/usr/doc/$(package)/{changelog.Debian,readme.txt}
-	$(installdoc) modutils.patch debian/tmp/usr/doc/$(package)
-	#
+install: DH_OPTIONS=
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	# Add here commands to install the package into debian/tmp.
+	#$(MAKE) prefix=`pwd`/debian/tmp/usr install
 	$(installbin) -d debian/tmp/{usr/,}sbin
 	$(installbin) -s {syslogd,klogd} debian/tmp/sbin
 	$(installbin) debian/syslogd-listfiles debian/tmp/usr/sbin
 	$(installbin) debian/syslog-facility debian/tmp/usr/sbin
-	#
-	$(installbin) -d debian/tmp/etc/{init.d,cron.{daily,weekly}}
-	$(installbin) debian/rc debian/tmp/etc/init.d/sysklogd
-	$(installbin) debian/cron.weekly debian/tmp/etc/cron.weekly/sysklogd
-	$(installbin) debian/cron.daily debian/tmp/etc/cron.daily/sysklogd
+	$(installbin) -d debian/tmp/usr/share/man/man{5,8}
+	$(installdoc) syslog.conf.5 debian/tmp/usr/share/man/man5
+	$(installdoc) {sysklogd,syslogd,klogd,debian/syslogd-listfiles}.8 debian/tmp/usr/share/man/man8
+	$(installdoc) syslog-facility.8 debian/tmp/usr/share/man/man8
+	$(installbin) -d debian/tmp/etc/
 	$(installdoc) debian/syslog.conf debian/tmp/etc/syslog.conf
-	$(installbin) -d debian/tmp/var/log
-	#
-	$(installbin) -d debian/tmp/usr/man/man{5,8}
-	$(installdoc) syslog.conf.5 debian/tmp/usr/man/man5
-	$(installdoc) {sysklogd,syslogd,klogd,debian/syslogd-listfiles}.8 debian/tmp/usr/man/man8
-	$(installdoc) syslog-facility.8 debian/tmp/usr/man/man8
-	gzip -9 debian/tmp/usr/man/man?/*
-	#
-	dpkg-shlibdeps debian/tmp/sbin/{sys,k}logd
-	dpkg-gencontrol
-	dpkg --build debian/tmp ..
-
-binary: binary-indep binary-arch
-
-source diff:
-	@echo >&2 'source and diff are obsolete - use dpkg-source -b' or dsc; false
-
-dsc:
-	-test -d debian/tmp && $(MAKE) -f debian/rules clean
-	if [ ! -f ../$(source)_$(version).orig.tar.gz -a -f ../orig/$(source)_$(version).orig.tar.gz ]; \
-	then \
-	  ln -s orig/$(source)_$(version).orig.tar.gz ../$(source)_$(version).orig.tar.gz; \
-	  touch /tmp/stamp-$(source)-link; \
-	fi; \
-	cd .. && dpkg-source -b $(source)-$(version)
-	if [ -f /tmp/stamp-$(source)-link ]; then \
-	  rm ../$(source)_$(version).orig.tar.gz /tmp/stamp-$(source)-link; \
-	fi
-
-checkroot:
-	$(checkdir)
-	test root = "`whoami`"
+	dh_movefiles
 
-dist: binary dsc
+# This single target is used to build all the packages, all at once, or
+# one at a time. So keep in mind: any options passed to commands here will
+# affect _all_ packages. Anything you want to only affect one package
+# should be put in another target, such as the install target.
+binary-common:
+	# Need this version of debhelper for DH_OPTIONS to work.
+#	dh_testversion 1.1.7
+	dh_testdir
+	dh_testroot
+#	dh_installdebconf
+	dh_installdocs
+	dh_installexamples
+	dh_installmenu
+#	dh_installemacsen
+#	dh_installpam
+	dh_installinit -n
+	dh_installcron
+	dh_installinfo
+#	dh_undocumented
+	dh_installchangelogs
+	dh_link
+	dh_compress
+	dh_fixperms
+	# You may want to make some executables suid here.
+	dh_suidregister
+#	dh_makeshlibs
+	dh_installdeb
+#	dh_perl
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+# Build architecture independant packages using the common target.
+binary-indep:
+# (Uncomment this next line if you have such packages.)
+#	 $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
 
-.PHONY: binary binary-arch binary-indep clean checkroot
+# Build architecture dependant packages using the common target.
+binary-arch:
+	$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
+#	$(MAKE) -f debian/rules binary-common
+
+# Any other binary targets build just one binary package at a time.
+#binary-%: build install
+#	make -f debian/rules binary-common DH_OPTIONS=-p$*
 
+binary: install binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install

Message #15 received at 35586@bugs.debian.org (full text, mbox, reply):

From: Martin Schulze <joey@infodrom.north.de>

To: SZALAY Attila <sasa@pheniscidae.satimex.tvnet.hu>, 35586@bugs.debian.org

Subject: Re: Bug#35586: One possible solution

Date: Wed, 3 Nov 1999 16:32:55 +0100

Patch will be ignore due to improper changes and debhelperization.

Regards,

	Joey

Message #20 received at 35586@bugs.debian.org (full text, mbox, reply):

From: SZALAY Attila <sasa@pheniscidae.satimex.tvnet.hu>

To: 35586@bugs.debian.org

Subject: Second try

Date: Wed, 12 Jan 2000 02:34:58 +0100

[Message part 1 (text/plain, inline)]

Hi!

I'm not giving up to make a patch fo slitting syslogd and klogd
packages.
Here's is my second try, now without dephelperization.

-- 
   SaSa

PGP ID 0x8D143771, /C5 95 43 F8 6F 19 E8 29  53 5E 96 61 05 63 42 D0
GPG ID   ABA0E8B2, 45CF B559 8281 8091 8469  CACD DB71 AEFC ABA0 E8B2

[splitpatch (text/plain, attachment)]

[Message part 3 (application/pgp-signature, inline)]

Message #25 received at 35586@bugs.debian.org (full text, mbox, reply):

From: Tommi Virtanen <tv@debian.org>

To: joey@debian.org, 35586@bugs.debian.org

Subject: Patch for the split

Date: Fri, 3 Nov 2000 15:09:45 +0200

retitle 35586 [PATCH] Split into syslogd and klogd
thanks

	Here's a cleaner patch to do the split. Please give feedback.

-- 
tv@{{hq.yok.utu,havoc,gaeshido}.fi,{debian,wanderer}.org,stonesoft.com}
unix, linux, debian, networks, security, | Out of memory.
kernel, TCP/IP, C, perl, free software,  | We wish to hold the whole sky,
mail, www, sw devel, unix admin, hacks.  | But we never will.

Message #32 received at 35586@bugs.debian.org (full text, mbox, reply):

From: Tommi Virtanen <tv@debian.org>

To: Josip Rodin <joy@cibalia.gkvk.hr>

Cc: 35586@bugs.debian.org

Subject: Re: Bug#35586: Patch for the split

Date: Fri, 3 Nov 2000 16:20:20 +0200

On Fri, Nov 03, 2000 at 04:06:40PM +0200, Josip Rodin wrote:
> > 	Here's a cleaner patch to do the split. Please give feedback.
> Not sure if you noticed, but there was no patch attached to that message.

	Darn. This has to be the most common screwup..
	Thanks.

diff -Naur sysklogd-1.3.original/debian/changelog sysklogd-1.3/debian/changelog
--- sysklogd-1.3.original/debian/changelog	Fri Nov  3 14:59:25 2000
+++ sysklogd-1.3/debian/changelog	Fri Nov  3 14:59:55 2000
@@ -1,3 +1,13 @@
+sysklogd (1.3-33.2) unstable; urgency=low
+
+  * Split sysklogd into sysklogd and klogd (closes: Bug#35586)
+  * Provide / depend on virtual packages system-log-daemon
+    and linux-kernel-log-daemon (closes: Bug#67604)
+  * If this gets into woody, then the security fix in 1.3-33.1
+    does, too (closes: Bug#72892)
+
+ -- Tommi Virtanen <tv@debian.org>  Fri,  3 Nov 2000 14:53:46 +0200
+
 sysklogd (1.3-33.1) stable unstable; urgency=high
 
   * SECURITY: various syslogd/klogd security problems
diff -Naur sysklogd-1.3.original/debian/conffiles.klogd sysklogd-1.3/debian/conffiles.klogd
--- sysklogd-1.3.original/debian/conffiles.klogd	Thu Jan  1 02:00:00 1970
+++ sysklogd-1.3/debian/conffiles.klogd	Fri Nov  3 14:59:55 2000
@@ -0,0 +1 @@
+/etc/init.d/klogd
diff -Naur sysklogd-1.3.original/debian/control sysklogd-1.3/debian/control
--- sysklogd-1.3.original/debian/control	Fri Nov  3 14:59:25 2000
+++ sysklogd-1.3/debian/control	Fri Nov  3 14:59:55 2000
@@ -7,16 +7,22 @@
 Package: sysklogd
 Architecture: any
 Depends: ${shlibs:Depends}
+Recommends: klogd | linux-kernel-log-daemon
 Conflicts: syslogd
-Provides: syslogd
+Provides: syslogd, system-log-daemon
 Replaces: syslogd
-Description: Kernel and system logging daemons
- This package implements two system log daemons.  The syslogd daemon is
- an enhanced version of the standard Berkeley utility program.  This
- daemon is responsible for providing logging of messages received from
- programs and facilities on the local host as well as from remote
- hosts.
- .
+Description: System logging daemon
+ This package implements the system log daemon, which is an enhanced
+ version of the standard Berkeley utility program. It is responsible
+ for providing logging of messages received from programs and facilities
+ on the local host as well as from remote hosts.
+
+Package: klogd
+Architecture: any
+Depends: ${shlibs:Depends}, sysklogd | system-log-daemon
+Conflicts: sysklogd (<= 1.3-33)
+Provides: linux-kernel-log-daemon
+Description: Kernel logging daemon
  The klogd daemon listens to kernel message sources and is responsible
  for prioritizing and processing operating system messages.  The klogd
  daemon can run as a client of syslogd or optionally as a standalone
diff -Naur sysklogd-1.3.original/debian/postinst.klogd sysklogd-1.3/debian/postinst.klogd
--- sysklogd-1.3.original/debian/postinst.klogd	Thu Jan  1 02:00:00 1970
+++ sysklogd-1.3/debian/postinst.klogd	Fri Nov  3 14:59:55 2000
@@ -0,0 +1,27 @@
+#! /bin/sh
+
+set -e
+
+if [ "$1" = "configure" ]
+then
+    if [ -f /etc/init.d/klogd ]
+    then
+	set +e
+	sh /etc/init.d/klogd stop
+	set -e
+    fi
+
+
+    update-rc.d klogd defaults 11 89 >/dev/null
+
+    # restarting daemon
+    #
+    if [ -f /etc/init.d/klogd ]
+    then
+	set +e
+	sh /etc/init.d/klogd start
+	set -e
+    fi
+fi
+
+exit 0
diff -Naur sysklogd-1.3.original/debian/postrm.klogd sysklogd-1.3/debian/postrm.klogd
--- sysklogd-1.3.original/debian/postrm.klogd	Thu Jan  1 02:00:00 1970
+++ sysklogd-1.3/debian/postrm.klogd	Fri Nov  3 14:59:55 2000
@@ -0,0 +1,8 @@
+#! /bin/sh
+
+set -e
+
+if [ "$1" = "purge" ]
+then
+  update-rc.d klogd remove >/dev/null
+fi
diff -Naur sysklogd-1.3.original/debian/preinst.klogd sysklogd-1.3/debian/preinst.klogd
--- sysklogd-1.3.original/debian/preinst.klogd	Thu Jan  1 02:00:00 1970
+++ sysklogd-1.3/debian/preinst.klogd	Fri Nov  3 14:59:55 2000
@@ -0,0 +1,16 @@
+#! /bin/sh
+
+set -e
+
+dpkg --assert-support-predepends
+
+if [ "$1" = "upgrade" -a -f /etc/init.d/klogd ]; then
+    if [ -f /etc/init.d/klogd ]
+    then
+	set +e
+	sh /etc/init.d/klogd stop
+	set -e
+    fi
+fi
+
+exit 0
diff -Naur sysklogd-1.3.original/debian/rc sysklogd-1.3/debian/rc
--- sysklogd-1.3.original/debian/rc	Fri Nov  3 14:59:25 2000
+++ sysklogd-1.3/debian/rc	Fri Nov  3 14:59:55 2000
@@ -1,7 +1,6 @@
 #! /bin/sh
-# /etc/init.d/sysklogd: start system and kernel log daemons.
+# /etc/init.d/sysklogd: start the system log daemon.
 
-test -f /sbin/klogd || exit 0
 test -f /sbin/syslogd || exit 0
 
 # Options for start/restart the daemons
@@ -9,22 +8,14 @@
 #
 SYSLOGD=""
 
-#  Use KLOGD="-k /boot/System.map-$(uname -r)" to specify System.map
-#
-KLOGD=""
-
 case "$1" in
   start)
     echo -n "Starting system log daemon: syslogd"
     start-stop-daemon --start --quiet --exec /sbin/syslogd -- $SYSLOGD
-    echo -n " klogd"
-    start-stop-daemon --start --quiet --exec /sbin/klogd -- $KLOGD
     echo "."
     ;;
   stop)
-    echo -n "Stopping system log daemon: klogd"
-    start-stop-daemon --stop --quiet --pidfile /var/run/klogd.pid
-    echo -n " syslogd"
+    echo -n "Stopping system log daemon: syslogd"
     start-stop-daemon --stop --quiet --pidfile /var/run/syslogd.pid
     echo "."
     ;;
@@ -32,15 +23,11 @@
     start-stop-daemon --stop --quiet --signal 1 --pidfile /var/run/syslogd.pid
     ;;
   restart)
-    echo -n "Stopping system log daemon: klogd"
-    start-stop-daemon --stop --quiet --pidfile /var/run/klogd.pid
-    echo " syslogd"
+    echo -n "Stopping system log daemon: syslogd"
     start-stop-daemon --stop --quiet --pidfile /var/run/syslogd.pid
     sleep 1
     echo -n "Starting system log daemon: syslogd"
     start-stop-daemon --start --quiet --exec /sbin/syslogd -- $SYSLOGD
-    echo -n " klogd"
-    start-stop-daemon --start --quiet --exec /sbin/klogd -- $KLOGD
     echo "."
     ;;
   *)
diff -Naur sysklogd-1.3.original/debian/rc.klogd sysklogd-1.3/debian/rc.klogd
--- sysklogd-1.3.original/debian/rc.klogd	Thu Jan  1 02:00:00 1970
+++ sysklogd-1.3/debian/rc.klogd	Fri Nov  3 14:59:55 2000
@@ -0,0 +1,35 @@
+#! /bin/sh
+# /etc/init.d/klogd: start the kernel log daemon.
+
+test -f /sbin/klogd || exit 0
+
+#  Use KLOGD="-k /boot/System.map-$(uname -r)" to specify System.map
+#
+KLOGD=""
+
+case "$1" in
+  start)
+    echo -n "Starting kernel log daemon: klogd"
+    start-stop-daemon --start --quiet --exec /sbin/klogd -- $KLOGD
+    echo "."
+    ;;
+  stop)
+    echo -n "Stopping kernel log daemon: klogd"
+    start-stop-daemon --stop --quiet --pidfile /var/run/klogd.pid
+    echo "."
+    ;;
+  restart|force-reload)
+    echo -n "Stopping kernel log daemon: klogd"
+    start-stop-daemon --stop --quiet --pidfile /var/run/klogd.pid
+    echo "."
+    sleep 1
+    echo -n "Starting kernel log daemon: klogd"
+    start-stop-daemon --start --quiet --exec /sbin/klogd -- $KLOGD
+    echo "."
+    ;;
+  *)
+    echo "Usage: /etc/init.d/klogd {start|stop|restart|force-reload}"
+    exit 1
+esac
+
+exit 0
diff -Naur sysklogd-1.3.original/debian/rules sysklogd-1.3/debian/rules
--- sysklogd-1.3.original/debian/rules	Fri Nov  3 14:59:25 2000
+++ sysklogd-1.3/debian/rules	Fri Nov  3 14:59:55 2000
@@ -50,48 +50,80 @@
 
 debclean:
 # Cleans debian binary directories to allow binary creation
-	rm -rf debian/tmp
+	rm -rf debian/tmp.*
 	rm -f debian/{files,substvars}
 
 binary-indep:
 # Nothing to be done here
 
-binary-arch: debclean
+binary-arch-sysklogd: debclean
 	test -f stamp-build || $(MAKE) -f debian/rules build
-	$(installbin) -d debian/tmp/DEBIAN
-	chown -R root.root debian/tmp
-	chmod -R g-ws debian/tmp
-	$(installbin) -d debian/tmp/usr/doc/$(package)
-	$(installbin) debian/{preinst,postinst,postrm} debian/tmp/DEBIAN/
-	$(installdoc) debian/conffiles debian/tmp/DEBIAN/
-	$(installdoc) debian/changelog debian/tmp/usr/doc/$(package)/changelog.Debian
-	#
-	$(installdoc) copyright debian/tmp/usr/doc/$(package)/
-	$(installdoc) readme.txt debian/tmp/usr/doc/$(package)/
-	gzip -9f debian/tmp/usr/doc/$(package)/{changelog.Debian,readme.txt}
-	$(installdoc) modutils.patch debian/tmp/usr/doc/$(package)
-	#
-	$(installbin) -d debian/tmp/{usr/,}sbin
-	$(installbin) -s {syslogd,klogd} debian/tmp/sbin
-	$(installbin) debian/syslogd-listfiles debian/tmp/usr/sbin
-	$(installbin) debian/syslog-facility debian/tmp/usr/sbin
-	#
-	$(installbin) -d debian/tmp/etc/{init.d,cron.{daily,weekly}}
-	$(installbin) debian/rc debian/tmp/etc/init.d/sysklogd
-	$(installbin) debian/cron.weekly debian/tmp/etc/cron.weekly/sysklogd
-	$(installbin) debian/cron.daily debian/tmp/etc/cron.daily/sysklogd
-	$(installdoc) debian/syslog.conf debian/tmp/etc/syslog.conf
-	$(installbin) -d debian/tmp/var/log
-	#
-	$(installbin) -d debian/tmp/usr/man/man{5,8}
-	$(installdoc) syslog.conf.5 debian/tmp/usr/man/man5
-	$(installdoc) {sysklogd,syslogd,klogd,debian/syslogd-listfiles}.8 debian/tmp/usr/man/man8
-	$(installdoc) syslog-facility.8 debian/tmp/usr/man/man8
-	gzip -9 debian/tmp/usr/man/man?/*
-	#
-	dpkg-shlibdeps debian/tmp/sbin/{sys,k}logd
-	dpkg-gencontrol
-	dpkg --build debian/tmp ..
+	$(installbin) -d debian/tmp.sysklogd/DEBIAN
+	chown -R root.root debian/tmp.sysklogd
+	chmod -R g-ws debian/tmp.sysklogd
+	$(installbin) -d debian/tmp.sysklogd/usr/doc/$(package)
+	$(installbin) debian/{preinst,postinst,postrm} debian/tmp.sysklogd/DEBIAN/
+	$(installdoc) debian/conffiles debian/tmp.sysklogd/DEBIAN/
+	$(installdoc) debian/changelog debian/tmp.sysklogd/usr/doc/$(package)/changelog.Debian
+	#
+	$(installdoc) copyright debian/tmp.sysklogd/usr/doc/$(package)/
+	$(installdoc) readme.txt debian/tmp.sysklogd/usr/doc/$(package)/
+	gzip -9f debian/tmp.sysklogd/usr/doc/$(package)/{changelog.Debian,readme.txt}
+	#
+	$(installbin) -d debian/tmp.sysklogd/{usr/,}sbin
+	$(installbin) -s syslogd debian/tmp.sysklogd/sbin
+	$(installbin) debian/syslogd-listfiles debian/tmp.sysklogd/usr/sbin
+	$(installbin) debian/syslog-facility debian/tmp.sysklogd/usr/sbin
+	#
+	$(installbin) -d debian/tmp.sysklogd/etc/{init.d,cron.{daily,weekly}}
+	$(installbin) debian/rc debian/tmp.sysklogd/etc/init.d/sysklogd
+	$(installbin) debian/cron.weekly debian/tmp.sysklogd/etc/cron.weekly/sysklogd
+	$(installbin) debian/cron.daily debian/tmp.sysklogd/etc/cron.daily/sysklogd
+	$(installdoc) debian/syslog.conf debian/tmp.sysklogd/etc/syslog.conf
+	$(installbin) -d debian/tmp.sysklogd/var/log
+	#
+	$(installbin) -d debian/tmp.sysklogd/usr/man/man{5,8}
+	$(installdoc) syslog.conf.5 debian/tmp.sysklogd/usr/man/man5
+	$(installdoc) {sysklogd,syslogd,debian/syslogd-listfiles}.8 debian/tmp.sysklogd/usr/man/man8
+	$(installdoc) syslog-facility.8 debian/tmp.sysklogd/usr/man/man8
+	gzip -9 debian/tmp.sysklogd/usr/man/man?/*
+	#
+	dpkg-shlibdeps debian/tmp.sysklogd/sbin/syslogd
+	dpkg-gencontrol -psysklogd -Pdebian/tmp.sysklogd
+	dpkg --build debian/tmp.sysklogd ..
+
+binary-arch-klogd: debclean
+	test -f stamp-build || $(MAKE) -f debian/rules build
+	$(installbin) -d debian/tmp.klogd/DEBIAN
+	chown -R root.root debian/tmp.klogd
+	chmod -R g-ws debian/tmp.klogd
+	$(installbin) -d debian/tmp.klogd/usr/doc/klogd
+	$(installbin) debian/preinst.klogd debian/tmp.klogd/DEBIAN/preinst
+	$(installbin) debian/postinst.klogd debian/tmp.klogd/DEBIAN/postinst
+	$(installbin) debian/postrm.klogd debian/tmp.klogd/DEBIAN/postrm
+	$(installdoc) debian/conffiles.klogd debian/tmp.klogd/DEBIAN/conffiles
+	$(installdoc) debian/changelog debian/tmp.klogd/usr/doc/klogd/changelog.Debian
+	#
+	$(installdoc) copyright debian/tmp.klogd/usr/doc/klogd/
+	$(installdoc) readme.txt debian/tmp.klogd/usr/doc/klogd/
+	gzip -9f debian/tmp.klogd/usr/doc/klogd/{changelog.Debian,readme.txt}
+	$(installdoc) modutils.patch debian/tmp.klogd/usr/doc/klogd
+	#
+	$(installbin) -d debian/tmp.klogd/{usr/,}sbin
+	$(installbin) -s klogd debian/tmp.klogd/sbin
+	#
+	$(installbin) -d debian/tmp.klogd/etc/init.d
+	$(installbin) debian/rc.klogd debian/tmp.klogd/etc/init.d/klogd
+	#
+	$(installbin) -d debian/tmp.klogd/usr/man/man8
+	$(installdoc) klogd.8 debian/tmp.klogd/usr/man/man8
+	gzip -9 debian/tmp.klogd/usr/man/man?/*
+	#
+	dpkg-shlibdeps debian/tmp.klogd/sbin/klogd
+	dpkg-gencontrol -pklogd -Pdebian/tmp.klogd
+	dpkg --build debian/tmp.klogd ..
+
+binary-arch: binary-arch-sysklogd binary-arch-klogd
 
 binary: binary-indep binary-arch
 
@@ -99,7 +131,8 @@
 	@echo >&2 'source and diff are obsolete - use dpkg-source -b' or dsc; false
 
 dsc:
-	-test -d debian/tmp && $(MAKE) -f debian/rules clean
+	-test -d debian/tmp.sysklogd -o -d debian/tmp.klogd \
+		&& $(MAKE) -f debian/rules clean
 	if [ ! -f ../$(source)_$(version).orig.tar.gz -a -f ../orig/$(source)_$(version).orig.tar.gz ]; \
 	then \
 	  ln -s orig/$(source)_$(version).orig.tar.gz ../$(source)_$(version).orig.tar.gz; \

-- 
tv@{{hq.yok.utu,havoc,gaeshido}.fi,{debian,wanderer}.org,stonesoft.com}
unix, linux, debian, networks, security, | Chaos reigns within.
kernel, TCP/IP, C, perl, free software,  | Reflect, repent, and reboot.
mail, www, sw devel, unix admin, hacks.  | Order shall return.

Message #39 received at 35586-close@bugs.debian.org (full text, mbox, reply):

From: Martin Schulze <joey@debian.org>

To: 35586-close@bugs.debian.org

Subject: Bug#35586: fixed in sysklogd 1.4.1-1

Date: Mon, 12 Mar 2001 15:06:42 -0500

We believe that the bug you reported is fixed in the latest version of
sysklogd, which has been installed in the Debian FTP archive:

sysklogd_1.4.1-1.dsc
  to pool/main/s/sysklogd/sysklogd_1.4.1-1.dsc
sysklogd_1.4.1-1.diff.gz
  to pool/main/s/sysklogd/sysklogd_1.4.1-1.diff.gz
sysklogd_1.4.1.orig.tar.gz
  to pool/main/s/sysklogd/sysklogd_1.4.1.orig.tar.gz
A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 35586@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Martin Schulze <joey@debian.org> (supplier of updated sysklogd package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.7
Date: Sun, 11 Mar 2001 22:30:53 +0100
Source: sysklogd
Binary: sysklogd klogd
Architecture: source
Version: 1.4.1-1
Distribution: unstable
Urgency: low
Maintainer: Martin Schulze <joey@debian.org>
Changed-By: Martin Schulze <joey@finlandia.infodrom.north.de>
Description: 
 klogd      - Kernel logging daemon
 sysklogd   - System logging daemons
Closes: 32580 35586 41068 49824 62358 66712 67604 70790 71631 72043 72122 74864 74993 76170 76170 76757 79250 80771 84872 85289 85478 85478 87020 87819 88741
Changes: 
 sysklogd (1.4.1-1) unstable; urgency=low
 .
   * New upstream source (closes: Bug#87819, Bug#70790, Bug#32580,
     Bug#62358, Bug#71631)
   * Upstream: Doesn't re-set log-level if not requested (closes:
     Bug#76170, Bug#76170, Bug#85289)
   * Upstream: Ignore zero bytes (closes: Bug#85478, Bug#85478, Bug#41068)
   * Upstream: Corrected documentation for `-s' (closes: Bug#87020)
   * Upstream: test for existence of syslogd-listfiles before calling
     them.  This got lost due to 1.4.0 brokennes which was packaged and
     removed some hours later (closes: Bug#84872, Bug#66712)
   * Applied patch by Tommi Virtanen <tv@debian.org> splitting the package
     into `sysklogd' and `klogd' (closes:Bug#35586, Bug#72043, Bug#74864,
     Bug#72122)
   * Provide / depend on virtual packages system-log-daemon
     and linux-kernel-log-daemon (closes: Bug#67604)
   * Applied patch from Tim Janik <timj@gtk.org> to support `-s pattern' in
     syslogd-listfiles
   * Transition to FHS, i.e. /usr/share/doc instead of /usr/doc and
     /usr/share/man instead of /usr/man (closes:  Bug#79250, Bug#80771)
   * Use --exec for stopping services (closes: Bug#76757)
   * Corrected broken character in klogd.8 (cloes: Bug#75932)
   * Only rotate logfiles with size greater than zero.  This got lost due
     to 1.4.0 brokennes which was packaged and removed some hours later
     (closes: Bug#74993, Bug#49824)
   * Added another note about modificability of cronjobs (closes:
     Bug#88741)
   * Since klogd replaces parts of sysklogd a proper Replaces line is there
Files: 
 f7ea6fd1799c4d26a567e14c416cc9ff 578 base required sysklogd_1.4.1-1.dsc
 d214aa40beabf7bdb0c9b3c64432c774 81784 base required sysklogd_1.4.1.orig.tar.gz
 b23664c0b5c146c46dc3279dce007cb9 16859 base required sysklogd_1.4.1-1.diff.gz

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.4 (GNU/Linux)
Comment: For info see http://www.gnupg.org

iD8DBQE6rALcW5ql+IAeqTIRAuXkAKC1X9HdcCfIjsZ2HVh83JBDPiG9KQCcDRIi
duTE/7YqpGNA8yc2RW8n3+E=
=33tA
-----END PGP SIGNATURE-----

Send a report that this bug log contains spam.