diff -Nru rsyslog-4.6.4/debian/50-default.conf rsyslog-4.6.4/debian/50-default.conf --- rsyslog-4.6.4/debian/50-default.conf 1970-01-01 01:00:00.000000000 +0100 +++ rsyslog-4.6.4/debian/50-default.conf 2010-11-14 17:55:45.000000000 +0100 @@ -0,0 +1,68 @@ +# Default rules for rsyslog. +# +# For more information see rsyslog.conf(5) and /etc/rsyslog.conf + +# +# First some standard log files. Log by facility. +# +auth,authpriv.* /var/log/auth.log +*.*;auth,authpriv.none -/var/log/syslog +#cron.* /var/log/cron.log +daemon.* -/var/log/daemon.log +kern.* -/var/log/kern.log +lpr.* -/var/log/lpr.log +mail.* -/var/log/mail.log +user.* -/var/log/user.log + +# +# Logging for the mail system. Split it up so that +# it is easy to write scripts to parse these files. +# +mail.info -/var/log/mail.info +mail.warn -/var/log/mail.warn +mail.err /var/log/mail.err + +# +# Logging for INN news system. +# +news.crit /var/log/news/news.crit +news.err /var/log/news/news.err +news.notice -/var/log/news/news.notice + +# +# Some "catch-all" log files. +# +*.=debug;\ + auth,authpriv.none;\ + news.none;mail.none -/var/log/debug +*.=info;*.=notice;*.=warn;\ + auth,authpriv.none;\ + cron,daemon.none;\ + mail,news.none -/var/log/messages + +# +# Emergencies are sent to everybody logged in. +# +*.emerg * + +# +# I like to have messages displayed on the console, but only on a virtual +# console I usually leave idle. +# +#daemon,mail.*;\ +# news.=crit;news.=err;news.=notice;\ +# *.=debug;*.=info;\ +# *.=notice;*.=warn /dev/tty8 + +# The named pipe /dev/xconsole is for the `xconsole' utility. To use it, +# you must invoke `xconsole' with the `-file' option: +# +# $ xconsole -file /dev/xconsole [...] +# +# NOTE: adjust the list below, or you'll go crazy if you have a reasonably +# busy site.. +# +daemon.*;mail.*;\ + news.err;\ + *.=debug;*.=info;\ + *.=notice;*.=warn |/dev/xconsole diff -Nru rsyslog-4.6.4/debian/changelog rsyslog-4.6.4/debian/changelog --- rsyslog-4.6.4/debian/changelog 2010-08-05 18:35:55.000000000 +0200 +++ rsyslog-4.6.4/debian/changelog 2010-11-15 20:31:50.000000000 +0100 @@ -1,3 +1,38 @@ +rsyslog (4.6.4-1ubuntu1) natty; urgency=low + + * Merge from debian unstable (LP: #671533), remaining changes: + - Run as rsyslog:rsyslog + - Fix log file ownership issues when HUPing an unprivileged rsyslog + LP: #407862: debian/rsyslog.conf: Set $FileOwner to syslog + - Replace init script with multiple Upstart jobs. + - debian/control: Bump build-dependency on debhelper for Upstart-aware + dh_installinit + - Upstart fixups; LP: #430220: + + debian/rsyslog.logrotate: Use start command to restart rsyslog + + debian/rsyslog.rsyslog-kmsg.upstart: Restore bs=1 parameter to dd + + debian/rsyslog.upstart: Move kmsg fifo creation/deletion to kmsg + upstart script. + - debian/rsyslog.conf: enable $RepeatedMsgReduction + to avoid bloating the syslog file (LP: #453444) + - debian/rsyslog.rsyslog-kmsg.upstart: Drop this additional job; kernel + changes have meant that rsyslog may read from /proc/kmsg directly + after dropping privileges. LP: #517773 + - debian/rules: call dh_installinit + - debian/50-default.conf: set of default rules for syslog (forwarded to + Debian as bug #603160) + * Dropped changes: + - debian/patches/deroot.patch: this patch was introduced to support + earlier kernels and we don't support running natty on pre-karmic + kernels + - sysklogd → rsyslog upgrade was done pre-lucid (LTS) so drop all + the upgrade handling + - Restore to reading from /proc/kmsg: rsyslog can read directly from + /proc/kmsg now; dropped init script changes as they're obsolete + (even when actually using the init script which we don't, we have + the upstart script) + + -- Lorenzo De Liso Fri, 05 Nov 2010 15:52:21 +0100 + rsyslog (4.6.4-1) unstable; urgency=low * New upstream release. @@ -110,6 +145,100 @@ -- Michael Biebl Fri, 21 Aug 2009 23:08:45 +0200 +rsyslog (4.2.0-2ubuntu8) lucid; urgency=low + + * debian/patches/deroot.patch: + - After opening /proc/kmsg, set the effective user to an unprivileged + one and attempt a zero-byte read from the file. If this succeeds, we + know that this will work de-rooted; if this fails, we don't enable + kernel-message logging. LP: #523610. + + -- Scott James Remnant Wed, 24 Feb 2010 18:21:54 +0000 + +rsyslog (4.2.0-2ubuntu7) lucid; urgency=low + + * debian/rules: + - Forgot to commit this change as part of previous upload to not + call dh_installinit + + -- Scott James Remnant Wed, 17 Feb 2010 13:03:31 +0000 + +rsyslog (4.2.0-2ubuntu6) lucid; urgency=low + + * debian/rsyslog.rsyslog-kmsg.upstart: + - Drop this additional job; kernel changes have meant that rsyslog + may read from /proc/kmsg directly after dropping privileges. + LP: #517773 + * debian/rsyslog.preinst: + - Remove on upgrade + * debian/rsyslog.conf: + - Restore to reading from /proc/kmsg + + -- Scott James Remnant Wed, 17 Feb 2010 12:23:01 +0000 + +rsyslog (4.2.0-2ubuntu5.1) karmic-proposed; urgency=low + + * debian/rsyslog.conf: + - enable $RepeatedMsgReduction to avoid bloating the syslog + file (LP: #453444) + + -- Michael Vogt Fri, 23 Oct 2009 17:28:10 +0200 + +rsyslog (4.2.0-2ubuntu5) karmic; urgency=low + + Upstart fixups; LP: #430220 + * debian/rsyslog.logrotate: Use start command to restart rsyslog + * debian/rsyslog.rsyslog-kmsg.upstart: Restore bs=1 parameter to dd + * debian/rsyslog.upstart: Move kmsg fifo creation/deletion to kmsg + upstart script. + + -- Michael Terry Tue, 22 Sep 2009 16:10:24 -0700 + +rsyslog (4.2.0-2ubuntu4) karmic; urgency=low + + * debian/rsyslog.postrm: Don't delete syslog user + * debian/rsyslog.postinst: Stop sysklogd from deleting the syslog user + when removed. LP: #401056 + + -- Michael Terry Mon, 21 Sep 2009 15:38:13 -0700 + +rsyslog (4.2.0-2ubuntu3) karmic; urgency=low + + FFE LP: #427356. + + * Replace init script with multiple Upstart jobs. + * debian/control: + - Bump build-dependency on debhelper for Upstart-aware dh_installinit + + -- Scott James Remnant Tue, 15 Sep 2009 03:26:43 +0100 + +rsyslog (4.2.0-2ubuntu2) karmic; urgency=low + + * Fix log file ownership issues when HUPing an unprivileged rsyslog + LP: #407862 + - debian/rsyslog.conf: Set $FileOwner to syslog + - debian/patches/deroot.patch: Always chown output files, since we may + not be able to read them on a HUP otherwise. + + -- Michael Terry Mon, 31 Aug 2009 14:58:50 -0400 + +rsyslog (4.2.0-2ubuntu1) karmic; urgency=low + + [ Michael Terry ] + * Merge from debian unstable (LP: #413023), remaining changes: + - Run as rsyslog:rsyslog + - Allow reading /proc/kmsg when non-root + - Cleanly upgrade from sysklogd + * debian/patches/deroot.patch: Don't allow using the klogctl function to + read klog messages. Rather, allow /proc/kmsg or nothing, since we have + special support for reading /proc/kmsg while unprivileged. + + [ Neil Wilson ] + * debian/rsyslog.init: Set blocksize for dd (LP: #407862) and restore + reload init argument to original lightweight reload + + -- Michael Terry Thu, 13 Aug 2009 15:43:29 -0400 + rsyslog (4.2.0-2) unstable; urgency=low * debian/rsyslog.logcheck.ignore.server @@ -125,6 +254,40 @@ -- Michael Biebl Wed, 05 Aug 2009 01:12:09 +0200 +rsyslog (4.2.0-1ubuntu2) karmic; urgency=low + + * Prefix Vcs-* fields with "XSBC-Original-" as we don't use git for the + Ubuntu packages. + * Strip local from rsyslog's postinst as it shouldn't be used outside of + functions; LP: #401060. + + -- Loïc Minier Mon, 20 Jul 2009 14:30:14 +0200 + +rsyslog (4.2.0-1ubuntu1) karmic; urgency=low + + * Run as rsyslog:rsyslog (LP: #250827, LP: #388608) + - debian/control: Depend on adduser + - debian/rsyslog.postinst: Create syslog user + - debian/rsyslog.postrm: Delete syslog user on purge + - debian/rsyslog.conf: Use DropPriv config fields + * Allow reading /proc/kmsg when non-root + - debian/rsyslog.init: Spawn a dd instance that shovels the /proc/kmsg + data to a pipe that rsyslog can read (based on Martin Pitt's similar + change to sysklogd). + - debian/patches/deroot.patch: Support a KLogPath config field + to change where the klog plugin looks and only start input modules + after we drop privileges, as reading when root interferes with + future reads as syslog. + - debian/rsyslog.conf: Use KLogPath field to point to dd pipe + * Cleanly upgrade from sysklogd + - debian/default.conf, debian/rsyslog.conf: + Break out the default rules into their own config file + - debian/rsyslog.install: Install it in /usr/share/rsyslog + - debian/rsyslog.postinst: If present, copy /etc/syslog.conf into + /etc/rsyslog.d/default.conf. Then merge our own default.conf + + -- Michael Terry Mon, 29 Jun 2009 08:37:43 -0400 + rsyslog (4.2.0-1) unstable; urgency=low * New upstream release of the now stable v4 branch. diff -Nru rsyslog-4.6.4/debian/control rsyslog-4.6.4/debian/control --- rsyslog-4.6.4/debian/control 2010-08-05 18:35:55.000000000 +0200 +++ rsyslog-4.6.4/debian/control 2010-11-14 17:55:45.000000000 +0100 @@ -1,11 +1,12 @@ Source: rsyslog Section: admin Priority: important -Maintainer: Michael Biebl -Build-Depends: debhelper (>= 7.0.50), autotools-dev (>= 20100122.1), zlib1g-dev, libmysqlclient-dev, libpq-dev, libkrb5-dev, libgnutls-dev, librelp-dev, pkg-config +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Michael Biebl +Build-Depends: debhelper (>= 7.3.15ubuntu2), autotools-dev (>= 20100122.1), zlib1g-dev, libmysqlclient-dev, libpq-dev, libkrb5-dev, libgnutls-dev, librelp-dev, pkg-config Standards-Version: 3.9.1 -Vcs-Git: git://git.debian.org/git/collab-maint/rsyslog.git -Vcs-Browser: http://git.debian.org/?p=collab-maint/rsyslog.git;a=summary +XSBC-Original-Vcs-Git: git://git.debian.org/git/collab-maint/rsyslog.git +XSBC-Original-Vcs-Browser: http://git.debian.org/?p=collab-maint/rsyslog.git;a=summary Homepage: http://www.rsyslog.com/ Package: rsyslog @@ -13,7 +14,7 @@ Priority: important Conflicts: system-log-daemon, linux-kernel-log-daemon Provides: system-log-daemon, linux-kernel-log-daemon -Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base (>= 3.2-14) +Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base (>= 3.2-14), adduser, ucf (>= 0.8) Recommends: logrotate Suggests: rsyslog-mysql | rsyslog-pgsql, rsyslog-doc, rsyslog-gnutls, rsyslog-gssapi, rsyslog-relp Description: enhanced multi-threaded syslogd diff -Nru rsyslog-4.6.4/debian/rsyslog.conf rsyslog-4.6.4/debian/rsyslog.conf --- rsyslog-4.6.4/debian/rsyslog.conf 2010-08-05 18:35:55.000000000 +0200 +++ rsyslog-4.6.4/debian/rsyslog.conf 2010-11-14 17:55:45.000000000 +0100 @@ -31,86 +31,22 @@ # $ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat +# Filter duplicated messages +$RepeatedMsgReduction on + # # Set the default permissions for all log files. # -$FileOwner root +$FileOwner syslog $FileGroup adm $FileCreateMode 0640 $DirCreateMode 0755 $Umask 0022 +$PrivDropToUser syslog +$PrivDropToGroup syslog # # Include all config files in /etc/rsyslog.d/ # $IncludeConfig /etc/rsyslog.d/*.conf - -############### -#### RULES #### -############### - -# -# First some standard log files. Log by facility. -# -auth,authpriv.* /var/log/auth.log -*.*;auth,authpriv.none -/var/log/syslog -#cron.* /var/log/cron.log -daemon.* -/var/log/daemon.log -kern.* -/var/log/kern.log -lpr.* -/var/log/lpr.log -mail.* -/var/log/mail.log -user.* -/var/log/user.log - -# -# Logging for the mail system. Split it up so that -# it is easy to write scripts to parse these files. -# -mail.info -/var/log/mail.info -mail.warn -/var/log/mail.warn -mail.err /var/log/mail.err - -# -# Logging for INN news system. -# -news.crit /var/log/news/news.crit -news.err /var/log/news/news.err -news.notice -/var/log/news/news.notice - -# -# Some "catch-all" log files. -# -*.=debug;\ - auth,authpriv.none;\ - news.none;mail.none -/var/log/debug -*.=info;*.=notice;*.=warn;\ - auth,authpriv.none;\ - cron,daemon.none;\ - mail,news.none -/var/log/messages - -# -# Emergencies are sent to everybody logged in. -# -*.emerg * - -# -# I like to have messages displayed on the console, but only on a virtual -# console I usually leave idle. -# -#daemon,mail.*;\ -# news.=crit;news.=err;news.=notice;\ -# *.=debug;*.=info;\ -# *.=notice;*.=warn /dev/tty8 - -# The named pipe /dev/xconsole is for the `xconsole' utility. To use it, -# you must invoke `xconsole' with the `-file' option: -# -# $ xconsole -file /dev/xconsole [...] -# -# NOTE: adjust the list below, or you'll go crazy if you have a reasonably -# busy site.. -# -daemon.*;mail.*;\ - news.err;\ - *.=debug;*.=info;\ - *.=notice;*.=warn |/dev/xconsole diff -Nru rsyslog-4.6.4/debian/rsyslog.dmesg.upstart rsyslog-4.6.4/debian/rsyslog.dmesg.upstart --- rsyslog-4.6.4/debian/rsyslog.dmesg.upstart 1970-01-01 01:00:00.000000000 +0100 +++ rsyslog-4.6.4/debian/rsyslog.dmesg.upstart 2010-11-14 17:55:45.000000000 +0100 @@ -0,0 +1,14 @@ +# dmesg - save kernel messages +# +# This task saves the initial kernel message log. + +description "save kernel messages" + +start on runlevel [2345] + +task +script + savelog -q -p -c 5 /var/log/dmesg + dmesg -s 524288 > /var/log/dmesg + chgrp adm /var/log/dmesg +end script diff -Nru rsyslog-4.6.4/debian/rsyslog.install rsyslog-4.6.4/debian/rsyslog.install --- rsyslog-4.6.4/debian/rsyslog.install 2010-08-05 18:35:55.000000000 +0200 +++ rsyslog-4.6.4/debian/rsyslog.install 2010-11-14 17:55:45.000000000 +0100 @@ -1,4 +1,5 @@ debian/rsyslog.conf /etc/ +debian/50-default.conf /usr/share/rsyslog debian/tmp/usr/sbin/ debian/tmp/usr/share/man/ debian/tmp/usr/lib/rsyslog/imfile.so diff -Nru rsyslog-4.6.4/debian/rsyslog.logrotate rsyslog-4.6.4/debian/rsyslog.logrotate --- rsyslog-4.6.4/debian/rsyslog.logrotate 2010-08-05 18:35:55.000000000 +0200 +++ rsyslog-4.6.4/debian/rsyslog.logrotate 2010-11-14 17:55:45.000000000 +0100 @@ -7,7 +7,7 @@ delaycompress compress postrotate - invoke-rc.d rsyslog reload > /dev/null + reload rsyslog >/dev/null 2>&1 || true endscript } @@ -32,6 +32,6 @@ delaycompress sharedscripts postrotate - invoke-rc.d rsyslog reload > /dev/null + reload rsyslog >/dev/null 2>&1 || true endscript } diff -Nru rsyslog-4.6.4/debian/rsyslog.upstart rsyslog-4.6.4/debian/rsyslog.upstart --- rsyslog-4.6.4/debian/rsyslog.upstart 1970-01-01 01:00:00.000000000 +0100 +++ rsyslog-4.6.4/debian/rsyslog.upstart 2010-11-14 17:56:39.000000000 +0100 @@ -0,0 +1,14 @@ +# rsyslog - system logging daemon +# +# rsyslog is an enhanced multi-threaded replacement for the traditional +# syslog daemon, logging messages from applications + +description "system logging daemon" + +start on filesystem +stop on runlevel [06] + +expect fork +respawn + +exec rsyslogd -c4 diff -Nru rsyslog-4.6.4/debian/rules rsyslog-4.6.4/debian/rules --- rsyslog-4.6.4/debian/rules 2010-08-05 18:35:55.000000000 +0200 +++ rsyslog-4.6.4/debian/rules 2010-11-14 17:56:50.000000000 +0100 @@ -24,3 +24,4 @@ override_dh_installinit: dh_installinit -R -- start 10 2 3 4 5 . start 30 0 6 . stop 90 1 . + dh_installinit --upstart-only --name=dmesg --no-start