--- socklog-2.1.0.orig/debian/README.Debian.diet +++ socklog-2.1.0/debian/README.Debian.diet @@ -0,0 +1,15 @@ +Building with the diet libc +--------------------------- + +This package optionally can be built with the diet libc instead of glibc +to provide small statically linked programs. The resulting package has +no dependency on any other package. + +To use the diet libc, make sure the latest versions of the dietlibc-dev +package is installed, and set DEB_BUILD_OPTIONS=diet in the environment +when building the package, e.g.: + + # apt-get install dietlibc-dev + $ DEB_BUILD_OPTIONS=diet fakeroot apt-get source -b socklog + + -- Gerrit Pape , Sat, 26 Jun 2004 09:49:26 +0000 --- socklog-2.1.0.orig/debian/changelog +++ socklog-2.1.0/debian/changelog @@ -0,0 +1,466 @@ +socklog (2.1.0-8.1) unstable; urgency=medium + + * Non-maintainer upload. + * Make the build reproducible: + + Pass -n to gzip. + Thanks to Chris Lamb for the patch. Closes: #777419 + + Sort the md5sums file. + Thanks to Valerie R Young for the patch. Closes: #847031 + * debian/control: move the homepage to the Homepage field. + + -- Mattia Rizzolo Wed, 08 Mar 2017 21:34:16 +0100 + +socklog (2.1.0-8) unstable; urgency=low + + * debian/diff/socklog-conf-update-service.diff: new; refer to + update-service(8) instead of symlinks in /var/service/. + * debian/rules: target build: apply socklog-conf-update-service.diff. + * debian/etc/klog/run: cut: fields and positions are numbered from 1, + not 0. + * debian/socklog-run.postinst, debian/socklog-run.prerm: use runit's + update-service program to add/remove services from system-wide service + supervision, instead of dealing with symlinks in /var/service/ directly. + * debian/rules: no longer include dangling links for ./supervise/ + subdirectories, update-service now takes care of this. + * debian/socklog-run.postinst: remove socklog-unix, socklog-klog services + on upgrade from <= 2.1.0-7, re-add afterwards through update-service, + and restore ./supervise/ symlinks for other enabled socklog services. + * debian/socklog-run.postrm: purge: adapt paths in /var/run/; force-stop + socklog services; remove ./supervise/ subdirectories (or symlinks) in + service directories. + * debian/control: Standards-Version: 3.7.3.0. + * debian/control: package socklog-run: Depends: runit (>= 1.8.0-2) (1st + version that provides the update-service program). + * debian/socklog.README.Debian: typo. + + -- Gerrit Pape Thu, 14 Feb 2008 01:58:07 +0000 + +socklog (2.1.0-7) unstable; urgency=low + + * debian/diff/tryto-n.diff: new; don't report failure if the final try + of prog succeeds (thx Andras Korn, closes: #401547). + * debian/rules: apply tryto-n.diff. + + -- Gerrit Pape Sat, 9 Dec 2006 10:34:40 +0000 + +socklog (2.1.0-6) unstable; urgency=medium + + * debian/socklog.postrm: check for deluser being available, if not, + print warning and don't remove system user (closes: #398539). + + -- Gerrit Pape Fri, 17 Nov 2006 20:09:56 +0000 + +socklog (2.1.0-5) unstable; urgency=low + + * debian/socklog.postinst: don't make the log service system user + log member of group adm, but nogroup; log's home directory is + /nonexistent (closes: #396687). + * debian/socklog-run.postinst: make log directories mode 2750, owner + log:adm. + + -- Gerrit Pape Mon, 6 Nov 2006 20:27:25 +0000 + +socklog (2.1.0-4) unstable; urgency=low + + * debian/control: socklog-run: no longer Depends: ipsvd, as package + socklog Recommends: ipsvd, and it's only necessary for optional + tcp and/or ssl network logging. + * debian/socklog-run.README.Debian: service directories are in /etc/sv/. + * debian/control: Standards-Version: 3.7.2.0. + * debian/implicit: update to revision 1.11. + * debian/copyright: 2006. + + -- Gerrit Pape Sat, 27 May 2006 16:13:14 +0000 + +socklog (2.1.0-3) unstable; urgency=low + + * debian/socklog-run.postinst: really deal properly with dangling + symlinks in /var/service/ (closes: #358133). + + -- Gerrit Pape Fri, 24 Mar 2006 11:25:54 +0000 + +socklog (2.1.0-2) unstable; urgency=low + + * debian/socklog-run.postinst: properly deal with dangling socklog + service symlinks in /var/service/ (closes: #358133). + + -- Gerrit Pape Tue, 21 Mar 2006 19:14:41 +0000 + +socklog (2.1.0-1) unstable; urgency=low + + * new upstream version. + * debian/rules: put service directories into /etc/sv/, name them + ./socklog-*/; rename /var/run/socklog* to /var/run/sv.socklog*. + * debian/socklog-run.conffiles: adapt. + * debian/socklog-run.preinst, debian/socklog-run.postinst: move + conffiles, preserve user changes. + * debian/socklog-run.preinst: new; check old conffiles for user + changes. + + -- Gerrit Pape Sat, 18 Mar 2006 08:31:57 +0000 + +socklog (2.0.2-2) unstable; urgency=low + + * debian/etc/unix/check: new; use the socklog-check program to check + for the availability of listener on /dev/log. + * debian/rules: install debian/etc/unix/check. + * debian/README.Debian.diet: wording. + * debian/control: slightly update descriptions; Depends: runit (>> + 1.3.0-0); Standards-Version: 3.6.2.0. + * debian/socklog-run.conffiles: add /etc/socklog/unix/check. + * debian/socklog-run.prerm: use the sv program instead of svwaitdown + to take down services. + * debian/socklog.README.Debian: minor. + + -- Gerrit Pape Wed, 5 Oct 2005 08:02:36 +0000 + +socklog (2.0.2-1) unstable; urgency=low + + * new upstream point release. + * debian/control: remove version restriction from Depends: runit. + * debian/socklog-run.README.Debian, debian/socklog.README.Debian: minor + updates. + * debian/socklog-run.postinst, debian/socklog-run.postrm, + socklog-run.prerm, debian/socklog.postinst, debian/socklog.postrm: + more cleanup. + + -- Gerrit Pape Fri, 15 Apr 2005 09:56:53 +0000 + +socklog (2.0.0-1) unstable; urgency=low + + * new upstream release. + * debian/diff/socklog-check.check.diff: remove; applied upstream. + * debian/rules: don't apply patch; cleanup. + * debian/implicit: update to revision 1.10. + * debian/socklog-run.postinst, debian/socklog-run.postrm, + debian/socklog-run.prerm, debian/socklog.postinst, + debian/socklog.postrm: cleanup. + + -- Gerrit Pape Sun, 6 Feb 2005 19:57:15 +0000 + +socklog (1.5.0-2) unstable; urgency=low + + * debian/diff/socklog-check.check.diff: new; tweak timing in socklog-check + program test (fixes build failure on arm, m68k). + * debian/rules: apply diff. + + -- Gerrit Pape Sun, 27 Jun 2004 18:31:06 +0000 + +socklog (1.5.0-1) unstable; urgency=low + + * new upstream version. + * debian/implicit: update to revision 1.8. + * debian/rules: use -g -O2. + * debian/socklog.docs: add debian/README.Debian.diet. + * debian/README.Debian.diet: new; how to build the package with the diet + libc. + + -- Gerrit Pape Sat, 26 Jun 2004 11:28:42 +0000 + +socklog (1.4.2-1) unstable; urgency=low + + * new upstream version. + * debian/diff/uncat.check.diff: remove; applied upstream. + * debian/rules: don't apply diff. + * debian/implicit: update to revision 1.7. + * debian/socklog-run.dirs, debian/socklog-run.links: remove; obsolete. + + -- Gerrit Pape Thu, 25 Mar 2004 09:36:27 +0000 + +socklog (1.4.1-2) unstable; urgency=low + + * debian/diff/uncat.check.diff: new; extend timeout while checking uncat + program (fixes build failure on hppa). + * debian/rules: apply diff. + + -- Gerrit Pape Sun, 29 Feb 2004 16:52:17 +0000 + +socklog (1.4.1-1) unstable; urgency=low + + * new upstream version. + + -- Gerrit Pape Sat, 28 Feb 2004 17:48:14 +0000 + +socklog (1.4.0-1) unstable; urgency=low + + * new upstream version. + * debian/rules: link statically against diet libc if $DEB_BUILD_OPTIONS + set 'diet'; minor. + * debian/implicit: update to revision 1.5. + + -- Gerrit Pape Sat, 28 Feb 2004 16:32:01 +0000 + +socklog (1.3.1-2) unstable; urgency=low + + * debian/etc/klog/run: linux kernels 2.6.x don't allow to read from the + filedescriptor as unprivileged user after opening /proc/kmsg as root, + and dropping permissions afterwards; therefore run the socklog program + in the socklog-klog service with root privileges under 2.6.x kernels + as a workaround. + + -- Gerrit Pape Sat, 24 Jan 2004 09:35:14 +0000 + +socklog (1.3.1-1) unstable; urgency=low + + * new upstream version. + + -- Gerrit Pape Mon, 19 Jan 2004 13:56:52 +0000 + +socklog (1.3.0-1) unstable; urgency=low + + * new upstream version. + * debian/control: no longer Build-Depends: debhelper; Standards-Version: + 3.6.1.0; update short description. + * debian/rules: stop using debhelper, use implicit rules; install html + documentation into /usr/share/doc/socklog/ (no subdirectory). + * debian/implicit: new; implicit Makefile rules. + * debian/socklog-run.postinst, debian/socklog-run.postrm, + debian/socklog-run.prerm: simplify; stop using debhelper. + * debian/README.Debian, debian/docs, debian/postinst, debian/postrm: rename + to debian/socklog.`basename`. + * debian/socklog.postinst, debian/socklog.postrm: simplify; stop using + debhelper. + * debian/socklog-run.conffiles: new. + * debian/dirs: remove; obsolete. + + -- Gerrit Pape Thu, 15 Jan 2004 15:42:50 +0000 + +socklog (1.2.0-3) unstable; urgency=low + + * debian/rules: target clean: remove all relevant *-stamp files. + * debian/etc/klog/log/run: use -tt switch to svlogd instead of -t to do + human readable UTC timestamps instead of TAI timestamps for kernel log. + * debian/control: package socklog: Recommends: runit (>> 0.11.2-0); + package socklog-run: Depends: runit (>> 0.11.2-0) (closes: #211371). + + -- Gerrit Pape Thu, 25 Sep 2003 11:35:55 +0000 + +socklog (1.2.0-2) unstable; urgency=low + + * debian/control: new package socklog-run: sets up system and kernel + log service; Provides: system-log-daemon, linux-kernel-log-daemon, + Conflicts: system-log-daemon, linux-kernel-log-daemon, Depends: socklog, + runit (>> 0.10.0-0), ipsvd. + * debian/control: package socklog: contains socklog programs only; no + longer Provides: system-log-daemon; Recommends: socklog-run, runit (>> + 0.10.0-0), ipsvd. + * debian/control: Standards-Version: 3.6.0; adapt descriptions. + * debian/rules: additionally build binary-indep package socklog-run. + * debian/README.Debian: adapt. + * debian/etc/*: new; socklog service directories. + * socklog-run.README.Debian, socklog-run.dirs, socklog-run.links, + socklog-run.postinst, socklog-run.postrm, socklog-run.prerm: new. + + -- Gerrit Pape Mon, 8 Sep 2003 17:06:42 +0200 + +socklog (1.2.0-1) unstable; urgency=low + + * new upstream version. + + -- Gerrit Pape Sat, 9 Aug 2003 18:20:13 +0200 + +socklog (1.1.1-1) unstable; urgency=low + + * new upstream version. + + -- Gerrit Pape Mon, 7 Jul 2003 09:57:40 +0200 + +socklog (1.1.0-1) unstable; urgency=low + + * new upstream version; cooperates with the runit package instead + of the daemontools package. + * first official debian package (closes: #196864). + * debian/control: Standards-Version: 3.5.10; Depends: runit (>> 0.10.0-0), + adduser; Recommends: ipsvd; Provides: system-log-daemon, + linux-kernel-log-daemon; adapt package description. + * debian/postinst: create system user ``log''; cleanup on upgrade. + * debian/preinst: remove, obsolete. + * debian/postrm: remove system user ``log'' on purge. + * debian/rules: install binaries in /usr/sbin, /usr/bin. + * debian/README.Debian: new. + + -- Gerrit Pape Thu, 26 Jun 2003 09:43:34 +0200 + +socklog (1.0.0-1) sarge; urgency=low + + * new upstream version, see /package/admin/socklog/package/CHANGES. + * debian/preinst: use getent to check if user log exists. + * debian/copyright: include upstream source url. + * debian/rules: use dh_strip; minor cleanup. + * debian/control: depends on runit | daemontools; minor change in + long description. + + -- Gerrit Pape Thu, 30 Jan 2003 13:33:15 +0100 + +socklog (0.10.1-1) sarge; urgency=low + + * /package/admin/socklog/package/CHANGES. + + -- Gerrit Pape Thu, 8 Aug 2002 23:01:03 +0200 + +socklog (0.10.0-1) woody; urgency=low + + * See /package/admin/socklog/package/CHANGES. + + -- Gerrit Pape Thu, 18 Jul 2002 15:59:23 +0200 + +socklog (0.9.1-1) woody; urgency=low + + * See /package/admin/socklog/package/CHANGES. + + -- Gerrit Pape Wed, 26 Jun 2002 15:54:52 +0200 + +socklog (0.9.0-1) woody; urgency=low + + * See /package/admin/socklog/package/CHANGES. + + -- Gerrit Pape Fri, 31 May 2002 14:33:48 +0200 + +socklog (0.8.2-1) woody; urgency=low + + * See /package/admin/socklog/package/CHANGES. + + -- Gerrit Pape Sat, 18 May 2002 15:03:23 +0200 + +socklog (0.8.1-1) woody; urgency=low + + * See /package/admin/socklog/package/CHANGES. + + -- Gerrit Pape Sun, 28 Apr 2002 10:41:34 +0200 + +socklog (0.8.0-1) woody; urgency=low + + * See /package/admin/socklog/package/CHANGES. + + -- Gerrit Pape Sat, 27 Apr 2002 10:29:15 +0200 + +socklog (0.7.0-1) woody; urgency=low + + * See /package/admin/socklog/package/CHANGES. + + -- Gerrit Pape Mon, 4 Feb 2002 11:37:13 +0100 + +socklog (0.6.1-2) woody; urgency=low + + * postinst: Use adduser ... --ingroup instead of --group which failed. + + -- Gerrit Pape Fri, 25 Jan 2002 12:04:10 +0100 + +socklog (0.6.1-1) woody; urgency=low + + * See /package/admin/socklog/package/CHANGES. + + -- Gerrit Pape Thu, 17 Jan 2002 11:43:36 +0100 + +socklog (0.6.0-1) woody; urgency=low + + * See /package/admin/socklog/package/CHANGES. + + -- Gerrit Pape Sat, 12 Jan 2002 14:18:57 +0100 + +socklog (0.5.4-1) woody; urgency=low + + * See /package/admin/socklog/package/CHANGES. + + -- Gerrit Pape Sun, 30 Dec 2001 19:18:29 +0100 + +socklog (0.5.1-1) woody; urgency=low + + * socklog: changed undocumented option -v to -V + * Makefile: does not require gnu make (thx Jordan Krushen) + * socklog-conf added + * run socklog with softlimit + * socklog-group mandatory, notify fifo mode 0620 + * admin/socklog/etc removed + * doc: adapted + * deb: create user log as member of group adm + * deb: /etc/socklog removed, debian/conffiles empty + * deb: /var/log/socklog* removed + * deb: reorganized debian/rules + * package socklog moved to smarden.org + + -- Gerrit Pape Tue, 20 Nov 2001 11:36:23 +0100 + +socklog (0.4.1-1) woody; urgency=low + + * uncat: continue; on error_again, fixes wrong timeouts + * uncat: more verbose on -v + * deb: moved to unofficial, fhs failures + * socklog-notify: use mailsubj + * doc: improved configuration.html + * doc: how to disable log event notifications + + -- Gerrit Pape Fri, 12 Oct 2001 11:08:56 +0200 + +socklog (0.4.0-1) woody; urgency=low + + * changed maintainer email address to + * BSD license + * minor documentation changes + + -- Gerrit Pape Fri, 21 Sep 2001 17:43:09 +0200 + +socklog (0.3.6-1) woody; urgency=low + + * new: tryto, uncat + * new: network logging concept + * new: log event notification + * deb: cleaner binary package (rm -rf (socklog/{compile,etc,doc,man}) + * documentation updated + + -- Gerrit Pape Mon, 17 Sep 2001 18:26:12 +0200 + +socklog (0.3.0-1) woody; urgency=low + + * installs into /package (see http://cr.yp.to/slashpackage.html) + * no code changes + + -- Gerrit Pape Tue, 14 Aug 2001 12:26:02 +0200 + +socklog (0.2.2) unstable; urgency=low + + * LDFLAGS for solaris in Makefile + * benefits.html added, describing logfile rotation based on file size + + -- Gerrit Pape Fri, 22 Jun 2001 11:59:10 +0200 + +socklog (0.2.1) unstable; urgency=low + + * support for solaris (thx Gary Gendel) + * deb: provides: system-log-daemon (thx ska) + + -- Gerrit Pape Tue, 19 Jun 2001 11:48:28 +0200 + +socklog (0.2.0) unstable; urgency=low + + * ucspi mode added + * use setgroups() before setgid() (thx ari) + * buffering output (thx ari) + * doc: Examples added (thx Eduardo Augusto Alvarenga, Paul Jarc) + * compiles on openbsd 2.9 (thx clemensF) + + -- Gerrit Pape Mon, 11 Jun 2001 13:31:42 +0200 + +socklog (0.1.2) unstable; urgency=low + + * documentation improved + + -- Gerrit Pape Fri, 1 Jun 2001 10:50:36 +0200 + +socklog (0.1.1) unstable; urgency=low + + * deb: provides log directories for default log/run files + * deb: add user 'log' in postinst + * documentation improved + + -- Gerrit Pape Tue, 29 May 2001 13:26:24 +0200 + +socklog (0.1.0) unstable; urgency=low + + * Initial Release + + -- Gerrit Pape Mon, 28 May 2001 11:39:36 +0200 + +Local variables: +mode: debian-changelog +End: --- socklog-2.1.0.orig/debian/control +++ socklog-2.1.0/debian/control @@ -0,0 +1,40 @@ +Source: socklog +Section: admin +Priority: optional +Maintainer: Gerrit Pape +Standards-Version: 3.7.3.0 +Homepage: http://smarden.org/socklog + +Package: socklog +Architecture: any +Depends: adduser, ${shlibs:Depends} +Recommends: socklog-run, runit, ipsvd +Description: system and kernel logging services (programs) + socklog cooperates with the runit package to create a small and secure + replacement for syslogd. socklog supports system logging through Unix + domain sockets (/dev/log), UDP sockets (0.0.0.0:514), as well as TCP + socket, with the help of runit's runsvdir, runsv, and svlogd. socklog + provides a different network logging concept, and also does log event + notification. svlogd has built in log file rotation based on file size, + so there is no need for any cron jobs to rotate the logs. socklog is + small, secure, and reliable. + . + This package contains the socklog programs. + +Package: socklog-run +Architecture: all +Depends: socklog, runit (>= 1.8.0-2) +Provides: system-log-daemon, linux-kernel-log-daemon +Conflicts: system-log-daemon, linux-kernel-log-daemon +Description: system and kernel logging services + socklog cooperates with the runit package to create a small and secure + replacement for syslogd. socklog supports system logging through Unix + domain sockets (/dev/log), UDP sockets (0.0.0.0:514), as well as TCP + socket, with the help of runit's runsvdir, runsv, and svlogd. socklog + provides a different network logging concept, and also does log event + notification. svlogd has built in log file rotation based on file size, + so there is no need for any cron jobs to rotate the logs. socklog is + small, secure, and reliable. + . + This package sets up the socklog-unix and socklog-klog services to + provide a system log service and kernel log service respectively. --- socklog-2.1.0.orig/debian/copyright +++ socklog-2.1.0/debian/copyright @@ -0,0 +1,30 @@ +This package was downloaded from http://smarden.org/socklog/install.html + +Upstream Author: Gerrit Pape + +Copyright: + +Copyright (c) 2001-2006, Gerrit Pape +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. The name of the author may not be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --- socklog-2.1.0.orig/debian/diff/socklog-conf-update-service.diff +++ socklog-2.1.0/debian/diff/socklog-conf-update-service.diff @@ -0,0 +1,83 @@ +diff -ur admin~/socklog-2.1.0/man/socklog-conf.8 admin/socklog-2.1.0/man/socklog-conf.8 +--- admin~/socklog-2.1.0/man/socklog-conf.8 2006-03-06 13:00:05.000000000 +0000 ++++ admin/socklog-2.1.0/man/socklog-conf.8 2008-02-14 00:11:50.000000000 +0000 +@@ -64,11 +64,11 @@ + process runs under the uid and gid of + .IR logacct . + .LP +-You can run the service under +-.BR runsvdir (8) +-by creating a symbolic link in the service directory: ++You can add the service to system-wide service supervision through the ++.BR update-service (8) ++program: + .LP +-ln \-s /etc/sv/socklog-unix /var/service/ ++update-service \--add /etc/sv/socklog-unix + .LP + .SH INET SERVICE + .B socklog-conf +@@ -103,11 +103,11 @@ + process runs under the uid and gid of + .IR logacct . + .LP +-You can run the service under +-.BR runsvdir (8) +-by creating a symbolic link in the service directory: ++You can add the service to system-wide service supervision through the ++.BR update-service (8) ++program: + .LP +-ln \-s /etc/sv/socklog-inet /var/service/ ++update-service \--add /etc/sv/socklog-inet + .LP + .SH KLOG SERVICE + .B socklog-conf +@@ -145,11 +145,11 @@ + process runs under the uid and gid of + .IR logacct . + .LP +-You can run the service under +-.BR runsvdir (8) +-by creating a symbolic link in the service directory: ++You can add the service to system-wide service supervision through the ++.BR update-service (8) ++program: + .LP +-ln \-s /etc/sv/socklog-klog /var/service/ ++update-service \--add /etc/sv/socklog-klog + .LP + .SH UCSPI-TCP SERVICE + .B socklog-conf +@@ -186,11 +186,11 @@ + process runs under the uid and gid of + .IR logacct . + .LP +-You can run the service under +-.BR runsvdir (8) +-by creating a symbolic link in the service directory: ++You can add the service to system-wide service supervision through the ++.BR update-service (8) ++program: + .LP +-ln \-s /etc/sv/socklog-ucspi-tcp /var/service/ ++update-service \--add /etc/sv/socklog-ucspi-tcp + .LP + .SH NOTIFY SERVICE + .B socklog-conf +@@ -222,11 +222,11 @@ + socklog-notify service must be member of the group + .IR grp . + .LP +-You can run the service under +-.BR runsvdir (8) +-by creating a symbolic link in the service directory: ++You can add the service to system-wide service supervision through the ++.BR update-service (8) ++program: + .LP +-ln \-s /etc/sv/socklog-notify /var/service/ ++update-service \--add /etc/sv/socklog-notify + .LP + .SH SEE ALSO + socklog(8), --- socklog-2.1.0.orig/debian/diff/tryto-n.diff +++ socklog-2.1.0/debian/diff/tryto-n.diff @@ -0,0 +1,21 @@ +diff -ur admin~/socklog-2.1.0/src/tryto.c admin/socklog-2.1.0/src/tryto.c +--- admin~/socklog-2.1.0/src/tryto.c 2006-03-06 13:00:06.000000000 +0000 ++++ admin/socklog-2.1.0/src/tryto.c 2006-12-05 08:51:51.115464544 +0000 +@@ -237,7 +237,7 @@ + } + break; + } +- if (rc == 0) break; ++ if (rc == 0) _exit(0); + if (verbose) strerr_warn2(WARNING, "child crashed.", 0); + if (lseek(0, 0, SEEK_SET) != 0) + if (verbose) strerr_warn2(WARNING, +@@ -246,7 +246,7 @@ + sleep(1); + } + +- if (processor && (rc != 0)) { ++ if (processor) { + for (;;) { + int r; + char *s; --- socklog-2.1.0.orig/debian/etc/inet/log/run +++ socklog-2.1.0/debian/etc/inet/log/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec chpst -ulog svlogd -t main/main --- socklog-2.1.0.orig/debian/etc/inet/run +++ socklog-2.1.0/debian/etc/inet/run @@ -0,0 +1,3 @@ +#!/bin/sh +exec 2>&1 +exec chpst -Unobody socklog inet 0 514 --- socklog-2.1.0.orig/debian/etc/klog/log/run +++ socklog-2.1.0/debian/etc/klog/log/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec chpst -ulog svlogd -tt main/main --- socklog-2.1.0.orig/debian/etc/klog/run +++ socklog-2.1.0/debian/etc/klog/run @@ -0,0 +1,6 @@ +#!/bin/sh +USER=nobody +exec &1 +test "`uname -r |cut -c1-4`" != '2.6.' || USER=root +exec chpst -u"$USER" socklog ucspi --- socklog-2.1.0.orig/debian/etc/notify/run +++ socklog-2.1.0/debian/etc/notify/run @@ -0,0 +1,9 @@ +#!/bin/sh -e +MAILTO=root +PIPE=/var/log/socklog/.notify + +if [ ! -p "$PIPE" ]; then mkfifo -m0620 "$PIPE"; chown log:adm "$PIPE"; fi +exec <> "$PIPE" +exec chpst -ulog uncat -s49999 -t180 \ + env MAILUSER=log MAILNAME='socklog notify' \ + mail -s socklog-notify $MAILTO --- socklog-2.1.0.orig/debian/etc/ucspi-tcp/log/run +++ socklog-2.1.0/debian/etc/ucspi-tcp/log/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec chpst -ulog svlogd -t main/main --- socklog-2.1.0.orig/debian/etc/ucspi-tcp/run +++ socklog-2.1.0/debian/etc/ucspi-tcp/run @@ -0,0 +1,4 @@ +#!/bin/sh +PORT=10116 +exec 2>&1 +exec tcpsvd -vllogserver -unobody 0 "$PORT" socklog ucspi TCPREMOTEIP --- socklog-2.1.0.orig/debian/etc/unix/check +++ socklog-2.1.0/debian/etc/unix/check @@ -0,0 +1,3 @@ +#!/bin/sh +exec 2>/dev/null +exec socklog-check unix /dev/log --- socklog-2.1.0.orig/debian/etc/unix/log/run +++ socklog-2.1.0/debian/etc/unix/log/run @@ -0,0 +1,4 @@ +#!/bin/sh +exec chpst -ulog svlogd \ + main/main main/auth main/cron main/daemon main/debug main/ftp \ + main/kern main/local main/mail main/news main/syslog main/user --- socklog-2.1.0.orig/debian/etc/unix/run +++ socklog-2.1.0/debian/etc/unix/run @@ -0,0 +1,3 @@ +#!/bin/sh +exec 2>&1 +exec chpst -Unobody socklog unix /dev/log --- socklog-2.1.0.orig/debian/implicit +++ socklog-2.1.0/debian/implicit @@ -0,0 +1,93 @@ +# $Id$ + +.PHONY: deb-checkdir deb-checkuid + +deb-checkdir: + @test -e debian/control || sh -cx '! : wrong directory' +deb-checkuid: + @test "`id -u`" -eq 0 || sh -cx '! : need root privileges' + +%.deb: %.deb-docs %.deb-DEBIAN + @rm -f $*.deb $*.deb-checkdir $*.deb-docs $*.deb-docs-base \ + $*.deb-docs-docs $*.deb-docs-examples $*.deb-DEBIAN \ + $*.deb-DEBIAN-dir $*.deb-DEBIAN-scripts $*.deb-DEBIAN-md5sums + +%.udeb: %.deb-DEBIAN + @rm -f $*.deb $*.deb-checkdir $*.deb-DEBIAN $*.deb-DEBIAN-dir \ + $*.deb-DEBIAN-scripts $*.deb-DEBIAN-md5sums + +%.deb-checkdir: + @test -d debian/$* || sh -cx '! : directory debian/$* missing' + @test "`id -u`" -eq 0 || sh -cx '! : need root privileges' + +%.deb-docs-base: + : implicit + @rm -f debian/$*/usr/share/doc/$*/* || : + @install -d -m0755 debian/$*/usr/share/doc/$* + : debian/$*/usr/share/doc/$*/ + @sh -cx 'install -m0644 debian/copyright debian/$*/usr/share/doc/$*/' + @sh -cx 'install -m0644 debian/changelog \ + debian/$*/usr/share/doc/$*/changelog.Debian' + @test ! -r changelog || \ + sh -cx 'install -m0644 changelog debian/$*/usr/share/doc/$*/' + @test -r debian/$*/usr/share/doc/$*/changelog || \ + sh -cx 'mv debian/$*/usr/share/doc/$*/changelog.Debian \ + debian/$*/usr/share/doc/$*/changelog' + @test -s debian/$*/usr/share/doc/$*/changelog || \ + sh -cx 'rm -f debian/$*/usr/share/doc/$*/changelog' + @gzip -9n debian/$*/usr/share/doc/$*/changelog* +%.deb-docs-docs: + @for i in `cat debian/$*.docs 2>/dev/null || :`; do \ + if test -d $$i; then \ + sh -cx "install -d -m0755 debian/$*/usr/share/doc/$*/$${i##*/}" && \ + for j in $$i/*; do \ + sh -cx "install -m0644 $$j \ + debian/$*/usr/share/doc/$*/$${i##*/}/" || exit 1; \ + done || exit 1; \ + continue; \ + fi; \ + sh -cx "install -m0644 $$i debian/$*/usr/share/doc/$*/" || exit 1; \ + done + @test ! -r debian/$*.README.Debian || \ + sh -cx 'install -m0644 debian/$*.README.Debian \ + debian/$*/usr/share/doc/$*/README.Debian' + @if test -r debian/$*.NEWS.Debian; then \ + sh -cx 'install -m0644 debian/$*.NEWS.Debian \ + debian/$*/usr/share/doc/$*/NEWS.Debian && \ + gzip -9n debian/$*/usr/share/doc/$*/NEWS.Debian'; \ + fi +%.deb-docs-examples: + @rm -rf debian/$*/usr/share/doc/$*/examples + : debian/$*/usr/share/doc/$*/examples/ + @test ! -r debian/$*.examples || \ + install -d -m0755 debian/$*/usr/share/doc/$*/examples + @for i in `cat debian/$*.examples 2>/dev/null || :`; do \ + sh -cx "install -m0644 $$i debian/$*/usr/share/doc/$*/examples/" \ + || exit 1; \ + done +%.deb-docs: %.deb-checkdir %.deb-docs-base %.deb-docs-docs %.deb-docs-examples + : debian/$*/usr/share/doc/$*/ ok + +%.deb-DEBIAN-base: + @rm -rf debian/$*/DEBIAN + : debian/$*/DEBIAN/ + @install -d -m0755 debian/$*/DEBIAN + @for i in conffiles shlibs templates; do \ + test ! -r debian/$*.$$i || \ + sh -cx "install -m0644 debian/$*.$$i debian/$*/DEBIAN/$$i" \ + || exit 1; \ + done +%.deb-DEBIAN-scripts: + @for i in preinst prerm postinst postrm config; do \ + test ! -r debian/$*.$$i || \ + sh -cx "install -m0755 debian/$*.$$i debian/$*/DEBIAN/$$i" \ + || exit 1; \ + done +%.deb-DEBIAN-md5sums: + : debian/$*/DEBIAN/md5sums + @rm -f debian/$*/DEBIAN/md5sums + @cd debian/$* && find * -path 'DEBIAN' -prune -o \ + -type f -exec md5sum {} \; | LC_ALL=C sort >>DEBIAN/md5sums +%.deb-DEBIAN: %.deb-checkdir %.deb-DEBIAN-base %.deb-DEBIAN-scripts \ + %.deb-DEBIAN-md5sums + : debian/$*/DEBIAN/ ok --- socklog-2.1.0.orig/debian/rules +++ socklog-2.1.0/debian/rules @@ -0,0 +1,105 @@ +#!/usr/bin/make -f + +STRIP =strip +ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + STRIP =: nostrip +endif + +CFLAGS =-g -O2 -Wall +LDFLAGS = +CC =gcc +ifneq (,$(findstring diet,$(DEB_BUILD_OPTIONS))) + CC =diet -v -Os gcc + CFLAGS =-Wall +endif + +DIR =$(shell pwd)/debian/socklog + +build: deb-checkdir build-arch-stamp build-indep-stamp + +build-arch: deb-checkdir build-arch-stamp +build-arch-stamp: + rm -rf admin + tar xzf socklog-2.1.0.tar.gz + patch -p0 admin/socklog/src/conf-cc + echo '$(CC) $(LDFLAGS)' >admin/socklog/src/conf-ld + $(MAKE) -Cadmin/socklog/src + $(MAKE) -Cadmin/socklog/src check + touch build-arch-stamp + +build-indep: deb-checkdir build-indep-stamp +build-indep-stamp: + touch build-indep-stamp + +clean: deb-checkdir deb-checkuid + rm -rf admin + rm -rf '$(DIR)' '$(DIR)'-run + rm -f build-arch-stamp build-indep-stamp + rm -f debian/files debian/substvars changelog + +install: install-arch install-indep + +install-arch: deb-checkdir deb-checkuid build-arch-stamp + rm -rf '$(DIR)' + install -d -m0755 '$(DIR)'/usr/sbin + install -d -m0755 '$(DIR)'/usr/bin + for i in socklog socklog-conf; do \ + install -m0755 admin/socklog/src/$$i '$(DIR)'/usr/sbin/ || exit 1; \ + done + $(STRIP) -R .comment -R .note '$(DIR)'/usr/sbin/* + for i in socklog-check tryto uncat; do \ + install -m0755 admin/socklog/src/$$i '$(DIR)'/usr/bin/ || exit 1; \ + done + $(STRIP) -R .comment -R .note '$(DIR)'/usr/bin/* + # man pages + install -d -m0755 '$(DIR)'/usr/share/man/man1 + install -d -m0755 '$(DIR)'/usr/share/man/man8 + install -m0644 admin/socklog/man/*.1 '$(DIR)'/usr/share/man/man1/ + gzip -9n '$(DIR)'/usr/share/man/man1/*.1 + install -m0644 admin/socklog/man/*.8 '$(DIR)'/usr/share/man/man8/ + gzip -9n '$(DIR)'/usr/share/man/man8/*.8 + # changelog + test -r changelog || ln -s admin/socklog/package/CHANGES changelog + +install-indep: deb-checkdir deb-checkuid build-indep-stamp + rm -rf '$(DIR)'-run + for i in unix klog inet ucspi-tcp; do \ + install -d -m0755 '$(DIR)'-run/etc/sv/socklog-$$i/log && \ + install -m0755 debian/etc/$$i/run \ + '$(DIR)'-run/etc/sv/socklog-$$i/run && \ + install -m0755 debian/etc/$$i/log/run \ + '$(DIR)'-run/etc/sv/socklog-$$i/log/run || exit 1; \ + done + install -m0755 debian/etc/unix/check \ + '$(DIR)'-run/etc/sv/socklog-unix/check + install -d -m0755 '$(DIR)'-run/etc/sv/socklog-notify + install -m0755 debian/etc/notify/run \ + '$(DIR)'-run/etc/sv/socklog-notify/run + for i in klog inet ucspi-tcp; do \ + ln -s /var/log/socklog-$$i '$(DIR)'-run/etc/sv/socklog-$$i/log/main \ + || exit 1; \ + done + ln -s /var/log/socklog '$(DIR)'-run/etc/sv/socklog-unix/log/main + # changelog + test -r changelog || ln -s admin/socklog/package/CHANGES changelog + +binary-arch: deb-checkdir deb-checkuid install-arch socklog.deb + test '$(CC)' != 'gcc' || \ + dpkg-shlibdeps '$(DIR)'/usr/bin/* '$(DIR)'/usr/sbin/* + dpkg-gencontrol -isp -psocklog -P'$(DIR)' + dpkg -b '$(DIR)' .. + +binary-indep: deb-checkdir deb-checkuid install-indep socklog-run.deb + dpkg-gencontrol -isp -psocklog-run -P'$(DIR)'-run + dpkg -b '$(DIR)'-run .. + +binary: binary-indep binary-arch + +.PHONY: build binary-arch build-indep clean install install-arch \ + install-indep binary-arch binary-indep binary + +include debian/implicit --- socklog-2.1.0.orig/debian/socklog-run.README.Debian +++ socklog-2.1.0/debian/socklog-run.README.Debian @@ -0,0 +1,21 @@ +socklog-run for Debian +---------------------- + +This package sets up the socklog-unix and socklog-klog service to provide a +system log service and a kernel log service respectively. + +The socklog service directories are located in /etc/sv/. This also includes +service directories for the not automatically enabled socklog-inet, +socklog-notify, and socklog-ucspi-tcp services. + +The socklog-run package provides the virtual packages ``system-log-daemon'' +and ``linux-kernel-log-daemon'', and conflicts with other packages providing +at least one of these virtual packages. This ensures that socklog is the +only package installed on the system, that processes system and kernel log +messages. + +The socklog package without the socklog-run package can be installed +alongside other system- or kernel-log-daemons, e.g. to make use of the +socklog programs from the command line only. + + -- Gerrit Pape , Mon, 08 Sep 2003 16:24:14 +0200 --- socklog-2.1.0.orig/debian/socklog-run.conffiles +++ socklog-2.1.0/debian/socklog-run.conffiles @@ -0,0 +1,10 @@ +/etc/sv/socklog-unix/log/run +/etc/sv/socklog-unix/check +/etc/sv/socklog-unix/run +/etc/sv/socklog-klog/log/run +/etc/sv/socklog-klog/run +/etc/sv/socklog-inet/log/run +/etc/sv/socklog-inet/run +/etc/sv/socklog-ucspi-tcp/log/run +/etc/sv/socklog-ucspi-tcp/run +/etc/sv/socklog-notify/run --- socklog-2.1.0.orig/debian/socklog-run.postinst +++ socklog-2.1.0/debian/socklog-run.postinst @@ -0,0 +1,60 @@ +#!/bin/sh +set -e + +test "$1" = 'configure' || exit 0 + +# create log directories that don't exist +TEMP=`mktemp -d` +trap '! test -e "$TEMP" || rm -rf "$TEMP"' EXIT + +if ! test -d /var/log/socklog; then + socklog-conf unix nobody log "$TEMP" && \ + chown -R log:adm /var/log/socklog && \ + chmod 2750 /var/log/socklog /var/log/socklog/* || exit 1 +fi +for i in klog inet ucspi-tcp; do + if ! test -d /var/log/socklog-$i; then + socklog-conf $i nobody log "$TEMP" && \ + chown -R log:adm /var/log/socklog-$i && \ + chmod 2750 /var/log/socklog-$i /var/log/socklog-$i/* || exit 1 + fi +done + +mv_conffile() { + test -e "$1" || return 0 + echo "Preserving user changes to $2..." + mv -f "$2" "$2".dpkg-new + mv -f "$1" "$2" +} + +test -z "$2" || dpkg --compare-versions "$2" gt '2.1.0-0' || { + for i in unix/log/run unix/check unix/run klog/log/run klog/run \ + inet/log/run inet/run ucspi-tcp/log/run ucspi-tcp/run notify/run; do + mv_conffile /etc/socklog/$i /etc/sv/socklog-$i + done + for i in unix klog inet ucspi-tcp notify; do + test -h /var/service/socklog-$i || continue + test "`readlink /var/service/socklog-$i`" = "/etc/socklog/$i" || continue + rm -f /var/service/socklog-$i && + ln -s /etc/sv/socklog-$i /var/service/ || exit 1 + done +} + +test -z "$2" || dpkg --compare-versions "$2" gt '2.1.0-7' || { + for i in unix klog; do + update-service --remove /etc/sv/socklog-$i || : + done + for i in inet ucspi-tcp; do + update-service --check socklog-$i || continue + ln -s /var/run/sv.socklog-$i /etc/sv/socklog-$i/supervise + ln -s /var/run/sv.socklog-$i.log /etc/sv/socklog-$i/log/supervise + done + ! update-service --check socklog-notify || + ln -s /var/run/sv.socklog-notify /etc/sv/socklog-notify/supervise + sleep 6 +} + +# enable system- and kernel-log-service +for i in unix klog; do + update-service --add /etc/sv/socklog-$i +done --- socklog-2.1.0.orig/debian/socklog-run.postrm +++ socklog-2.1.0/debian/socklog-run.postrm @@ -0,0 +1,12 @@ +#!/bin/sh +set -e + +test "$1" = 'purge' || exit 0 + +sv force-stop /etc/sv/socklog-unix /etc/sv/socklog-klog \ + /etc/sv/socklog-inet /etc/sv/socklog-ucspi-tcp \ + /etc/sv/socklog-notify 2>/dev/null || : +for i in unix klog inet ucspi-tcp notify; do + rm -rf /etc/sv/socklog-$i/supervise /etc/sv/socklog-$i/log/supervise + rm -rf /var/run/sv.socklog-$i /var/run/sv.socklog-$i.log +done --- socklog-2.1.0.orig/debian/socklog-run.preinst +++ socklog-2.1.0/debian/socklog-run.preinst @@ -0,0 +1,23 @@ +#!/bin/sh +set -e + +test "$1" = 'install' || test "$1" = 'upgrade' || exit 0 +dpkg --compare-versions "$2" lt '2.1.0-0' || exit 0 + +check_conffile() { + test -e "$1" || return 0 + md5=`md5sum <"$1"` + md5=${md5%% *} + md5orig=`grep " $1 " /dev/null || : +done --- socklog-2.1.0.orig/debian/socklog.README.Debian +++ socklog-2.1.0/debian/socklog.README.Debian @@ -0,0 +1,14 @@ +socklog for Debian +------------------ + +The programs are installed in /usr/sbin/ and /usr/bin/. To have socklog +provide the default system log service and kernel log service on your +system, additionally install the socklog-run package. As an alternative +you can make sure that the runit package is installed and service +supervision is enabled, and follow the documentation[0]. This package +already created the system user ``log'' for you. + +[0] /usr/share/doc/socklog/configuration.html + http://smarden.org/socklog/configuration.html + + -- Gerrit Pape , Mon, 08 Sep 2003 16:24:14 +0200 --- socklog-2.1.0.orig/debian/socklog.docs +++ socklog-2.1.0/debian/socklog.docs @@ -0,0 +1,3 @@ +admin/socklog/package/README +admin/socklog/doc/*.html +debian/README.Debian.diet --- socklog-2.1.0.orig/debian/socklog.postinst +++ socklog-2.1.0/debian/socklog.postinst @@ -0,0 +1,7 @@ +#!/bin/sh +set -e + +test "$1" = 'configure' || exit 0 + +getent passwd log >/dev/null || \ + adduser --system --home /nonexistent --no-create-home log --- socklog-2.1.0.orig/debian/socklog.postrm +++ socklog-2.1.0/debian/socklog.postrm @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +test "$1" = 'purge' || exit 0 + +getent passwd log >/dev/null || exit 0 +! deluser --version >/dev/null 2>&1 || exec deluser log +echo 'deluser program not available, not removing system user "log".' >&2