diff options
46 files changed, 2486 insertions, 0 deletions
diff --git a/debian/NEWS b/debian/NEWS new file mode 100644 index 0000000..35058fa --- /dev/null +++ b/debian/NEWS @@ -0,0 +1,17 @@ +rsyslog (5.8.1-1) unstable; urgency=low + + The way rsyslog processes SIGHUP has changed. It no longer does a reload + of its configuration, but simply closes all open files, which is a much more + lightweight operation. + To apply a changed configuration, rsyslogd needs to be restarted now. + As a consequence, the reload action has been dropped from the init script. + + A new action called "rotate" was added to the init script, which signals + rsyslogd to close all open files. This new action is used in the rsyslog + logrotate configuration file. + + For more information, see: + http://www.rsyslog.com/doc/v4compatibility.html + http://www.rsyslog.com/doc/v5compatibility.html + + -- Michael Biebl <biebl@debian.org> Mon, 30 May 2011 18:26:51 +0200 diff --git a/debian/README.Debian b/debian/README.Debian new file mode 100644 index 0000000..2a7dfda --- /dev/null +++ b/debian/README.Debian @@ -0,0 +1,83 @@ +rsyslog for Debian +================== + +Configuration file(s) +--------------------- +The default configuration file for rsyslog is /etc/rsyslog.conf. + +Its format is based on the standard syslog.conf format. As rsyslog +has a lot more advanced features than sysklogd, it extends this format +with special configuration directives which all start with the '$' +prefix. See the rsyslogd(8) and rsyslog.conf(5) man pages for further +information or install the rsyslog-doc package which provides much +more detailed documentation. + +The Debian default configuration for rsyslog uses: + + $IncludeConfig /etc/rsyslog.d/*.conf + +That means, all configuration files in /etc/rsyslog.d/ with a .conf file +extension are read by rsyslog. This way the rsyslog configuration can be +extended easily (either by package maintainers or local administrators). + + +Command line arguments, modules and compatibility levels +-------------------------------------------------------- +With version 3, rsyslog became much more modular. A lot of +functionality has been moved into loadable modules, e.g. udp reception, +which must be loaded explicitly. +To keep compatibility with sysklogd, rsyslog introduced the concept of +compatibility modes, which can be selected with the -c command line +argument. E.g. with -c0, rsyslog becomes command line compatible with +sysklogd and loads a default set of modules automatically. + +The default in Debian is -c3, i.e. command line arguments like -r or +-m 0 have no effect and instead have to be configured via special +configuration directives in rsyslog.conf. + +The options that are passed to rsyslog can be changed easily by +modifying the RSYSLOGD_OPTIONS variable in /etc/default/rsyslog. + +If you have an existing, customized syslog.conf, it is recommended that +you migrate your custom logging rules to rsyslog.conf or into a separate +configuration file in /etc/rsyslog.d (in most cases it should be as +simple as copy&paste). + +To read more about this topic please see +/usr/share/doc/rsyslog-doc/html/v3compatibility.html or +http://www.rsyslog.com/doc-v3compatibility.html. + + +Log rotation +------------ +Rsyslog uses the logrotate(8) utilitiy to rotate the standard Debian +log files. The configuration file can be found at +/etc/logrotate.d/rsyslog. + +The rotation cycle starts with .1, as this is the logrotate default. +In contrast to sysklogd, which starts with .0. + +When upgrading from sysklogd, the postinst script will automatically +rotate the existing standard Debian log files, if it is safe to do so +(i.e. only if .0 is newer than .1). + + +Forwarding messages to sysklogd +------------------------------- +If you are forwarding messages from a rsyslog client to a sysklogd +server, it can lead to doubled hostnames in the syslog message on the +server side. The reason is a limitation in sysklogd which does not parse +the hostname in the syslog header (as defined by RFC 3164). See Debian +bug #514051 for more details. + +A simple workaround in rsyslog is, to define a custom template, which +does not include the hostname: + + $template sysklogd,"<%PRI%>%TIMESTAMP% %syslogtag%%msg%" + *.* @remote-host;sysklogd + +This creates a template called "sysklogd" and assigns it to the forward +rule when logging to "remote-host". + + + -- Michael Biebl <biebl@debian.org> Sat, 07 Feb 2009 18:54:37 +0100 diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..2f36340 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,1278 @@ +rsyslog (8.2.1-1) UNRELEASED; urgency=medium + + * New upstream release. + * Switch watch file to track v8 stable branch. + * Update Build-Depends: + - Bump librelp-dev to (>= 1.2.5). + - Bump liblogging-stdlog-dev to (>= 1.0.3). + - Bump liblognorm-dev to (>= 1.0.0). + - Drop libee-dev. + + -- Michael Biebl <biebl@debian.org> Thu, 03 Apr 2014 03:08:04 +0200 + +rsyslog (7.6.3-2) unstable; urgency=medium + + * Update Build-Depends: + - Bump librelp-dev to (>= 1.2.5). + * Build omelasticsearch module which provides support for logging to an + Elasticsearch server. Split that module into a separate package called + rsyslog-elasticsearch. (Closes: #744951) + + -- Michael Biebl <biebl@debian.org> Fri, 16 May 2014 22:37:05 +0200 + +rsyslog (7.6.3-1) unstable; urgency=medium + + * New upstream release. + - Fixes ompipe to properly handle retries and not cause unnecessary + suspension messages. (Closes: #742113) + * Update watch file, track v7 stable branch. + + -- Michael Biebl <biebl@debian.org> Fri, 28 Mar 2014 12:36:45 +0100 + +rsyslog (7.6.2-1) unstable; urgency=medium + + * New upstream release. + * Update patches. + * Update Build-Depends: + - Bump librelp-dev to (>= 1.2.4). + - Add liblogging-stdlog-dev (>= 1.0.1). + * Fix typo in rsyslog.postrm: dissappear → disappear + * Drop useless "exit 0" from maintainer scripts. + * Enable and install the mmutf8fix, mmpstrucdata and mmsequence message + modification modules. + * Stop installing debian/sample.conf. Upstream ships a more up-to-date + example configuration file. + + -- Michael Biebl <biebl@debian.org> Mon, 17 Mar 2014 17:26:08 +0100 + +rsyslog (7.4.8-1) unstable; urgency=medium + + [ Michael Biebl ] + * New upstream release. + * Update Build-Depends: + - Bump libestr-dev to (>= 0.1.9). + - Tighten liblognorm-dev to (<< 1.0.0). + - Replace libjson0-dev with libjson-c-dev, we no longer need the + transitional package. + * Bump Standards-Version to 3.9.5. No further changes. + + [ Daniel Pocock ] + * Make template parameter not mandatory in mongodb output plugin. Patch + cherry-picked from upstream Git. (Closes: #740869, #721277) + * Ensure JSON templates are NUL terminated. Patch cherry-picked from + upstream Git. + + -- Michael Biebl <biebl@debian.org> Tue, 11 Mar 2014 19:52:49 +0100 + +rsyslog (7.4.4-1) unstable; urgency=low + + * New upstream release. + + -- Michael Biebl <biebl@debian.org> Tue, 03 Sep 2013 22:42:49 +0200 + +rsyslog (7.4.3-1) unstable; urgency=low + + * New upstream release. + + -- Michael Biebl <biebl@debian.org> Tue, 23 Jul 2013 01:01:40 +0200 + +rsyslog (7.4.2-1) unstable; urgency=low + + * New upstream release. + + -- Michael Biebl <biebl@debian.org> Sat, 06 Jul 2013 00:14:19 +0200 + +rsyslog (7.4.1-3) unstable; urgency=low + + * Bump Build-Depends on dh-systemd to (>= 1.4) to ensure we have a recent + enough version of init-system-helpers which properly deals with a missing + state directory. (Closes: #714265) + + -- Michael Biebl <biebl@debian.org> Thu, 27 Jun 2013 19:21:04 +0200 + +rsyslog (7.4.1-2) unstable; urgency=low + + * Use dh-systemd to setup the systemd service properly. + + -- Michael Biebl <biebl@debian.org> Wed, 26 Jun 2013 21:13:33 +0200 + +rsyslog (7.4.1-1) unstable; urgency=low + + * New upstream release. + + -- Michael Biebl <biebl@debian.org> Mon, 17 Jun 2013 23:38:51 +0200 + +rsyslog (7.4.0-1) unstable; urgency=low + + * New upstream release. + + -- Michael Biebl <biebl@debian.org> Thu, 06 Jun 2013 18:51:11 +0200 + +rsyslog (7.3.15-1) unstable; urgency=low + + * New upstream release. + + -- Michael Biebl <biebl@debian.org> Wed, 15 May 2013 18:21:02 +0200 + +rsyslog (7.3.14-2) unstable; urgency=low + + * Upload to unstable. + + -- Michael Biebl <biebl@debian.org> Fri, 10 May 2013 01:41:23 +0200 + +rsyslog (7.3.14-1) experimental; urgency=low + + * New upstream release. + * Remove 02-fix-non-libgcrypt-build.patch, merged upstream. + + -- Michael Biebl <biebl@debian.org> Mon, 06 May 2013 23:44:17 +0200 + +rsyslog (7.3.12-3) experimental; urgency=low + + * Only build and install the imkmsg module on Linux. + + -- Michael Biebl <biebl@debian.org> Fri, 26 Apr 2013 16:46:19 +0200 + +rsyslog (7.3.12-2) experimental; urgency=low + + * Fix build when libgcrypt support is disabled to not pick up an unnecessary + libgcrypt dependency. + + -- Michael Biebl <biebl@debian.org> Thu, 25 Apr 2013 23:44:03 +0200 + +rsyslog (7.3.12-1) experimental; urgency=low + + * New upstream release. + * Disable log file encryption support for now. + + -- Michael Biebl <biebl@debian.org> Thu, 25 Apr 2013 15:14:37 +0200 + +rsyslog (7.3.10-1) experimental; urgency=low + + * New upstream release. + * Bump Build-Depends on librelp-dev to (>= 1.0.3). + + -- Michael Biebl <biebl@debian.org> Wed, 10 Apr 2013 12:31:15 +0200 + +rsyslog (7.3.9-1) experimental; urgency=low + + * New upstream release. + * Remove patches which have been applied upstream. + * Bump Build-Depends on libestr-dev to (>= 0.1.5). + + -- Michael Biebl <biebl@debian.org> Wed, 27 Mar 2013 13:14:44 +0100 + +rsyslog (7.3.8-4) experimental; urgency=low + + * Add Build-Depends on bison so we can build twice in a row. "make clean" + removes the generated grammar/grammer.[ch]. + * Another patch to fix build failures on architectures where prctl is not + available. (Closes: #703429) + + -- Michael Biebl <biebl@debian.org> Thu, 21 Mar 2013 16:45:17 +0100 + +rsyslog (7.3.8-3) experimental; urgency=low + + * The previous fix was incomplete. Cherry-pick another upstream patch to fix + the build failure on non-Linux. (Closes: #703429) + + -- Michael Biebl <biebl@debian.org> Wed, 20 Mar 2013 11:44:10 +0100 + +rsyslog (7.3.8-2) experimental; urgency=low + + * Cherry pick patch from upstream which fixes the build on architectures + which don't have SYS_gettid. (Closes: #703429) + + -- Michael Biebl <biebl@debian.org> Tue, 19 Mar 2013 16:40:58 +0100 + +rsyslog (7.3.8-1) experimental; urgency=low + + * New upstream development release from the v7-devel branch. + * Update watch file to track development releases. + * The imrelp module now properly supports listening on IPv4 resp. IPv6 only. + This requires librelp >= 1.0.2, so bump the Build-Depends accordingly. + (Closes: #649355) + * Enable the mmanon module which adds support for anonymizing IPv4 + addresses. + + -- Michael Biebl <biebl@debian.org> Mon, 18 Mar 2013 16:21:35 +0100 + +rsyslog (7.2.6-1) experimental; urgency=low + + * New upstream release. + * Bump Standards-Version to 3.9.4. No further changes. + + -- Michael Biebl <biebl@debian.org> Tue, 05 Mar 2013 17:36:18 +0100 + +rsyslog (7.2.5-1) experimental; urgency=low + + * New upstream release. + + -- Michael Biebl <biebl@debian.org> Wed, 09 Jan 2013 00:04:39 +0100 + +rsyslog (7.2.4-1) experimental; urgency=low + + * New upstream release. + + -- Michael Biebl <biebl@debian.org> Fri, 07 Dec 2012 16:01:00 +0100 + +rsyslog (7.2.3-2) experimental; urgency=low + + * Fix permissions of the spool/work directory. (Closes: #693099) + * Suggest rsyslog-mongodb. + + -- Michael Biebl <biebl@debian.org> Wed, 28 Nov 2012 22:16:33 +0100 + +rsyslog (7.2.3-1) experimental; urgency=low + + * New upstream release. + * Stop providing static start and stop priorities for dh_installinit. Those + are no longer tested and we rely on the dependency information in the LSB + header now to get a correct ordering when being run under sysvinit. + + -- Michael Biebl <biebl@debian.org> Wed, 21 Nov 2012 17:51:27 +0100 + +rsyslog (7.2.2-1) experimental; urgency=low + + * New upstream release. + * Drop patches which have been merged upstream. + + -- Michael Biebl <biebl@debian.org> Fri, 16 Nov 2012 17:51:59 +0100 + +rsyslog (7.2.1-2) experimental; urgency=low + + * Disable imptcp on non-Linux plattforms as this module is Linux-specific. + Making it available everywhere would require more extensive porting work. + * debian/patches/02-imkmsg-includes.patch: Don't include <sys/klog.h> on + non-Linux plattforms. + * debian/patches/03-sysinfo.patch: Getting the uptime via sysinfo() is + Linux-specific, so only use that on architectures supporting it. + * Use dh-autoreconf to update the build system. + * Thanks Guillem Jover for the patches to make rsyslog compile on non-Linux. + (Closes: #692992) + + -- Michael Biebl <biebl@debian.org> Tue, 13 Nov 2012 22:56:58 +0100 + +rsyslog (7.2.1-1) experimental; urgency=low + + * New upstream release. + + -- Michael Biebl <biebl@debian.org> Mon, 29 Oct 2012 16:30:14 +0100 + +rsyslog (7.2.0-1) experimental; urgency=low + + * New upstream release. + - Support for BSD-style blocks has been removed and the rsyslog.conf + man page was updated accordingly. (Closes: #585536) + - Fixes immark documentation wrt $MarkMessagePeriod. (Closes: #605831) + - No longer requires libgcrypt with newer GnuTLS versions. + (Closes: #638658) + * Track stable releases again. + * Remove unnecessary duplication from the init script and also drop the -c + compatibility mode option. + + -- Michael Biebl <biebl@debian.org> Tue, 23 Oct 2012 01:03:54 +0200 + +rsyslog (7.1.12-1) experimental; urgency=low + + * New major upstream release from the v7 beta branch. (Closes: #645640) + - Greatly improved configuration language and execution engine. + - Full support for structured logging and project lumberjack / CEE. + - More plugins - like support for MongoDB or the kernel's new structured + logging system. + - Higher performance - optimizations for script-based filters, enhanced + multithreaded TCP input plugin, DNS cache and more. + * Update watch file to track beta releases. + * Drop patches which have been merged upstream. + * Update Build-Depends: + - Add libestr-dev, libee-dev, libjson0-dev and uuid-dev. + - Bump librelp-dev to (>= 1.0.1). + * Build imkmsg module which provides support for reading structured kernel + log messages. + * Build imptcp module which provides less features then imtcp but is quite a + bit faster. + * Build message modification modules mmjsonparse and mmnormalize which + provide functionality related to structured logging/lumberjack/CEE. This + requires liblognorm. + * Build ommongodb module which provides support for logging to a MongoDB + database. Split that module into a separate package called + rsyslog-mongodb. + * Use --list-missing to show uninstalled files. + * Remove upgrade code from rsyslog.postinst which is no longer necessary. + * Remove the -c compatibility mode option from rsyslog.default. This option + has been obsoleted upstream. (Closes: #598713) + + -- Michael Biebl <biebl@debian.org> Sun, 21 Oct 2012 22:56:11 +0200 + +rsyslog (5.8.11-3) unstable; urgency=low + + * debian/patches/04-systemd_journal.patch: The journal has replaced + systemd-kmsg-syslogd and systemd-stdout-bridge. Stopping a non-existing + service will generate an error in newer versions of systemd, so remove + that from ExecStartPre. + + -- Michael Biebl <biebl@debian.org> Tue, 05 Mar 2013 23:06:57 +0100 + +rsyslog (5.8.11-2) unstable; urgency=low + + * Disable omstdout module again. Upstream doesn't consider it viable for + production use but mainly for the internal testbench. + * debian/patches/03-fix_relp_dns_resolution.patch: When using RELP for + remote logging, correctly resolve the client hostname if the fromhost + property contains the client IP. (Closes: #682529) + Thanks to Apollon Oikonomopoulos for the patch. + + -- Michael Biebl <biebl@debian.org> Wed, 26 Sep 2012 20:36:09 +0200 + +rsyslog (5.8.11-1) unstable; urgency=low + + * New upstream release. + * Enable and install omuxsock and omstdout module. + + -- Michael Biebl <biebl@debian.org> Fri, 04 May 2012 22:38:00 +0200 + +rsyslog (5.8.10-1) unstable; urgency=low + + * New upstream release. + + -- Michael Biebl <biebl@debian.org> Thu, 05 Apr 2012 18:46:00 +0200 + +rsyslog (5.8.9-1) unstable; urgency=low + + * New upstream release. + + -- Michael Biebl <biebl@debian.org> Thu, 15 Mar 2012 13:38:35 +0100 + +rsyslog (5.8.8-1) unstable; urgency=low + + * New upstream release. + - Fix imuxsock to not truncate parts of the received message if it + did not contain a proper date. (Closes: #654429) + - Fix imuxsock example in rsyslog.conf(5) man page. (Closes: #655846) + * Fix versioned Build-Depends on dpkg-dev. The buildflags.mk snippet was + added in version 1.16.1, not 1.6.1. (Closes: #654894) + * Update watch file. Check download page for stable releases. + * Strip debian/tmp/ from .install files. + * Install tmpfiles.d snippet to create /dev/xconsole when running under + systemd. (Closes: #634978) + * debian/patches/02-path_max.patch + - Don't rely on PATH_MAX being defined. Patch cherry-picked from upstream + Git. (Closes: #651529) + * debian/rsyslog.init + - Use --exec instead of --name for start-stop-daemon. This is more + reliable and works better on GNU/Hurd. (Closes: #652575) + - Use /run/xconsole and a symlink /dev/xconsole on non-Linux systems. + * debian/rsyslog.default + - Update comments regarding available command line switches. Remove + deprecated options. + * debian/rsyslog.links + - Install syslog.service alias so rsyslog is properly socket activated + with newer versions of systemd. + * debian/copyright + - Use maschine-readable copyright format 1.0. + - Most parts of rsyslog have been relicensed under Apache license 2.0. + * Bump Standards-Version to 3.9.3. + * debian/rsyslog.conf + - Set $WorkDirectory to /var/spool/rsyslog, which is used for spool and + state files. When not configured it defaults to '/', which is + undesirable. (LP: #918947, Closes: #656535) + * debian/rsyslog.dirs + - Add /var/spool/rsyslog/. + + -- Michael Biebl <biebl@debian.org> Wed, 07 Mar 2012 00:42:56 +0100 + +rsyslog (5.8.6-1) unstable; urgency=low + + * New upstream release. + - Fix regression in imuxsock to ignore message-provided timestamp by + default which broke high precision timestamps. (Closes: #638147) + * debian/control: + - Wrap (build-)dependencies. + * Enable default hardening options from dpkg-buildflags. (Closes: #644303) + - Use buildflags.mk snippet in debian/rules. + - Add Build-Depends on dpkg-dev (>= 1.6.1). + + -- Michael Biebl <biebl@debian.org> Wed, 02 Nov 2011 23:31:41 +0100 + +rsyslog (5.8.5-1) unstable; urgency=low + + * New upstream release. + + -- Michael Biebl <biebl@debian.org> Thu, 01 Sep 2011 23:29:45 +0200 + +rsyslog (5.8.4-1) unstable; urgency=low + + * New upstream release. + + -- Michael Biebl <biebl@debian.org> Tue, 30 Aug 2011 23:58:11 +0200 + +rsyslog (5.8.3-1) unstable; urgency=low + + * New upstream release. + * debian/rsyslog.conf: Use new ":omusrmsg:*" syntax (write to all) for + *.emerg messages in preparation for future config format changes. + + -- Michael Biebl <biebl@debian.org> Mon, 11 Jul 2011 12:33:27 +0200 + +rsyslog (5.8.2-2) unstable; urgency=low + + * Transition to /run/sendsigs.omit.d. (Closes: #633036) + - Use /run/sendsigs.omit.d/rsyslog in debian/rsyslog.init. + - Add Depends on initscripts (>= 2.88dsf-13.3) to ensure /run is usable. + - Remove /lib/init/rw/sendsigs.omit.d/rsyslog on upgrades. + + -- Michael Biebl <biebl@debian.org> Fri, 08 Jul 2011 01:36:20 +0200 + +rsyslog (5.8.2-1) unstable; urgency=low + + * New upstream release. + + -- Michael Biebl <biebl@debian.org> Tue, 21 Jun 2011 16:26:54 +0200 + +rsyslog (5.8.1-1) unstable; urgency=low + + * New upstream release. + * Bump Standards-Version to 3.9.2. No further changes. + * Enable and install impstats module. (Closes: #620114) + * Update logcheck rule. (Closes: #616659) + * debian/rsyslog.init: Set correct compat level (5). + * The way rsyslog processes SIGHUP has changed. It no longer does a reload + of its configuration, but simply closes all open files. To apply a changed + configuration, rsyslogd needs to be restarted now. + - Drop "reload" action from debian/rsyslog.init, map "force-reload" to + "restart". (Closes: #580897) + - Add "rotate" action to debian/rsyslog.init which sends SIGHUP to + rsyslogd. Use that in debian/rsyslog.logrotate. (Closes: #626365) + - Update debian/rsyslog-mysql.postinst and rsyslog-pgsql.postinst to use + restart instead of reload. + - Add a NEWS file explaining the changed SIGHUP handling. + + -- Michael Biebl <biebl@debian.org> Mon, 30 May 2011 18:40:12 +0200 + +rsyslog (5.8.0-1) unstable; urgency=low + + * New upstream stable release. + + -- Michael Biebl <biebl@debian.org> Tue, 12 Apr 2011 14:34:57 +0200 + +rsyslog (5.7.10-1) unstable; urgency=low + + * New upstream release. + - Properly handle ANSI SQL strings in ompgsql. (Closes: #600479) + + -- Michael Biebl <biebl@debian.org> Tue, 29 Mar 2011 18:41:28 +0200 + +rsyslog (5.7.9-1) unstable; urgency=low + + * New upstream release. + * debian/patches/02-pmaixforwardedfrom_type_nokeep.patch + - Remove, merged upstream. + * debian/patches/03-epoll_create1-fallback.patch + - Remove, merged upstream. + + -- Michael Biebl <biebl@debian.org> Sat, 26 Mar 2011 19:31:28 +0100 + +rsyslog (5.7.8-2) unstable; urgency=low + + * debian/patches/03-epoll_create1-fallback.patch + - If epoll_create1() is not available during runtime, fall back to + epoll_create(). This fixes remote syslog when runnig rsyslog on a + lenny kernel. (Closes: #617996) + + -- Michael Biebl <biebl@debian.org> Mon, 14 Mar 2011 12:13:14 +0100 + +rsyslog (5.7.8-1) unstable; urgency=low + + * New upstream release. + * debian/rsyslog.links + - Create symlink for rsyslog.service in multi-user.target.wants so rsyslog + is enabled by default when using systemd. + * debian/patches/02-pmaixforwardedfrom_type_nokeep.patch + - Fix build failure in aixforwardedfrom parser module by setting the + module type to NOKEEP. + * debian/rsyslog.preinst + - Remove old rsyslog.socket symlink from sockets.target.wants on upgrades + as rsyslog uses syslog.socket now which is provided by systemd. + * debian/rsyslog.install + - Stop installing rsyslog.socket. + + -- Michael Biebl <biebl@debian.org> Thu, 10 Mar 2011 08:50:29 +0100 + +rsyslog (5.7.6-1) unstable; urgency=low + + * New upstream release. + + -- Michael Biebl <biebl@debian.org> Fri, 25 Feb 2011 17:14:46 +0100 + +rsyslog (5.7.5-1) unstable; urgency=low + + * New upstream release. + - Fix regression in imuxsock plugin which did no longer sanitize received + messages. This makes 02-cleanup-trailing-lf.patch obsolete and also + fixes the SQL syntax errors in the mysql output if the input contained + NUL bytes. Closes: #614061 + * Enable and install omprog output plugin. Closes: #552095 + * Improve package description. Closes: #612948 + Thanks to Justin B Rye for the patch. + + -- Michael Biebl <biebl@debian.org> Wed, 23 Feb 2011 12:03:06 +0100 + +rsyslog (5.7.4-2) unstable; urgency=low + + * debian/patches/02-cleanup-trailing-lf.patch + - Fix regression in imuxsock plugin which did not remove a trailing LF + anymore. Patch cherry-picked from upstream Git. Closes: #612829 + + -- Michael Biebl <biebl@debian.org> Mon, 21 Feb 2011 12:04:13 +0100 + +rsyslog (5.7.4-1) unstable; urgency=low + + * New upstream release. + * Enable and install parser modules. + + -- Michael Biebl <biebl@debian.org> Sat, 19 Feb 2011 00:45:43 +0100 + +rsyslog (5.7.3-1) unstable; urgency=low + + * New upstream release. + * Upload to unstable. + * debian/patches/02-typo_fix_equation_sign.patch + - Removed, merged upstream. + * debian/patches/03-atomic_operations.patch + - Removed, merged upstream. + + -- Michael Biebl <biebl@debian.org> Wed, 09 Feb 2011 06:10:46 +0100 + +rsyslog (5.7.2-2) experimental; urgency=low + + * debian/patches/03-atomic_operations.patch + - Fix build failures on platforms which don't have 64 bit atomic + operations. Patch cherry-picked from upstream Git. Closes: #600930 + + -- Michael Biebl <biebl@debian.org> Wed, 01 Dec 2010 21:20:28 +0100 + +rsyslog (5.7.2-1) experimental; urgency=low + + * New upstream development release. + * Remove patches, merged upstream + - debian/patches/02-install_also_rsyslog_socket.patch + - debian/patches/02-tls_loop_fix.patch + * debian/patches/02-typo_fix_equation_sign.patch + - Fix small typo ("equation sign"). Closes: #575589 + * debian/rsyslog.postinst + - Remove pre-lenny migration code to rotate old log files from sysklogd. + + -- Michael Biebl <biebl@debian.org> Tue, 30 Nov 2010 15:30:56 +0100 + +rsyslog (5.7.1-1) experimental; urgency=low + + * New upstream development release. + * debian/rsyslog.install + - Install omruleset.so plugin: http://www.rsyslog.com/doc/omruleset.html + * debian/rsyslog.default + - Start rsyslogd with native -c5 mode. + * Install systemd unit files which allow to run rsyslog in socket activation + mode when systemd is used. + * debian/patches/02-install_also_rsyslog_socket.patch + - When enabling rsyslog.service also enable rsyslog.socket. Patch + cherry-picked from upstream Git. + * Bump debhelper compatibility level to 8. Update Build-Depends accordingly. + + -- Michael Biebl <biebl@debian.org> Wed, 20 Oct 2010 01:48:39 +0200 + +rsyslog (4.6.4-2) unstable; urgency=low + + * debian/patches/02-tls_loop_fix.patch + - Fix bug in TLS handling which could cause rsyslog to loop in a tight + loop and eating up all CPU and RAM resources. Closes: #549168 + Patch cherry-picked from upstream Git. + + -- Michael Biebl <biebl@debian.org> Tue, 30 Nov 2010 14:50:15 +0100 + +rsyslog (4.6.4-1) unstable; urgency=low + + * New upstream release. + - bugfix: programname filter in ! configuration can not be reset. + Thanks to Kiss Gabor for the patch. Closes: #540807 + * Bump Standards-Version to 3.9.1. No further changes. + + -- Michael Biebl <biebl@debian.org> Thu, 05 Aug 2010 18:35:37 +0200 + +rsyslog (4.6.3-1) unstable; urgency=low + + * New upstream release. + * debian/patches/02-set-correct-default-for-buffered-writing.patch + - Removed, merged upstream. + * Switch to source format 3.0 (quilt). + - Add debian/source/format. + - Drop Build-Depends on quilt. + - Remove debian/README.source. + - Remove /usr/share/quilt/quilt.make include from debian/rules. + * Switch to dh v7. + - Bump Build-Depends on debhelper to (>= 7.0.50). + - Bump Build-Depends on autotools-dev to (>= 20100122.1) for the + autotools_dev dh addon. + - Convert debian/rules to dh. + * Bump Standards-Version to 3.9.0. Use Breaks instead of Conflicts as + recommended by the new policy. + + -- Michael Biebl <biebl@debian.org> Wed, 07 Jul 2010 19:07:03 +0200 + +rsyslog (4.6.2-1) unstable; urgency=low + + * New upstream release. + * debian/patches/02-set-correct-default-for-buffered-writing.patch + - The default for $OMFileFlushOnTXEnd was wrong ("off"). Patch pulled from + upstream Git. + + -- Michael Biebl <biebl@debian.org> Wed, 07 Apr 2010 16:42:56 +0200 + +rsyslog (4.6.1-1) unstable; urgency=low + + * New upstream release. + - Fix error in rsyslog.conf(5) man page. The configuration variable + $InputUDPServerRun does not exist, it should be $UDPServerRun instead. + Thanks to Alexander Gerasiov for spotting this. Closes: #571202 + * debian/rsyslog-doc.install + - Install png image files. + * debian/patches/doc_typo_fix.patch + - Removed, merged upstream. + * debian/patches/no_create_db.patch + - Refresh to apply cleanly. + * debian/control + - Bump Standards-Version to 3.8.4. No further changes. + * debian/rsyslog.install + - Install new lmstrmsrv.so and lmzlibw.so plugins. + * debian/rsyslog.lintian-overrides + - Add lintian override for init.d-script-missing-dependency-on-remote_fs + false positive. See also the corresponding lintian bug: #571280. + * debian/rules + - Add call to dh_lintian. + * debian/rsyslog.init + - GNU/kFreeBSD does not allow to create pipes in /dev. So for xconsole + create the pipe as /var/run/xconsole and a /dev/xconsole symlink. + Closes: #537170 + + -- Michael Biebl <biebl@debian.org> Fri, 05 Mar 2010 01:07:53 +0100 + +rsyslog (4.4.2-2) unstable; urgency=low + + * debian/control + - Demote mysql-server and postgresql from Recommends to Suggests. The + server packages are not strictly necessary for dbconfig-common's + autoconfiguration to work and one might want to use a remote server. + - Add Recommends: mysql-client for rsyslog-mysql. + - Add Recommends: postgresql-client for rsyslog-pgsql. + * debian/patches/doc_typo_fix.patch + - Fix a typo in the html documentation and man page regarding the syslog.h + header file and the syslog(3) man page. Closes: #559334 + Thanks to Alexander Gerasiov for spotting this. + + -- Michael Biebl <biebl@debian.org> Mon, 18 Jan 2010 15:31:40 +0100 + +rsyslog (4.4.2-1) unstable; urgency=low + + * New upstream release. + + -- Michael Biebl <biebl@debian.org> Sat, 10 Oct 2009 14:08:16 +0200 + +rsyslog (4.4.1-1) unstable; urgency=low + + * New upstream release. + - Fix invalid double-quoted PRI in log messages. Closes: #543505 + * debian/watch + - Only check for stable upstream releases. + * debian/patches/testbench-java.patch + - Removed, merged upstream. + + -- Michael Biebl <biebl@debian.org> Wed, 02 Sep 2009 17:19:05 +0200 + +rsyslog (4.4.0-1) unstable; urgency=low + + * New upstream release. + * Removed patches + - debian/patches/manpage_pidfile.patch (merged upstream) + - debian/patches/close-stdout-stderr.patch (merged upstream) + * Bump Standards-Version to 3.8.3. No further changes. + * Disable testbench as it requires java. + * debian/patches/testbench-java.patch + - Move check_JAVA inside the ENABLE_TESTBENCH section so the tests are not + run unless the testbench is enabled. + + -- Michael Biebl <biebl@debian.org> Fri, 21 Aug 2009 23:08:45 +0200 + +rsyslog (4.2.0-2) unstable; urgency=low + + * debian/rsyslog.logcheck.ignore.server + - Bring the logcheck rules up to date with the new SIGHUP log + message. Thanks to Frédéric Brière for the patch. Closes: #537324 + * debian/patches/close-stdout-stderr.patch + - Close stdout/stderr after forking. Closes: #537182 + * debian/control + - Change Build-Depends: libmysqlclient15-dev → libmysqlclient-dev. + * debian/rsyslog.postrm + - Cleanup /lib/init/rw/sendsigs.omit.d/rsyslog upon remove to avoid false + positives from piuparts. Closes: #539144 + + -- Michael Biebl <biebl@debian.org> Wed, 05 Aug 2009 01:12:09 +0200 + +rsyslog (4.2.0-1) unstable; urgency=low + + * New upstream release of the now stable v4 branch. + - Fix warnings when /etc/rsyslog.d/ is empty. Closes: #530228 + * debian/patches/imudp_multiple_udp_sockets.patch + - Removed, merged upstream. + * debian/rsyslog.default + - Set default compat mode to '4'. + * debian/rsyslog.logcheck.ignore.server + - Update logcheck rules files to also ignore rsyslogd and imklog stop + messages. + * debian/control + - Bump Standards-Version to 3.8.2. No further changes. + + -- Michael Biebl <biebl@debian.org> Tue, 23 Jun 2009 12:12:43 +0100 + +rsyslog (3.22.0-1) unstable; urgency=low + + * New upstream release. + * debian/rsyslog.init + - Pass proper return code to log_end_msg. + * debian/rsyslog.conf + - Set $Umask to 0022 to enforce that new log files or directories are + always created with the right permissions. Closes: #522297 + * debian/patches/imudp_multiple_udp_sockets.patch + - Fix a segfault in imudp when multiple udp listeners are configured. + Patch cherry-picked from upstream git. Closes: #519073 + * debian/patches/manpage_pidfile.patch + - Fix rsyslogd man page to point to the correct pid file. Closes: #526658 + + -- Michael Biebl <biebl@debian.org> Fri, 15 May 2009 23:25:14 +0200 + +rsyslog (3.20.5-1) unstable; urgency=low + + * New upstream release. + * debian/rsyslog.logcheck.ignore.server + - Install a logcheck ignore file for rsyslog (using dh_installlogcheck). + Thanks to Kim Holviala for the patch. Closes: #522164 + + -- Michael Biebl <biebl@debian.org> Wed, 08 Apr 2009 00:59:14 +0200 + +rsyslog (3.20.4-3) unstable; urgency=low + + * Enable RELP (reliable event logging protocol) support. + * debian/control + - Add librelp-dev and pkg-config to Build-Depends. + - Add new binary package rsyslog-relp. + - Add rsyslog-relp to rsyslog's list of suggested packages. + * debian/rules + - Add --enable-relp to configure flags. + * debian/rsyslog-relp.install + - Install relp input and output plugin. + * Bump Standards-Version to 3.8.1. No further changes. + + -- Michael Biebl <biebl@debian.org> Mon, 23 Mar 2009 09:19:44 +0100 + +rsyslog (3.20.4-2) unstable; urgency=low + + * Merge changes from experimental branch. + * Move Git repository to collab-maint. Update Vcs-* fields. + + -- Michael Biebl <biebl@debian.org> Sun, 15 Feb 2009 21:56:23 +0100 + +rsyslog (3.20.4-1) experimental; urgency=low + + * New upstream release. + * Merge changes from unstable branch. + * debian/patches/message_locking_fix.patch + - Removed, fixed upstream. + * debian/compat + - Bump to debhelper v7 compat mode. + * debian/control + - Bump debhelper build dependency to (>= 7.0.9). + - Add rsyslog-gnutls and rsyslog-gssapi to Suggests. + - Improve and update package description for rsyslog, rsyslog-gnutls and + rsyslog-gssapi. + * debian/rules + - Use new dh_installinit "-R" (restart-after-upgrade) option. + - Replace "dh_clean -k" with "dh_prep". + * debian/rsyslog.postinst + - Remove our custom code to stop/start rsyslog on upgrades. This is done + now automatically by dh_installinit. + * debian/rsyslog.docs + - Install AUTHORS file. + + -- Michael Biebl <biebl@debian.org> Tue, 10 Feb 2009 01:52:32 +0100 + +rsyslog (3.20.3-1) experimental; urgency=low + + * New upstream release. + * debian/patches/allowed_sender_reload.patch + - Removed, merged upstream. + * debian/patches/manpage_fixes.patch + - Removed, merged upstream. + + -- Michael Biebl <biebl@debian.org> Mon, 19 Jan 2009 13:52:31 +0100 + +rsyslog (3.20.2-1) experimental; urgency=low + + * New upstream release. + * Refresh all patches for the new upstream stable branch. + * Enable GSSAPI support + - Add libkrb5-dev to Build-Depends. + - Split files into a separate package named rsyslog-gssapi. + - Add --enable-gssapi-krb5 to configure flags. + Thanks to Ben Poliakoff for the patch. Closes: #493044 + * Enable GnuTLS support + - Add libgnutls-dev to Build-Depends. + - Split files into a separate package named rsyslog-gnutls. + - Add --enable-gnutls to configure flags. + * debian/control + - Add ${misc:Depends} to rsyslog-doc. + * Let rsyslog collect messages as long as possible during shutdown or + reboot. As /usr may be mounted via NFS, the latest possible point is just + before umountnfs. Closes: #474498 + - Update the stop priorities for runlevel 0 and 6 from K90 to S30 for + sysv-rc and migrate existing symlinks. + - Update LSB header to stop after sendsigs and before umountnfs. + - Use the sendsigs process omission interface to avoid being killed by + killall5. + * debian/rsyslog-doc.links + - There is an upstream index.html file now, so we no longer need to create + a symlink. + + -- Michael Biebl <biebl@debian.org> Fri, 16 Jan 2009 22:23:40 +0100 + +rsyslog (3.18.6-4) unstable; urgency=medium + + * debian/patches/message_locking_fix.patch + - Proper message locking on message destruct to avoid a race condition + which could lead to a segfault. Closes: #509292 + Patch cherry-picked from upstream git. + * Urgency medium for the RC bug fix. + * Use the dbconfig-common template mechanism to generate the configuration + files for rsyslog-mysql and rsyslog-pgsql. This not only simplifies + postinst quite a bit, but also makes sure we don't read any unset debconf + values. Closes: #513589 + * debian/README.Debian + - Add notes about the Debian specific configuration of rsyslog and outline + some of the changes between rsyslog and sysklogd which should ease the + migration. Closes: #484083 + - Add instructions how to avoid doubled hostname entries when sending + syslog messages from rsyslog to a sysklogd server. Closes: #512663 + + -- Michael Biebl <biebl@debian.org> Sun, 08 Feb 2009 00:54:39 +0100 + +rsyslog (3.18.6-3) unstable; urgency=medium + + * debian/rsyslog.conf + - Create new directories with more sane permissions. Closes: #511054 + * debian/rsyslog.init + - Update the LSB header to not provide the reserved 'syslog' facility. Use + 'rsyslog' instead to avoid clashes. Thanks to Petter Reinholdtsen for + the hint. + * debian/patches/allowed_sender_reload.patch + - Fix segfault on reload when using $AllowedSender. Closes: #511562 + Patch cherry picked from upstream git. + + -- Michael Biebl <biebl@debian.org> Thu, 15 Jan 2009 17:50:06 +0100 + +rsyslog (3.18.6-2) unstable; urgency=low + + * debian/rsyslog.postinst + - Use $(($var)) syntax for arithmetic expressions, as dash from etch is + not SUSv3 compliant in that regard which leads to failing dist upgrades + when dash is used as /bin/sh. Closes: #508943 + + -- Michael Biebl <biebl@debian.org> Wed, 17 Dec 2008 00:29:43 +0100 + +rsyslog (3.18.6-1) unstable; urgency=high + + * New upstream bugfix release. + - Fix "$AllowedSender" security bypass vulnerability. The "$AllowedSender" + configuration directive was not respected, allowing unrestricted network + access to the application. Closes: #508027 + No CVE id yet. + * Urgency high for the security fix. + * debian/patches/manpage_fixes.patch + - Fix typos in rsyslogd man page. Closes: #506925 + Thanks to Geoff Simmons for the patch. + + -- Michael Biebl <biebl@debian.org> Fri, 12 Dec 2008 17:36:02 +0100 + +rsyslog (3.18.5-1) unstable; urgency=low + + * New upstream bugfix release. + - Fix potential segfault in imfile on rsyslogd HUP (reload) and + termination (stop). Closes: #503940 + - Disable input throttling for imuxsock as this can lead to denial of + service. Closes: #505991 + * debian/rsyslog-{mysql,pgsql}.config + - Do not ignore errors in config maintainer scripts. + * debian/rsyslog.postinst + - Rotate old .0 log files when migrating from sysklogd. Closes: #491672 + * debian/rules + - Exclude sample conf file from being compressed as it is referenced in + the html documentation with the non-compressed file name. + - Depend on $(QUILT_STAMPFN) instead of patch; patch is a phony target and + thus always out of date. + - Move $(QUILT_STAMPFN) dependency to config.status to avoid potential + issues with parallel make. + * debian/rsyslog-doc.links + - Add a symlink index.html pointing at manual.html. Closes: #494634 + * debian/rsyslog.default + - Fix a few spelling errors. + * Disable the logrotate file when removing the package to avoid log + rotation failures. Closes: #500569 + Thanks to Kobayashi Noritada for the patch + * debian/rsyslog.postrm + - Rename /etc/logrotate.d/rsyslog to /etc/logrotate.d/rsyslog.disabled + when removing the package. + - Remove /etc/logrotate.d/rsyslog.disabled when purging and replacing + the package. + * debian/rsyslog.preinst + - Rename /etc/logrotate.d/rsyslog.disabled to /etc/logrotate.d/rsyslog + when reinstalling. + + -- Michael Biebl <biebl@debian.org> Thu, 20 Nov 2008 14:09:10 +0100 + +rsyslog (3.18.2-1) unstable; urgency=low + + * New upstream release. + * debian/rsyslog.init + - Restore default SELinux security context when creating /dev/xconsole. + Closes: #493171 + - Add "status" action. + * debian/control + - Bump dependency on lsb-base to >= 3.2-14, which provides status_of_proc. + + -- Michael Biebl <biebl@debian.org> Mon, 11 Aug 2008 00:25:33 +0200 + +rsyslog (3.18.1-1) unstable; urgency=low + + * New upstream release. Closes: #490445 + - List Debian in doc/rsyslog_packages.html. Closes: #488870 + - Fix compilation of imklog module on GNU/kFreeBSD. Closes: #491193 + * debian/rsyslog-doc.install + - Install the example config file. Closes: #488860 + * debian/rules + - Enable mail output plugin. + - Make sure all directories are created by calling dh_installdirs for both + binary-arch and binary-indep. Closes: #491459 + * debian/rsyslog.install + - Install mail output plugin (ommail.so). + * debian/control + - Add Suggests www-browser to rsyslog-doc as the package contains mostly + html documents. + - Update feature list. + - Adjust priorities, set rsyslog priority to important. + + -- Michael Biebl <biebl@debian.org> Wed, 23 Jul 2008 02:22:32 +0200 + +rsyslog (3.16.2-1) unstable; urgency=low + + * New upstream release. + + -- Michael Biebl <biebl@debian.org> Wed, 25 Jun 2008 15:41:21 +0200 + +rsyslog (3.16.1-2) unstable; urgency=low + + * debian/rules + - Build the doc package in binary-indep. + * Bump Standards-Version to 3.8.0. + - Add debian/README.source as recommended by the new policy. + + -- Michael Biebl <biebl@debian.org> Fri, 20 Jun 2008 07:11:24 +0200 + +rsyslog (3.16.1-1) unstable; urgency=low + + * New upstream release. + - Fixes a segfault in the imklog input plugin. Closes: #479117 + + -- Michael Biebl <biebl@debian.org> Sat, 03 May 2008 09:59:59 +0200 + +rsyslog (3.14.2-3) unstable; urgency=low + + * debian/rsyslog-doc.install + - Fix a typo in the install path of the dia files. Closes: #477489 + Thanks to Justin B Rye for the patch. + + -- Michael Biebl <biebl@debian.org> Wed, 23 Apr 2008 16:46:39 +0200 + +rsyslog (3.14.2-2) unstable; urgency=low + + * debian/rsyslog.conf + - Disable high precision timestamps until other affected packages have + been updated to support them. See bug #475303 for details. + + -- Michael Biebl <biebl@debian.org> Tue, 22 Apr 2008 20:02:28 +0200 + +rsyslog (3.14.2-1) unstable; urgency=low + + * New upstream release. + + -- Michael Biebl <biebl@debian.org> Thu, 10 Apr 2008 08:32:23 +0200 + +rsyslog (3.14.1-1) unstable; urgency=low + + * First upstream release of the new stable v3 series. + * debian/copyright + - Update copyright notice as rsyslog has been relicensed under GPL3+. + * debian/rsyslog.init + - The kernel logging functionality is now implemented via an input plugin + and has replaced the separate rklogd binary. Remove all traces of rklogd + from the init script. + - General cleanup and simplification. + * debian/rsyslog.default + - Remove obsolete RKLOGD_OPTIONS configuration variable. + - Document deprecated command line options. + - Start rsyslogd in v3 compat mode, its native interface. + * debian/rsyslog.conf + - Load the input modules imuxsock (local system logging) and imklog + (kernel logging) by default. + * debian/rsyslog-doc.install + - Install jpeg images and dia files. + * debian/rsyslog.install + - Install input modules (im*.so) and library plugins (lm*.so). + * debian/rules + - Enable imfile input plugin. + - Use dh_installinit "-r" (no-restart-on-upgrade) option. + * debian/rsyslog.postinst + - Minimize downtime by restarting rsyslog in postinst instead of stop in + prerm and start in postinst. Closes: #471051 + * debian/rsyslog.logrotate + - Group together related log files. + - Rotate daemon.log and kern.log weekly, to match sysklogd behaviour. + - Add options "missingok", "delaycompress" and "sharedscripts" as + suggested by Paul Slootman. Closes: #473546 + + -- Michael Biebl <biebl@debian.org> Sun, 06 Apr 2008 16:54:08 +0200 + +rsyslog (2.0.4-1) unstable; urgency=low + + * New upstream release. + * debian/control + - Add Vcs-Git and Vcs-Browser fields. + + -- Michael Biebl <biebl@debian.org> Sat, 29 Mar 2008 12:17:22 +0100 + +rsyslog (2.0.3-1) unstable; urgency=low + + * New upstream release. + * debian/patches/man_page_format.patch + - Removed, merged upstream. + + -- Michael Biebl <biebl@debian.org> Thu, 13 Mar 2008 14:22:35 +0100 + +rsyslog (2.0.2-2) unstable; urgency=low + + * debian/rsyslog-doc.doc-base + - Update the Section: field to comply with the new doc-base Manual. + * debian/rules + - Don't install rfc3195d and its man page. The rfc3195d binary is + currently only a dummy. + * debian/rsyslog.conf + - Fix the path to the rsyslog documentation which is now in rsyslog-doc. + - Set the default permissions of new log files to 0640 and make them + readable by group adm. + - Include external config files at the beginning. This allows to drop log + messages before they end up in the standard log files. + + -- Michael Biebl <biebl@debian.org> Thu, 06 Mar 2008 02:49:17 +0100 + +rsyslog (2.0.2-1) unstable; urgency=low + + * New upstream release. + * debian/rsyslog.init + - Make /dev/xconsole readable by group adm. Closes: #464695 + * debian/control + - Fix a typo in the rsyslog-pgsql package description. + * debian/patches/man_page_format.patch + - Fix a few format errors in the man pages. + + -- Michael Biebl <biebl@debian.org> Tue, 12 Feb 2008 19:56:47 +0100 + +rsyslog (2.0.1-2) unstable; urgency=low + + * debian/control + - Drop Replaces: system-log-daemon, linux-kernel-log-daemon. There are no + conflicting files with other syslog packages so this line is not needed. + - Add new package rsyslog-doc. + - Add Suggests: rsyslog-doc to rsyslog. + * debian/rsyslog.install, debian/rsyslog-doc.install + - Move the html files from rsyslog to rsyslog-doc. + * debian/rsyslog-doc.doc-base + - Integrate the documentation with doc-base. + + -- Michael Biebl <biebl@debian.org> Sat, 02 Feb 2008 17:00:49 +0100 + +rsyslog (2.0.1-1) unstable; urgency=low + + * New upstream bug fix release. + + -- Michael Biebl <biebl@debian.org> Thu, 24 Jan 2008 18:35:20 +0100 + +rsyslog (2.0.0-2) unstable; urgency=low + + * debian/rsyslog.init + - Fix LSB init header. Use $remote_fs instead of $local_fs as the rsyslogd + daemon requires /usr to be mounted. + + -- Michael Biebl <biebl@debian.org> Thu, 10 Jan 2008 13:22:42 +0100 + +rsyslog (2.0.0-1) unstable; urgency=low + + * New upstream release of the stable branch of rsyslog v2. + + -- Michael Biebl <biebl@debian.org> Wed, 02 Jan 2008 15:39:19 +0100 + +rsyslog (1.21.2-1) unstable; urgency=low + + * New upstream release. + + -- Michael Biebl <biebl@debian.org> Sun, 30 Dec 2007 02:11:58 +0100 + +rsyslog (1.21.1-1) unstable; urgency=low + + * New upstream release. + + -- Michael Biebl <biebl@debian.org> Sun, 23 Dec 2007 19:02:11 +0100 + +rsyslog (1.21.0-1) unstable; urgency=low + + * New upstream release. + * debian/patches/ignore_non_conf_files.patch + - Dropped. A more powerful alternative has been implemented upstream which + allows to include configuration files based on wildcards. + * debian/rsyslog.conf + - Include all configuration files matching /etc/rsyslog.d/*.conf. + + -- Michael Biebl <biebl@debian.org> Wed, 19 Dec 2007 09:54:18 +0100 + +rsyslog (1.20.1-1) unstable; urgency=low + + * New upstream release. + * debian/rules + - Enable the PostgreSQL database support. + - Use "install -D" to install the SQL schema file for MySQL and + PostgreSQL. + * debian/control + - Add a Build-Depends on libpq-dev for the PostgreSQL support. + - Add the binary package rsyslog-pgsql. + * debian/patches/no_create_db.patch + - Updated. Only setup the tables. Leave the database creation to + dbconfig-common. + * debian/rsyslog-pgsql.install + - Install the ompgsql.so plugin. + * debian/rsyslog-pgsql.config + - Preseed the default values for dbconfig-common, database name is + "Syslog", database user "rsyslog". + * debian/rsyslog-pgsql.{postinst,prerm,postrm} + - Use dbconfig-common to setup the PostgreSQL database. + - Generate a configuration file /etc/rsyslog.d/pgsql.conf with the values + provided by dbconfig-common and use ucf and ucfr to manage this file. + * debian/rsyslog-mysql.postinst + - Use the new ":ommysql:" output selector instead of ">". + * debian/rsyslog-mysql.install + - Only install the ommysql.so plugin. + + -- Michael Biebl <biebl@debian.org> Wed, 12 Dec 2007 20:54:41 +0100 + +rsyslog (1.19.12-1) unstable; urgency=low + + * New upstream release. + * debian/control + - Add Depends: lsb-base (>= 3.0-6) as the init script uses the LSB logging + functions. + - Bump Standards-Version to 3.7.3. No further changes required. + + -- Michael Biebl <biebl@debian.org> Mon, 03 Dec 2007 19:42:19 +0100 + +rsyslog (1.19.10-1) unstable; urgency=low + + * New upstream release. + * debian/patches/man_page_format.patch + - Removed, merged upstream. + + -- Michael Biebl <biebl@debian.org> Fri, 19 Oct 2007 17:21:49 +0200 + +rsyslog (1.19.9-1) unstable; urgency=low + + * New upstream release. + * debian/patches/udp_msg_reception.patch + - Deleted, merged upstream. + * The mysql output plugin is now in a separate subdirectory. Change the + path to the createDB.sql script accordingly. + + -- Michael Biebl <biebl@debian.org> Sun, 14 Oct 2007 11:55:12 +0200 + +rsyslog (1.19.7-2) unstable; urgency=low + + * debian/patches/udp_msg_reception.patch + - Pull patch from CVS which fixes broken UDP message reception. + * debian/control + - Use the new "Homepage:" field to specify the upstream URL. + + -- Michael Biebl <biebl@debian.org> Fri, 28 Sep 2007 15:30:06 +0200 + +rsyslog (1.19.7-1) unstable; urgency=low + + * New upstream release. + * debian/patches/man_page_format.patch + - Fix a formatting glitch in the rsyslog.conf man page. + + -- Michael Biebl <biebl@debian.org> Tue, 25 Sep 2007 22:54:04 +0200 + +rsyslog (1.19.3-1) unstable; urgency=low + + * New upstream release. + + -- Michael Biebl <biebl@debian.org> Sun, 02 Sep 2007 20:15:02 +0200 + +rsyslog (1.19.2-1) unstable; urgency=low + + * New upstream release. + + * Enable the mysql output plugin and split it into a separate binary package + named rsyslog-mysql. Use the dbconfig-common framework to handle the + database administration. Generate a configuration file + /etc/rsyslog.d/mysql.conf with the values provided by dbconfig-common and + use ucf to manage this file. + * debian/control + - Add a build dependency on quilt and libmysqlclient15-dev. + - Add the binary package rsyslog-mysql. + - Add Suggests: rsyslog-mysql to the rsyslog package. + * debian/rules + - Include the quilt makefile and add calls to the patch/unpatch targets. + - Pass --enable-mysql to ./configure. + - Install the SQL schema file for dbconfig-common. + * debian/rsyslog-mysql.config + - Setup the default values for dbconfig-common. + * debian/rsyslog-mysql.{postinst,prerm,postrm} + - Include the dbconfig-common scripts and call the dbc_go function. + - Use ucf and ucfr to manage the generated configuration file mysql.conf. + * debian/patches/ignore_non_conf_files.patch + - Let rsyslog ignore all configuration files not ending with *.conf. + * debian/patches/no_create_db.patch + - The database creation is handled by dbconfig-common so we only need the + createDB.sql SQL schema file for setting up the tables. + * debian/patches/series + - Added, needed by quilt. Include the two patches above. + * debian/rsyslog-mysql.dirs + - Create the install directory for the SQL schema file. + * debian/rsyslog-mysql.install + - Install the mysql output plugin ommysql.so. + + -- Michael Biebl <biebl@debian.org> Sun, 02 Sep 2007 18:39:47 +0200 + +rsyslog (1.19.1-1) unstable; urgency=low + + * New upstream release. + + -- Michael Biebl <biebl@debian.org> Mon, 27 Aug 2007 19:17:14 +0200 + +rsyslog (1.18.2-1) unstable; urgency=low + + * Initial release. Closes: #435884 + + -- Michael Biebl <biebl@debian.org> Mon, 13 Aug 2007 19:20:48 +0200 + diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..45a4fb7 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +8 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..32a257b --- /dev/null +++ b/debian/control @@ -0,0 +1,160 @@ +Source: rsyslog +Section: admin +Priority: important +Maintainer: Michael Biebl <biebl@debian.org> +Build-Depends: debhelper (>= 8), + dpkg-dev (>= 1.16.1), + dh-autoreconf, + dh-systemd (>= 1.4), + zlib1g-dev, + libmysqlclient-dev, + libpq-dev, + libmongo-client-dev (>= 0.1.4), + libcurl4-gnutls-dev, + libkrb5-dev, + libgnutls-dev, + librelp-dev (>= 1.2.5), + libestr-dev (>= 0.1.9), + liblognorm-dev (>= 1.0.0), + liblogging-stdlog-dev (>= 1.0.3), + libjson-c-dev, + uuid-dev, + pkg-config, + bison +Standards-Version: 3.9.5 +Vcs-Git: git://git.debian.org/git/collab-maint/rsyslog.git +Vcs-Browser: http://git.debian.org/?p=collab-maint/rsyslog.git;a=summary +Homepage: http://www.rsyslog.com/ + +Package: rsyslog +Architecture: any +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), + initscripts (>= 2.88dsf-13.3) +Recommends: logrotate +Suggests: rsyslog-mysql | rsyslog-pgsql, + rsyslog-mongodb, + rsyslog-doc, + rsyslog-gnutls, + rsyslog-gssapi, + rsyslog-relp +Description: reliable system and kernel logging daemon + Rsyslog is a multi-threaded implementation of syslogd (a system utility + providing support for message logging), with features that include: + * reliable syslog over TCP, SSL/TLS and RELP + * on-demand disk buffering + * email alerting + * writing to MySQL or PostgreSQL databases (via separate output plugins) + * permitted sender lists + * filtering on any part of the syslog message + * on-the-wire message compression + * fine-grained output format control + * failover to backup destinations + * enterprise-class encrypted syslog relaying + . + It is the default syslogd on Debian systems. + +Package: rsyslog-doc +Section: doc +Priority: extra +Architecture: all +Breaks: rsyslog (<< 2.0.1-2) +Replaces: rsyslog (<< 2.0.1-2) +Depends: ${misc:Depends} +Suggests: doc-base, + www-browser +Description: documentation for rsyslog + This package contains detailed HTML documentation for rsyslog. + . + It describes the general configuration file syntax for filters, actions, + templates, etc, and has detailed information for all available configuration + directives. + +Package: rsyslog-mysql +Architecture: any +Priority: extra +Depends: ${shlibs:Depends}, + ${misc:Depends}, + rsyslog (= ${binary:Version}), + dbconfig-common, + ucf +Recommends: mysql-client +Suggests: mysql-server +Description: MySQL output plugin for rsyslog + This plugin allows rsyslog to write syslog messages into a MySQL database. + +Package: rsyslog-pgsql +Architecture: any +Priority: extra +Depends: ${shlibs:Depends}, + ${misc:Depends}, + rsyslog (= ${binary:Version}), + dbconfig-common, + ucf +Recommends: postgresql-client +Suggests: postgresql +Description: PostgreSQL output plugin for rsyslog + This plugin allows rsyslog to write syslog messages into a PostgreSQL + database. + +Package: rsyslog-mongodb +Architecture: any +Priority: extra +Depends: ${shlibs:Depends}, + ${misc:Depends}, + rsyslog (= ${binary:Version}), +Recommends: mongodb-server +Description: MongoDB output plugin for rsyslog + This plugin allows rsyslog to write syslog messages to MongoDB, a + scalable, high-performance, open source NoSQL database. + +Package: rsyslog-elasticsearch +Architecture: any +Priority: extra +Depends: ${shlibs:Depends}, + ${misc:Depends}, + rsyslog (= ${binary:Version}), +Description: Elasticsearch output plugin for rsyslog + This plugin allows rsyslog to write syslog messages to Elasticsearch, a + distributed, multitenant-capable full-text search engine with a RESTful web + interface and schema-free JSON documents. + +Package: rsyslog-gssapi +Architecture: any +Priority: extra +Depends: ${shlibs:Depends}, + ${misc:Depends}, + rsyslog (= ${binary:Version}) +Suggests: krb5-user +Description: GSSAPI authentication and encryption support for rsyslog + These plugins allow rsyslog to write and/or receive GSSAPI authenticated and + encrypted syslog messages. GSSAPI is commonly used for Kerberos + authentication. + +Package: rsyslog-gnutls +Architecture: any +Priority: extra +Depends: ${shlibs:Depends}, + ${misc:Depends}, + rsyslog (= ${binary:Version}) +Suggests: gnutls-bin +Description: TLS protocol support for rsyslog + This netstream plugin allows rsyslog to send and receive encrypted syslog + messages via the upcoming syslog-transport-tls IETF standard protocol. + +Package: rsyslog-relp +Architecture: any +Priority: extra +Depends: ${shlibs:Depends}, + ${misc:Depends}, + rsyslog (= ${binary:Version}) +Description: RELP protocol support for rsyslog + These plugins allow rsyslog to send and receive syslog messages via the + RELP protocol. RELP ensures reliable transport over the network even on + connection loss or if a peer becomes unavailable. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..b06c4fc --- /dev/null +++ b/debian/copyright @@ -0,0 +1,100 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: rsyslog +Source: http://www.rsyslog.com + +Files: * +Copyright: 2003-2012 Rainer Gerhards and Adiscon GmbH +License: GPL-3.0+ and Apache-2.0 + +Files: runtime/* +Copyright: 2003-2012 Rainer Gerhards and Adiscon GmbH +License: LGPL-3.0+ and Apache-2.0 + +Files: runtime/hashtable* +Copyright: 2002, 2004 Christopher Clark +License: BSD-3-clause + +Files: plugins/imklog/ksym* +Copyright: 1995, 1996 Dr. G.W. Wettstein <greg@wind.rmcc.com> + 1996 Enjellic Systems Development + 1998-2007 Martin Schulze <joey@infodrom.org> +License: GPL-3.0+ + +Files: debian/* +Copyright: 2007-2012 Michael Biebl <biebl@debian.org> +License: GPL-3.0+ + +License: Apache-2.0 + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + . + http://www.apache.org/licenses/LICENSE-2.0 + . + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + . + On Debian systems, the complete text of the Apache version 2.0 license + can be found in "/usr/share/common-licenses/Apache-2.0". + +License: LGPL-3.0+ + This package is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 3 of the License, or (at your option) any later version. + . + This package 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 + Lesser General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + . + On Debian systems, the complete text of the GNU Lesser General + Public License can be found in "/usr/share/common-licenses/LGPL-3" + +License: GPL-3.0+ + 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, either version 3 of the License, or + (at your option) any later version. + . + This package 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, see <http://www.gnu.org/licenses/>. + . + On Debian systems, the complete text of the GNU General + Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". + +License: BSD-3-clause + 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. Neither the name of the University nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 REGENTS OR CONTRIBUTORS 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. diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..32f2a1f --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,3 @@ +[DEFAULT] +pristine-tar = True +debian-branch = experimental diff --git a/debian/patches/0001-Don-t-create-a-database.patch b/debian/patches/0001-Don-t-create-a-database.patch new file mode 100644 index 0000000..be928d9 --- /dev/null +++ b/debian/patches/0001-Don-t-create-a-database.patch @@ -0,0 +1,42 @@ +From: Michael Biebl <biebl@debian.org> +Date: Thu, 13 Mar 2014 17:58:08 +0100 +Subject: Don't create a database + +dbconfig-common, which is used by rsyslog-mysql and rsyslog-pgsql, takes +care of creating the database for us. +--- + plugins/ommysql/createDB.sql | 6 ++---- + plugins/ompgsql/createDB.sql | 2 -- + 2 files changed, 2 insertions(+), 6 deletions(-) + +diff --git a/plugins/ommysql/createDB.sql b/plugins/ommysql/createDB.sql +index 211cfb0..1dc6f5c 100644 +--- a/plugins/ommysql/createDB.sql ++++ b/plugins/ommysql/createDB.sql +@@ -1,6 +1,4 @@ +-CREATE DATABASE Syslog; +-USE Syslog; +-CREATE TABLE SystemEvents ++CREATE TABLE IF NOT EXISTS SystemEvents + ( + ID int unsigned not null auto_increment primary key, + CustomerID bigint, +@@ -28,7 +26,7 @@ CREATE TABLE SystemEvents + SystemID int NULL + ); + +-CREATE TABLE SystemEventsProperties ++CREATE TABLE IF NOT EXISTS SystemEventsProperties + ( + ID int unsigned not null auto_increment primary key, + SystemEventID int NULL , +diff --git a/plugins/ompgsql/createDB.sql b/plugins/ompgsql/createDB.sql +index 2f72a0a..5dab0dd 100644 +--- a/plugins/ompgsql/createDB.sql ++++ b/plugins/ompgsql/createDB.sql +@@ -1,5 +1,3 @@ +-CREATE DATABASE 'Syslog' WITH ENCODING 'SQL_ASCII'; +-\c Syslog; + CREATE TABLE SystemEvents + ( + ID serial not null primary key, diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..a8e093a --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +0001-Don-t-create-a-database.patch diff --git a/debian/rsyslog-doc.doc-base b/debian/rsyslog-doc.doc-base new file mode 100644 index 0000000..390179b --- /dev/null +++ b/debian/rsyslog-doc.doc-base @@ -0,0 +1,9 @@ +Document: rsyslog-doc +Title: Rsyslog Documentation +Author: Rainer Gerhards +Abstract: This documentation covers the configuration of rsyslog. +Section: System/Administration + +Format: HTML +Index: /usr/share/doc/rsyslog-doc/html/manual.html +Files: /usr/share/doc/rsyslog-doc/html/*.html diff --git a/debian/rsyslog-doc.install b/debian/rsyslog-doc.install new file mode 100644 index 0000000..57a07f8 --- /dev/null +++ b/debian/rsyslog-doc.install @@ -0,0 +1,4 @@ +doc/*.html usr/share/doc/rsyslog-doc/html/ +doc/*.jpg usr/share/doc/rsyslog-doc/html/ +doc/*.png usr/share/doc/rsyslog-doc/html/ +doc/*.conf usr/share/doc/rsyslog-doc/html/ diff --git a/debian/rsyslog-elasticsearch.install b/debian/rsyslog-elasticsearch.install new file mode 100644 index 0000000..5173ef9 --- /dev/null +++ b/debian/rsyslog-elasticsearch.install @@ -0,0 +1 @@ +usr/lib/rsyslog/omelasticsearch.so diff --git a/debian/rsyslog-gnutls.install b/debian/rsyslog-gnutls.install new file mode 100644 index 0000000..c21a378 --- /dev/null +++ b/debian/rsyslog-gnutls.install @@ -0,0 +1 @@ +usr/lib/rsyslog/lmnsd_gtls.so diff --git a/debian/rsyslog-gssapi.install b/debian/rsyslog-gssapi.install new file mode 100644 index 0000000..156a84f --- /dev/null +++ b/debian/rsyslog-gssapi.install @@ -0,0 +1,3 @@ +usr/lib/rsyslog/imgssapi.so +usr/lib/rsyslog/lmgssutil.so +usr/lib/rsyslog/omgssapi.so diff --git a/debian/rsyslog-mongodb.README.Debian b/debian/rsyslog-mongodb.README.Debian new file mode 100644 index 0000000..2e9e583 --- /dev/null +++ b/debian/rsyslog-mongodb.README.Debian @@ -0,0 +1,41 @@ +How to use rsyslog and MongoDB +============================== + +rsyslog since version 6.1.3 is capable of using an output module called +“ommongodb” to write log messages to mongodb. To achieve this, make +sure the following packages are installed: + + mongodb-server + mongodb-clients + +After this, you need to make some adjustments to rsyslog.conf or better +use a separate config file like /etc/rsyslog.d/mongodb.conf which will +be included by the main config file. +You need to load the module of course and configure an action: + + module (load="ommongodb") + *.* action(type="ommongodb" server="127.0.0.1") + +In this case we send everything to the local MongoDB server. With the +default settings, this should work directly. No username or password is +needed if it isn’t configured in MongoDB. And the “db” and “collection” +will automatically be created. The default database that rsyslog will +use is “syslog” and the default name for the collection is “log“. These +can be changed by various parameters, like: + + *.* action(type="ommongodb" db="..." collection="..." template="...") + +To review what is written to the database, simply open a command line +and enter “mongo“. This is to open the MongoDB Shell. You now need to +change the database that is used with + + use syslog + +That way all further commands will be used on the database that rsyslog +uses. Next we let the shell show us the entries: + + db.log.find() + +Please make sure to use the exact command. Of course there are a lot of +other commands that you may find useful. Or information on how to secure +the database. Please refer to the MongoDB documentation for that. diff --git a/debian/rsyslog-mongodb.install b/debian/rsyslog-mongodb.install new file mode 100644 index 0000000..77e961a --- /dev/null +++ b/debian/rsyslog-mongodb.install @@ -0,0 +1 @@ +usr/lib/rsyslog/ommongodb.so diff --git a/debian/rsyslog-mysql.conf.template b/debian/rsyslog-mysql.conf.template new file mode 100644 index 0000000..ca9e477 --- /dev/null +++ b/debian/rsyslog-mysql.conf.template @@ -0,0 +1,5 @@ +### Configuration file for rsyslog-mysql +### Changes are preserved + +$ModLoad ommysql +*.* :ommysql:_DBC_DBSERVER_,_DBC_DBNAME_,_DBC_DBUSER_,_DBC_DBPASS_ diff --git a/debian/rsyslog-mysql.config b/debian/rsyslog-mysql.config new file mode 100644 index 0000000..392bd4a --- /dev/null +++ b/debian/rsyslog-mysql.config @@ -0,0 +1,18 @@ +#!/bin/sh +# config maintainer script for rsyslog-mysql + +set -e + +# source debconf stuff +. /usr/share/debconf/confmodule + +# source dbconfig-common shell library, and call the hook function +if [ -f /usr/share/dbconfig-common/dpkg/config.mysql ]; then + . /usr/share/dbconfig-common/dpkg/config.mysql + + dbc_dbname="Syslog" + dbc_dbuser="rsyslog" + + dbc_go rsyslog-mysql $@ +fi + diff --git a/debian/rsyslog-mysql.install b/debian/rsyslog-mysql.install new file mode 100644 index 0000000..2567bfa --- /dev/null +++ b/debian/rsyslog-mysql.install @@ -0,0 +1,2 @@ +usr/lib/rsyslog/ommysql.so +debian/rsyslog-mysql.conf.template usr/share/rsyslog-mysql/ diff --git a/debian/rsyslog-mysql.postinst b/debian/rsyslog-mysql.postinst new file mode 100644 index 0000000..49a8fdf --- /dev/null +++ b/debian/rsyslog-mysql.postinst @@ -0,0 +1,43 @@ +#!/bin/sh + +set -e + +# summary of how this script can be called: +# * <postinst> `configure' <most-recently-configured-version> +# * <old-postinst> `abort-upgrade' <new version> +# * <conflictor's-postinst> `abort-remove' `in-favour' <package> +# <new-version> +# * <postinst> `abort-remove' +# * <deconfigured's-postinst> `abort-deconfigure' `in-favour' +# <failed-install-package> <version> `removing' +# <conflicting-package> <version> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + +. /usr/share/debconf/confmodule +. /usr/share/dbconfig-common/dpkg/postinst.mysql + + +dbc_generate_include_args="-o template_infile=/usr/share/rsyslog-mysql/rsyslog-mysql.conf.template" +dbc_generate_include=template:/etc/rsyslog.d/mysql.conf +dbc_go rsyslog-mysql $@ + + +case "$1" in + configure) + ucfr rsyslog-mysql /etc/rsyslog.d/mysql.conf + + invoke-rc.d rsyslog restart + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + + +#DEBHELPER# diff --git a/debian/rsyslog-mysql.postrm b/debian/rsyslog-mysql.postrm new file mode 100644 index 0000000..103278e --- /dev/null +++ b/debian/rsyslog-mysql.postrm @@ -0,0 +1,53 @@ +#!/bin/sh + +set -e + +# summary of how this script can be called: +# * <postrm> `remove' +# * <postrm> `purge' +# * <old-postrm> `upgrade' <new-version> +# * <new-postrm> `failed-upgrade' <old-version> +# * <new-postrm> `abort-install' +# * <new-postrm> `abort-install' <old-version> +# * <new-postrm> `abort-upgrade' <old-version> +# * <disappearer's-postrm> `disappear' <overwriter> +# <overwriter-version> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +if [ -f /usr/share/debconf/confmodule ]; then + . /usr/share/debconf/confmodule +fi +if [ -f /usr/share/dbconfig-common/dpkg/postrm.mysql ]; then + . /usr/share/dbconfig-common/dpkg/postrm.mysql + dbc_go rsyslog-mysql $@ +fi + +case "$1" in + remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + ;; + purge) + CONFIGFILE=/etc/rsyslog.d/mysql.conf + + for ext in '~' '%' .bak .ucf-new .ucf-old .ucf-dist; do + rm -f $CONFIGFILE$ext + done + + rm -f $CONFIGFILE + + if which ucf >/dev/null; then + ucf --purge $CONFIGFILE + fi + if which ucfr >/dev/null; then + ucfr --purge rsyslog-mysql $CONFIGFILE + fi + ;; + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + + +#DEBHELPER# diff --git a/debian/rsyslog-mysql.prerm b/debian/rsyslog-mysql.prerm new file mode 100644 index 0000000..5a70d81 --- /dev/null +++ b/debian/rsyslog-mysql.prerm @@ -0,0 +1,10 @@ +#!/bin/sh + +set -e + +. /usr/share/debconf/confmodule +. /usr/share/dbconfig-common/dpkg/prerm.mysql + +dbc_go rsyslog-mysql $@ + +#DEBHELPER# diff --git a/debian/rsyslog-pgsql.conf.template b/debian/rsyslog-pgsql.conf.template new file mode 100644 index 0000000..1c97ea3 --- /dev/null +++ b/debian/rsyslog-pgsql.conf.template @@ -0,0 +1,5 @@ +### Configuration file for rsyslog-pgsql +### Changes are preserved + +$ModLoad ompgsql +*.* :ompgsql:_DBC_DBSERVER_,_DBC_DBNAME_,_DBC_DBUSER_,_DBC_DBPASS_ diff --git a/debian/rsyslog-pgsql.config b/debian/rsyslog-pgsql.config new file mode 100644 index 0000000..0daa3d4 --- /dev/null +++ b/debian/rsyslog-pgsql.config @@ -0,0 +1,18 @@ +#!/bin/sh +# config maintainer script for rsyslog-pgsql + +set -e + +# source debconf stuff +. /usr/share/debconf/confmodule + +# source dbconfig-common shell library, and call the hook function +if [ -f /usr/share/dbconfig-common/dpkg/config.pgsql ]; then + . /usr/share/dbconfig-common/dpkg/config.pgsql + + dbc_dbname="Syslog" + dbc_dbuser="rsyslog" + + dbc_go rsyslog-pgsql $@ +fi + diff --git a/debian/rsyslog-pgsql.install b/debian/rsyslog-pgsql.install new file mode 100644 index 0000000..9a9772e --- /dev/null +++ b/debian/rsyslog-pgsql.install @@ -0,0 +1,2 @@ +usr/lib/rsyslog/ompgsql.so +debian/rsyslog-pgsql.conf.template usr/share/rsyslog-pgsql/ diff --git a/debian/rsyslog-pgsql.postinst b/debian/rsyslog-pgsql.postinst new file mode 100644 index 0000000..77bb245 --- /dev/null +++ b/debian/rsyslog-pgsql.postinst @@ -0,0 +1,43 @@ +#!/bin/sh + +set -e + +# summary of how this script can be called: +# * <postinst> `configure' <most-recently-configured-version> +# * <old-postinst> `abort-upgrade' <new version> +# * <conflictor's-postinst> `abort-remove' `in-favour' <package> +# <new-version> +# * <postinst> `abort-remove' +# * <deconfigured's-postinst> `abort-deconfigure' `in-favour' +# <failed-install-package> <version> `removing' +# <conflicting-package> <version> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + +. /usr/share/debconf/confmodule +. /usr/share/dbconfig-common/dpkg/postinst.pgsql + + +dbc_generate_include_args="-o template_infile=/usr/share/rsyslog-pgsql/rsyslog-pgsql.conf.template" +dbc_generate_include=template:/etc/rsyslog.d/pgsql.conf +dbc_go rsyslog-pgsql $@ + + +case "$1" in + configure) + ucfr rsyslog-pgsql /etc/rsyslog.d/pgsql.conf + + invoke-rc.d rsyslog restart + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + + +#DEBHELPER# diff --git a/debian/rsyslog-pgsql.postrm b/debian/rsyslog-pgsql.postrm new file mode 100644 index 0000000..5de1fb3 --- /dev/null +++ b/debian/rsyslog-pgsql.postrm @@ -0,0 +1,53 @@ +#!/bin/sh + +set -e + +# summary of how this script can be called: +# * <postrm> `remove' +# * <postrm> `purge' +# * <old-postrm> `upgrade' <new-version> +# * <new-postrm> `failed-upgrade' <old-version> +# * <new-postrm> `abort-install' +# * <new-postrm> `abort-install' <old-version> +# * <new-postrm> `abort-upgrade' <old-version> +# * <disappearer's-postrm> `disappear' <overwriter> +# <overwriter-version> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +if [ -f /usr/share/debconf/confmodule ]; then + . /usr/share/debconf/confmodule +fi +if [ -f /usr/share/dbconfig-common/dpkg/postrm.pgsql ]; then + . /usr/share/dbconfig-common/dpkg/postrm.pgsql + dbc_go rsyslog-pgsql $@ +fi + +case "$1" in + remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + ;; + purge) + CONFIGFILE=/etc/rsyslog.d/pgsql.conf + + for ext in '~' '%' .bak .ucf-new .ucf-old .ucf-dist; do + rm -f $CONFIGFILE$ext + done + + rm -f $CONFIGFILE + + if which ucf >/dev/null; then + ucf --purge $CONFIGFILE + fi + if which ucfr >/dev/null; then + ucfr --purge rsyslog-pgsql $CONFIGFILE + fi + ;; + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + + +#DEBHELPER# diff --git a/debian/rsyslog-pgsql.prerm b/debian/rsyslog-pgsql.prerm new file mode 100644 index 0000000..e150dd3 --- /dev/null +++ b/debian/rsyslog-pgsql.prerm @@ -0,0 +1,10 @@ +#!/bin/sh + +set -e + +. /usr/share/debconf/confmodule +. /usr/share/dbconfig-common/dpkg/prerm.pgsql + +dbc_go rsyslog-pgsql $@ + +#DEBHELPER# diff --git a/debian/rsyslog-relp.install b/debian/rsyslog-relp.install new file mode 100644 index 0000000..895429a --- /dev/null +++ b/debian/rsyslog-relp.install @@ -0,0 +1,2 @@ +usr/lib/rsyslog/imrelp.so +usr/lib/rsyslog/omrelp.so diff --git a/debian/rsyslog.conf b/debian/rsyslog.conf new file mode 100644 index 0000000..0e33f48 --- /dev/null +++ b/debian/rsyslog.conf @@ -0,0 +1,121 @@ +# /etc/rsyslog.conf Configuration file for rsyslog. +# +# For more information see +# /usr/share/doc/rsyslog-doc/html/rsyslog_conf.html + + +################# +#### MODULES #### +################# + +$ModLoad imuxsock # provides support for local system logging +$ModLoad imklog # provides kernel logging support +#$ModLoad immark # provides --MARK-- message capability + +# provides UDP syslog reception +#$ModLoad imudp +#$UDPServerRun 514 + +# provides TCP syslog reception +#$ModLoad imtcp +#$InputTCPServerRun 514 + + +########################### +#### GLOBAL DIRECTIVES #### +########################### + +# +# Use traditional timestamp format. +# To enable high precision timestamps, comment out the following line. +# +$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat + +# +# Set the default permissions for all log files. +# +$FileOwner root +$FileGroup adm +$FileCreateMode 0640 +$DirCreateMode 0755 +$Umask 0022 + +# +# Where to place spool and state files +# +$WorkDirectory /var/spool/rsyslog + +# +# 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 :omusrmsg:* + +# +# 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 --git a/debian/rsyslog.default b/debian/rsyslog.default new file mode 100644 index 0000000..8ec3ea0 --- /dev/null +++ b/debian/rsyslog.default @@ -0,0 +1,4 @@ +# Options for rsyslogd +# -x disables DNS lookups for remote messages +# See rsyslogd(8) for more details +RSYSLOGD_OPTIONS="" diff --git a/debian/rsyslog.dirs b/debian/rsyslog.dirs new file mode 100644 index 0000000..5ef1d18 --- /dev/null +++ b/debian/rsyslog.dirs @@ -0,0 +1,2 @@ +/etc/rsyslog.d/ +/var/spool/rsyslog/ diff --git a/debian/rsyslog.docs b/debian/rsyslog.docs new file mode 100644 index 0000000..62deb04 --- /dev/null +++ b/debian/rsyslog.docs @@ -0,0 +1 @@ +AUTHORS diff --git a/debian/rsyslog.init b/debian/rsyslog.init new file mode 100644 index 0000000..0389df6 --- /dev/null +++ b/debian/rsyslog.init @@ -0,0 +1,126 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: rsyslog +# Required-Start: $remote_fs $time +# Required-Stop: umountnfs $time +# X-Stop-After: sendsigs +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: enhanced syslogd +# Description: Rsyslog is an enhanced multi-threaded syslogd. +# It is quite compatible to stock sysklogd and can be +# used as a drop-in replacement. +### END INIT INFO + +# +# Author: Michael Biebl <biebl@debian.org> +# + +# PATH should only include /usr/* if it runs after the mountnfs.sh script +PATH=/sbin:/usr/sbin:/bin:/usr/bin +DESC="enhanced syslogd" +NAME=rsyslog + +RSYSLOGD=rsyslogd +DAEMON=/usr/sbin/rsyslogd +PIDFILE=/var/run/rsyslogd.pid + +SCRIPTNAME=/etc/init.d/$NAME + +# Exit if the package is not installed +[ -x "$DAEMON" ] || exit 0 + +# Read configuration variable file if it is present +[ -r /etc/default/$NAME ] && . /etc/default/$NAME + +# Define LSB log_* functions. +. /lib/lsb/init-functions + +do_start() +{ + # Return + # 0 if daemon has been started + # 1 if daemon was already running + # other if daemon could not be started or a failure occured + start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- $RSYSLOGD_OPTIONS +} + +do_stop() +{ + # Return + # 0 if daemon has been stopped + # 1 if daemon was already stopped + # other if daemon could not be stopped or a failure occurred + start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --exec $DAEMON +} + +# +# Tell rsyslogd to close all open files +# +do_rotate() { + start-stop-daemon --stop --signal HUP --quiet --pidfile $PIDFILE --exec $DAEMON +} + +create_xconsole() { + XCONSOLE=/dev/xconsole + if [ "$(uname -s)" != "Linux" ]; then + XCONSOLE=/run/xconsole + ln -sf $XCONSOLE /dev/xconsole + fi + if [ ! -e $XCONSOLE ]; then + mknod -m 640 $XCONSOLE p + chown root:adm $XCONSOLE + [ -x /sbin/restorecon ] && /sbin/restorecon $XCONSOLE + fi +} + +sendsigs_omit() { + OMITDIR=/run/sendsigs.omit.d + mkdir -p $OMITDIR + ln -sf $PIDFILE $OMITDIR/rsyslog +} + +case "$1" in + start) + log_daemon_msg "Starting $DESC" "$RSYSLOGD" + create_xconsole + do_start + case "$?" in + 0) sendsigs_omit + log_end_msg 0 ;; + 1) log_progress_msg "already started" + log_end_msg 0 ;; + *) log_end_msg 1 ;; + esac + + ;; + stop) + log_daemon_msg "Stopping $DESC" "$RSYSLOGD" + do_stop + case "$?" in + 0) log_end_msg 0 ;; + 1) log_progress_msg "already stopped" + log_end_msg 0 ;; + *) log_end_msg 1 ;; + esac + + ;; + rotate) + log_daemon_msg "Closing open files" "$RSYSLOGD" + do_rotate + log_end_msg $? + ;; + restart|force-reload) + $0 stop + $0 start + ;; + status) + status_of_proc -p $PIDFILE $DAEMON $RSYSLOGD && exit 0 || exit $? + ;; + *) + echo "Usage: $SCRIPTNAME {start|stop|rotate|restart|force-reload|status}" >&2 + exit 3 + ;; +esac + +: diff --git a/debian/rsyslog.install b/debian/rsyslog.install new file mode 100644 index 0000000..e19143c --- /dev/null +++ b/debian/rsyslog.install @@ -0,0 +1,31 @@ +debian/rsyslog.conf etc/ +debian/xconsole.conf usr/lib/tmpfiles.d/ +usr/sbin/ +usr/share/man/ +usr/lib/rsyslog/imfile.so +usr/lib/rsyslog/imklog.so +usr/lib/rsyslog/immark.so +usr/lib/rsyslog/impstats.so +usr/lib/rsyslog/imtcp.so +usr/lib/rsyslog/imudp.so +usr/lib/rsyslog/imuxsock.so +usr/lib/rsyslog/lmnet.so +usr/lib/rsyslog/lmnetstrms.so +usr/lib/rsyslog/lmnsd_ptcp.so +usr/lib/rsyslog/lmregexp.so +usr/lib/rsyslog/lmstrmsrv.so +usr/lib/rsyslog/lmtcpclt.so +usr/lib/rsyslog/lmtcpsrv.so +usr/lib/rsyslog/lmzlibw.so +usr/lib/rsyslog/mmanon.so +usr/lib/rsyslog/mmnormalize.so +usr/lib/rsyslog/mmjsonparse.so +usr/lib/rsyslog/mmutf8fix.so +usr/lib/rsyslog/mmpstrucdata.so +usr/lib/rsyslog/mmsequence.so +usr/lib/rsyslog/ommail.so +usr/lib/rsyslog/omprog.so +usr/lib/rsyslog/omuxsock.so +usr/lib/rsyslog/omruleset.so +usr/lib/rsyslog/pm*.so +lib/systemd/system/rsyslog.service diff --git a/debian/rsyslog.lintian-overrides b/debian/rsyslog.lintian-overrides new file mode 100644 index 0000000..f29fa4a --- /dev/null +++ b/debian/rsyslog.lintian-overrides @@ -0,0 +1 @@ +rsyslog: init.d-script-missing-dependency-on-remote_fs /etc/init.d/rsyslog: required-stop diff --git a/debian/rsyslog.logcheck.ignore.server b/debian/rsyslog.logcheck.ignore.server new file mode 100644 index 0000000..171f20e --- /dev/null +++ b/debian/rsyslog.logcheck.ignore.server @@ -0,0 +1,5 @@ +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ kernel: imklog [0-9.]+, log source = /proc/kmsg started.$ +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ kernel: Kernel logging \(proc\) stopped.$ +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ rsyslogd: \[origin software="rsyslogd" swVersion="[0-9.]+" x-pid="[0-9]+" x-info="http://www.rsyslog.com"\] start$ +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ rsyslogd: \[origin software="rsyslogd" swVersion="[0-9.]+" x-pid="[0-9]+" x-info="http://www.rsyslog.com"\] exiting on signal [0-9]+.$ +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ rsyslogd: \[origin software="rsyslogd" swVersion="[0-9.]+" x-pid="[0-9]+" x-info="http://www.rsyslog.com"\] rsyslogd was HUPed$ diff --git a/debian/rsyslog.logrotate b/debian/rsyslog.logrotate new file mode 100644 index 0000000..d75287c --- /dev/null +++ b/debian/rsyslog.logrotate @@ -0,0 +1,37 @@ +/var/log/syslog +{ + rotate 7 + daily + missingok + notifempty + delaycompress + compress + postrotate + invoke-rc.d rsyslog rotate > /dev/null + endscript +} + +/var/log/mail.info +/var/log/mail.warn +/var/log/mail.err +/var/log/mail.log +/var/log/daemon.log +/var/log/kern.log +/var/log/auth.log +/var/log/user.log +/var/log/lpr.log +/var/log/cron.log +/var/log/debug +/var/log/messages +{ + rotate 4 + weekly + missingok + notifempty + compress + delaycompress + sharedscripts + postrotate + invoke-rc.d rsyslog rotate > /dev/null + endscript +} diff --git a/debian/rsyslog.postinst b/debian/rsyslog.postinst new file mode 100644 index 0000000..7bcc66f --- /dev/null +++ b/debian/rsyslog.postinst @@ -0,0 +1,37 @@ +#!/bin/sh + +set -e + +# summary of how this script can be called: +# * <postinst> `configure' <most-recently-configured-version> +# * <old-postinst> `abort-upgrade' <new version> +# * <conflictor's-postinst> `abort-remove' `in-favour' <package> +# <new-version> +# * <postinst> `abort-remove' +# * <deconfigured's-postinst> `abort-deconfigure' `in-favour' +# <failed-install-package> <version> `removing' +# <conflicting-package> <version> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + +case "$1" in + configure) + # /run transition (Bug: #633036) + if dpkg --compare-versions "$2" lt "5.8.2-2"; then + rm -f /lib/init/rw/sendsigs.omit.d/rsyslog + fi + + # Fix permissions of the spool/work directory (Bug: #693099) + chmod 700 /var/spool/rsyslog + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# diff --git a/debian/rsyslog.postrm b/debian/rsyslog.postrm new file mode 100644 index 0000000..e50a4f0 --- /dev/null +++ b/debian/rsyslog.postrm @@ -0,0 +1,18 @@ +#!/bin/sh + +set -e + +if [ "$1" = "remove" ]; then + [ -f /etc/logrotate.d/rsyslog ] && mv -f /etc/logrotate.d/rsyslog /etc/logrotate.d/rsyslog.disabled +fi + +if [ "$1" = "purge" -o "$1" = "disappear" ]; then + [ -f /etc/logrotate.d/rsyslog.disabled ] && rm -f /etc/logrotate.d/rsyslog.disabled +fi + +if [ "$1" = "remove" ]; then + # Cleanup sendsigs omit file to avoid false positives from piuparts + rm -f /run/sendsigs.omit.d/rsyslog +fi + +#DEBHELPER# diff --git a/debian/rsyslog.preinst b/debian/rsyslog.preinst new file mode 100644 index 0000000..18897fc --- /dev/null +++ b/debian/rsyslog.preinst @@ -0,0 +1,13 @@ +#!/bin/sh + +set -e + +if [ "$1" = "install" -a -n "$2" ] ; then + [ -f /etc/logrotate.d/rsyslog.disabled ] && mv -f /etc/logrotate.d/rsyslog.disabled /etc/logrotate.d/rsyslog +fi + +if [ "$1" = "upgrade" ] && dpkg --compare-versions "$2" lt "5.7.8-1" ; then + rm -f /etc/systemd/system/sockets.target.wants/rsyslog.socket +fi + +#DEBHELPER# diff --git a/debian/rsyslog.prerm b/debian/rsyslog.prerm new file mode 100644 index 0000000..503b849 --- /dev/null +++ b/debian/rsyslog.prerm @@ -0,0 +1,10 @@ +#!/bin/sh + +set -e + +# Stop the socket on remove so rsyslog is not restarted via socket activation +if [ -d /run/systemd/system ] && [ "$1" = remove ] ; then + systemctl stop syslog.socket || true +fi + +#DEBHELPER# diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..3c94bd3 --- /dev/null +++ b/debian/rules @@ -0,0 +1,67 @@ +#!/usr/bin/make -f + +DPKG_EXPORT_BUILDFLAGS = 1 +include /usr/share/dpkg/buildflags.mk + +DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) + +%: + dh $@ --with autoreconf,systemd + +ifeq ($(DEB_HOST_ARCH_OS), linux) +confflags += --enable-imptcp \ + --enable-kmsg +endif + +override_dh_auto_configure: + dh_auto_configure -- \ + $(confflags) \ + --enable-mysql \ + --enable-pgsql \ + --enable-ommongodb \ + --enable-elasticsearch \ + --enable-mail \ + --enable-imfile \ + --enable-impstats \ + --enable-klog \ + --enable-gssapi-krb5 \ + --enable-gnutls \ + --enable-relp \ + --enable-pmaixforwardedfrom \ + --enable-pmcisconames \ + --enable-pmlastmsg \ + --enable-pmrfc3164sd \ + --enable-pmsnare \ + --enable-omprog \ + --enable-omuxsock \ + --enable-mmanon \ + --enable-mmnormalize \ + --enable-mmjsonparse \ + --enable-mmutf8fix \ + --enable-mmpstrucdata \ + --enable-mmsequence \ + --disable-libgcrypt \ + --disable-testbench \ + --with-systemdsystemunitdir=/lib/systemd/system + +override_dh_auto_install: + dh_auto_install + install --mode=644 -D plugins/ommysql/createDB.sql \ + debian/rsyslog-mysql/usr/share/dbconfig-common/data/rsyslog-mysql/install/mysql + install --mode=644 -D plugins/ompgsql/createDB.sql \ + debian/rsyslog-pgsql/usr/share/dbconfig-common/data/rsyslog-pgsql/install/pgsql + +override_dh_install: + dh_install -X .la --list-missing +ifeq ($(DEB_HOST_ARCH_OS), linux) + install --mode=644 debian/tmp/usr/lib/rsyslog/imkmsg.so \ + debian/rsyslog/usr/lib/rsyslog/ + install --mode=644 debian/tmp/usr/lib/rsyslog/imptcp.so \ + debian/rsyslog/usr/lib/rsyslog/ +endif + +override_dh_compress: + dh_compress -X rsyslog-example.conf + +override_dh_installinit: + dh_installinit -R diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..dd306eb --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://rsyslog.com/downloads/download-v8-stable/ .*/rsyslog-([\d\.]*)\.tar\.gz diff --git a/debian/xconsole.conf b/debian/xconsole.conf new file mode 100644 index 0000000..f4aecd3 --- /dev/null +++ b/debian/xconsole.conf @@ -0,0 +1 @@ +p /dev/xconsole 0640 root adm |