Merge branch 'master' of git://anonscm.debian.org/collab-maint/rsyslog

Conflicts:
	debian/changelog
	debian/patches/series
	debian/rules

24 files changed, 308 insertions, 393 deletions

diff --git a/debian/changelog b/debian/changelog
index 2d40071..07fcdec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,197 @@
+rsyslog (8.4.1-1) unstable; urgency=high
+
+  * New upstream release.
+   - CVE-2014-3634: Fix remote syslog vulnerability due to improper
+     handling of invalid PRI values.
+  * Drop patches which have been merged upstream.
+  * Urgency high for the security fix.
+
+ -- Michael Biebl <biebl@debian.org>  Tue, 30 Sep 2014 12:35:33 +0200
+
+rsyslog (8.4.0-2) unstable; urgency=medium
+
+  * Tweak rsyslog systemd service file. Add Documentation field and restart
+    the rsyslogd daemon on failures.
+  * Cherry-pick upstream patch to fix build failures on platforms without
+    atomic instructions.
+
+ -- Michael Biebl <biebl@debian.org>  Wed, 20 Aug 2014 19:36:33 +0200
+
+rsyslog (8.4.0-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Update patches:
+    - Refresh 0001-Don-t-create-a-database.patch.
+    - Drop 0002-Fix-pidfile-location.patch, merged upstream.
+  * Add --disable-generate-man-pages to configure flags to avoid a build
+    dependency on python-docutils. We don't ship the generated man pages
+    anyway.
+  * Add support for external message modification modules which are bound via
+    the new native mmexternal module.
+
+ -- Michael Biebl <biebl@debian.org>  Mon, 18 Aug 2014 18:28:20 +0200
+
+rsyslog (8.2.2-5) unstable; urgency=medium
+
+  * Make sure to actually only create the temporary syslog.service symlink on
+    upgrades and avoid the usage of readlink.
+
+ -- Michael Biebl <biebl@debian.org>  Mon, 18 Aug 2014 02:43:31 +0200
+
+rsyslog (8.2.2-4) unstable; urgency=medium
+
+  * Fix wheezy → jessie upgrade failure when running under systemd due to the
+    syslog.service symlink temporarily being missing.
+
+ -- Michael Biebl <biebl@debian.org>  Mon, 18 Aug 2014 00:39:03 +0200
+
+rsyslog (8.2.2-3) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Michael Biebl <biebl@debian.org>  Sun, 29 Jun 2014 14:40:56 +0200
+
+rsyslog (8.2.2-2) experimental; urgency=medium
+
+  * Merge changes from unstable branch.
+
+ -- Michael Biebl <biebl@debian.org>  Mon, 23 Jun 2014 13:52:12 +0200
+
+rsyslog (8.2.2-1) experimental; urgency=medium
+
+  * New major upstream release.
+    - Rewritten core engine providing higher performance and better
+      scalability with complex configurations.
+    - Simplified script execution.
+    - Global variable support.
+    - Output part was revamped completely and required changes to all output
+      modules.
+    - Support for external plugins which can be written in any language.
+  * 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.
+  * Drop the omruleset module which has been deprecated and replaced by the
+    much more efficient RainerScript "call" statement.
+  * Remove the rsyslog-doc package which is now built from a separate source
+    package.
+  * Fix pidfile location. The pidfile should be stored in /var/run, not /etc.
+
+ -- Michael Biebl <biebl@debian.org>  Mon, 09 Jun 2014 21:16:19 +0200
+
+rsyslog (7.6.3-3) unstable; urgency=medium
+
+  * Build against libgnutls28-dev. (Closes: #752304)
+  * Use canonical URIs for Vcs-* fields.
+
+ -- Michael Biebl <biebl@debian.org>  Mon, 23 Jun 2014 13:44:55 +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+dyson2) unstable; urgency=low
 
   * Added dependency on /etc/rsyslog.confin SMF service and thus support for
diff --git a/debian/control b/debian/control
index 5461373..ca0e0e3 100644
--- a/debian/control
+++ b/debian/control
@@ -5,23 +5,25 @@ 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.0.3),
-               libestr-dev (>= 0.1.5),
-               libee-dev (>= 0.4.0),
-               liblognorm-dev (>= 0.3.1),
-               libjson0-dev,
+               libgnutls28-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.4
-Vcs-Git: git://git.debian.org/git/collab-maint/rsyslog.git
-Vcs-Browser: http://git.debian.org/?p=collab-maint/rsyslog.git;a=summary
+Standards-Version: 3.9.5
+Vcs-Git: git://anonscm.debian.org/collab-maint/rsyslog.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/rsyslog.git;a=summary
 Homepage: http://www.rsyslog.com/
 
 Package: rsyslog
@@ -59,22 +61,6 @@ Description: reliable system and kernel logging daemon
  .
  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
@@ -86,7 +72,7 @@ Depends: ${shlibs:Depends},
 Recommends: mysql-client
 Suggests: mysql-server
 Description: MySQL output plugin for rsyslog
- This plugin allows rsyslog to write the syslog messages into a MySQL database.
+ This plugin allows rsyslog to write syslog messages into a MySQL database.
 
 Package: rsyslog-pgsql
 Architecture: any
@@ -99,7 +85,7 @@ Depends: ${shlibs:Depends},
 Recommends: postgresql-client
 Suggests: postgresql
 Description: PostgreSQL output plugin for rsyslog
- This plugin allows rsyslog to write the syslog messages into a PostgreSQL
+ This plugin allows rsyslog to write syslog messages into a PostgreSQL
  database.
 
 Package: rsyslog-mongodb
@@ -110,9 +96,20 @@ Depends: ${shlibs:Depends},
          rsyslog (= ${binary:Version}),
 Recommends: mongodb-server
 Description: MongoDB output plugin for rsyslog
- This plugin allows rsyslog to write the syslog messages to MongoDB, a
+ 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
@@ -143,6 +140,6 @@ Depends: ${shlibs:Depends},
          ${misc:Depends},
          rsyslog (= ${binary:Version})
 Description: RELP protocol support for rsyslog
- These plugins allows rsyslog to send and receive syslog messages via the
+ 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/patches/0001-Don-t-create-a-database.patch b/debian/patches/0001-Don-t-create-a-database.patch
new file mode 100644
index 0000000..b499376
--- /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 0c0f7e1..5dab0dd 100644
+--- a/plugins/ompgsql/createDB.sql
++++ b/plugins/ompgsql/createDB.sql
+@@ -1,5 +1,3 @@
+-CREATE DATABASE "Syslog" WITH ENCODING 'SQL_ASCII' TEMPLATE template0;
+-\c Syslog;
+ CREATE TABLE SystemEvents
+ (
+         ID serial not null primary key,
diff --git a/debian/patches/01-dont_create_db.patch b/debian/patches/01-dont_create_db.patch
deleted file mode 100644
index efd0c75..0000000
--- a/debian/patches/01-dont_create_db.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: rsyslog/plugins/ommysql/createDB.sql
-===================================================================
---- rsyslog.orig/plugins/ommysql/createDB.sql	2007-12-12 18:18:29.000000000 +0100
-+++ rsyslog/plugins/ommysql/createDB.sql	2008-02-12 16:03:04.000000000 +0100
-@@ -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 @@
-         SystemID int NULL
- );
- 
--CREATE TABLE SystemEventsProperties
-+CREATE TABLE IF NOT EXISTS SystemEventsProperties
- (
-         ID int unsigned not null auto_increment primary key,
-         SystemEventID int NULL ,
-Index: rsyslog/plugins/ompgsql/createDB.sql
-===================================================================
---- rsyslog.orig/plugins/ompgsql/createDB.sql	2007-12-12 18:18:29.000000000 +0100
-+++ rsyslog/plugins/ompgsql/createDB.sql	2008-02-12 16:03:04.000000000 +0100
-@@ -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
index abf808c..4a52108 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-# Debian patches for rsyslog
-dyson-imuxsock.patch
-01-dont_create_db.patch
+0001-Don-t-create-a-database.patch
 dyson-imsolaris-no-libdoor.patch
+dyson-imuxsock.patch
diff --git a/debian/rsyslog-doc.doc-base b/debian/rsyslog-doc.doc-base
deleted file mode 100644
index 390179b..0000000
--- a/debian/rsyslog-doc.doc-base
+++ /dev/null
@@ -1,9 +0,0 @@
-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.examples b/debian/rsyslog-doc.examples
deleted file mode 100644
index 7ca2e48..0000000
--- a/debian/rsyslog-doc.examples
+++ /dev/null
@@ -1 +0,0 @@
-debian/sample.conf
diff --git a/debian/rsyslog-doc.install b/debian/rsyslog-doc.install
deleted file mode 100644
index 57a07f8..0000000
--- a/debian/rsyslog-doc.install
+++ /dev/null
@@ -1,4 +0,0 @@
-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-mysql.postinst b/debian/rsyslog-mysql.postinst
index 2e08b9b..49a8fdf 100644
--- a/debian/rsyslog-mysql.postinst
+++ b/debian/rsyslog-mysql.postinst
@@ -41,5 +41,3 @@ esac
 
 
 #DEBHELPER#
-
-exit 0
diff --git a/debian/rsyslog-mysql.postrm b/debian/rsyslog-mysql.postrm
index be625a5..103278e 100644
--- a/debian/rsyslog-mysql.postrm
+++ b/debian/rsyslog-mysql.postrm
@@ -51,5 +51,3 @@ esac
 
 
 #DEBHELPER#
-
-exit 0
diff --git a/debian/rsyslog-mysql.prerm b/debian/rsyslog-mysql.prerm
index 2c8d719..5a70d81 100644
--- a/debian/rsyslog-mysql.prerm
+++ b/debian/rsyslog-mysql.prerm
@@ -8,5 +8,3 @@ set -e
 dbc_go rsyslog-mysql $@
 
 #DEBHELPER#
-
-exit 0
diff --git a/debian/rsyslog-pgsql.postinst b/debian/rsyslog-pgsql.postinst
index c11dd5a..77bb245 100644
--- a/debian/rsyslog-pgsql.postinst
+++ b/debian/rsyslog-pgsql.postinst
@@ -41,5 +41,3 @@ esac
 
 
 #DEBHELPER#
-
-exit 0
diff --git a/debian/rsyslog-pgsql.postrm b/debian/rsyslog-pgsql.postrm
index d48ff21..5de1fb3 100644
--- a/debian/rsyslog-pgsql.postrm
+++ b/debian/rsyslog-pgsql.postrm
@@ -51,5 +51,3 @@ esac
 
 
 #DEBHELPER#
-
-exit 0
diff --git a/debian/rsyslog-pgsql.prerm b/debian/rsyslog-pgsql.prerm
index 02d4ed4..e150dd3 100644
--- a/debian/rsyslog-pgsql.prerm
+++ b/debian/rsyslog-pgsql.prerm
@@ -8,5 +8,3 @@ set -e
 dbc_go rsyslog-pgsql $@
 
 #DEBHELPER#
-
-exit 0
diff --git a/debian/rsyslog.install b/debian/rsyslog.install
index a94fc1d..084c5bd 100644
--- a/debian/rsyslog.install
+++ b/debian/rsyslog.install
@@ -17,11 +17,14 @@ usr/lib/rsyslog/lmtcpclt.so
 usr/lib/rsyslog/lmtcpsrv.so
 usr/lib/rsyslog/lmzlibw.so
 usr/lib/rsyslog/mmanon.so
+usr/lib/rsyslog/mmexternal.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.links b/debian/rsyslog.links
deleted file mode 100644
index c9d3179..0000000
--- a/debian/rsyslog.links
+++ /dev/null
@@ -1,2 +0,0 @@
-lib/systemd/system/rsyslog.service etc/systemd/system/multi-user.target.wants/rsyslog.service
-lib/systemd/system/rsyslog.service etc/systemd/system/syslog.service
diff --git a/debian/rsyslog.postinst b/debian/rsyslog.postinst
index a4fb3a0..da1554a 100644
--- a/debian/rsyslog.postinst
+++ b/debian/rsyslog.postinst
@@ -23,6 +23,11 @@ case "$1" in
 
 	# Fix permissions of the spool/work directory (Bug: #693099)
 	chmod 700 /var/spool/rsyslog
+
+	# Clean up temporary syslog.service symlink
+	if [ -d /run/systemd/system ] &&  dpkg --compare-versions "$2" lt-nl "7.4.1-2" ; then
+		rm -f /run/systemd/system/syslog.service
+	fi
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
@@ -34,7 +39,4 @@ case "$1" in
     ;;
 esac
 
-
 #DEBHELPER#
-
-exit 0
diff --git a/debian/rsyslog.postrm b/debian/rsyslog.postrm
index 4d7ae11..f418ca3 100644
--- a/debian/rsyslog.postrm
+++ b/debian/rsyslog.postrm
@@ -6,7 +6,7 @@ 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" = "dissappear" ]; then
+if [ "$1" = "purge" ] || [ "$1" = "disappear" ]; then
 	[ -f /etc/logrotate.d/rsyslog.disabled ] && rm -f /etc/logrotate.d/rsyslog.disabled
 fi
 
@@ -16,5 +16,3 @@ if [ "$1" = "remove" ]; then
 fi
 
 #DEBHELPER#
-
-exit 0
diff --git a/debian/rsyslog.preinst b/debian/rsyslog.preinst
index fce810f..8058953 100644
--- a/debian/rsyslog.preinst
+++ b/debian/rsyslog.preinst
@@ -2,7 +2,7 @@
 
 set -e
 
-if [ "$1" = "install" -a -n "$2" ] ; then
+if [ "$1" = "install" ] && [ -n "$2" ] ; then
 	[ -f /etc/logrotate.d/rsyslog.disabled ] && mv -f /etc/logrotate.d/rsyslog.disabled /etc/logrotate.d/rsyslog
 fi
 
@@ -10,6 +10,16 @@ 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#
+# In wheezy we ship the syslog.service symlink directly in the package, in
+# jessie we use init-system-helpers to create it dynamically in postinst.
+# During the upgrade there is a time frame when the symlink does not exist.
+# If systemd is reloaded at this point, it loses track of the rsyslogd process.
+# To work around this problem, create a (runtime) copy of the syslog.service
+# symlink before the upgrade and remove it again afterwards. See #724796
+if [ "$1" = "upgrade" ] && dpkg --compare-versions "$2" lt "7.4.1-2" ; then
+	if [ -d /run/systemd/system ] && [ -L /etc/systemd/system/syslog.service ] ; then
+		ln -sf /lib/systemd/system/rsyslog.service /run/systemd/system/syslog.service
+	fi
+fi
 
-exit 0
+#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
index 9e03c84..f41acfe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,11 +6,12 @@ include /usr/share/dpkg/buildflags.mk
 DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 
 %:
-	dh $@ --with autoreconf
+	dh $@ --with autoreconf,systemd
 
 ifeq ($(DEB_HOST_ARCH_OS), linux)
 confflags += 	--enable-imptcp \
-		--enable-kmsg
+		--enable-kmsg \
+		--with-systemdsystemunitdir=/lib/systemd/system
 endif
 
 ifeq (illumos,$(DEB_HOST_ARCH_OS))
@@ -23,6 +24,7 @@ override_dh_auto_configure:
 		--enable-mysql \
 		--enable-pgsql \
 		--enable-ommongodb \
+		--enable-elasticsearch \
 		--enable-mail \
 		--enable-imfile \
 		--enable-impstats \
@@ -40,10 +42,13 @@ override_dh_auto_configure:
 		--enable-mmanon \
 		--enable-mmnormalize \
 		--enable-mmjsonparse \
+		--enable-mmutf8fix \
+		--enable-mmpstrucdata \
+		--enable-mmsequence \
 		--disable-libgcrypt \
 		--disable-testbench \
-		$(confflags) \
-		--with-systemdsystemunitdir=/lib/systemd/system
+		--disable-generate-man-pages \
+		$(confflags)
 
 override_dh_auto_install:
 	dh_auto_install
@@ -75,8 +80,5 @@ else
 	echo '$$ModLoad imklog' > debian/rsyslog/etc/rsyslog.d/00-load-imklog.conf
 endif
 
-override_dh_compress:
-	dh_compress -X rsyslog-example.conf
-
 override_dh_installinit:
 	dh_installinit -R
diff --git a/debian/sample.conf b/debian/sample.conf
deleted file mode 100644
index a27de0c..0000000
--- a/debian/sample.conf
+++ /dev/null
@@ -1,284 +0,0 @@
-# This is a sample configuation file for rsyslogd. See the
-# doc/manual.html for details. If you can not find the
-# manual set, please visit
-#
-#    http://www.rsyslog.com/doc/
-#
-# to obtain it online.
-#
-# WARNING: We do NOT keep the comments in this file always
-#          up to date. Be sure to consult the doc set that
-#          came with your package, especially the file on
-#          rsyslog.conf - it probably has some better information
-#          than is provided here in comments. The main purpose
-#          of sample.conf is to show you some actual directives,
-#	   not to be the authorative doc source.
-#
-# Please note that rsyslogd by default
-# reads /etc/rsyslogd.conf (and NOT /etc/syslogd.conf!).
-#
-# A commented sample configuration. More a man page than a real
-# sample ;)
-#
-# We try to keep things as consistent with existing syslog implementation
-# as possible. We use "$" to start lines that contain new directives.
-
-# We limit who can send us messages:
-$AllowedSender UDP, 192.0.2.0/24, 10.0.0.1  # all machines in 192.0.2 as well as 10.0.0.1
-$AllowedSender TCP, 10.0.0.1 # for TCP, we allow only 10.0.0.1
-# remove the AllowedSender directives if you do not want to limit
-# who can send rsyslogd messages (not recommended)
-
-# Templates are a key feature of rsyslog. They allow to specify any
-# format a user might want. Every output in rsyslog uses templates - this
-# holds true for files, user messages and so on. The database writer
-# expects its template to be a proper SQL statement - so this is highly
-# customizable too. You might ask how does all of this work when no templates
-# at all are specified. Good question ;) The answer is simple, though. Templates
-# compatible with the stock syslogd formats are hardcoded into rsyslog. So if
-# no template is specified, we use one of these hardcoded templates. Search for
-# "template_" in syslogd.c and you will find the hardcoded ones.
-#
-# A template consists of a template directive, a name, the actual template text
-# and optional options. A sample is:
-#
-# $template MyTemplateName,"\7Text %property% some more text\n",<options>
-#
-# The "$template" is the template directive. It tells rsyslog that this
-# line contains a template.
-#
-# "MyTemplateName" is the template name. All other config lines refer to
-# this name.
-#
-# The text within quotes is the actual template text. The backslash is 
-# a escape character, much as in C. It does all these "cool" things. For
-# example, \7 rings the bell (this is an ASCII value), \n is a new line.
-# C programmers and perl coders have the advantage of knowing this, but the
-# set in rsyslog is a bit restricted currently. All text in the template
-# is used literally, except for things within percent signs. These are 
-# properties and allow you access to the contents of the syslog message.
-# Properties are accessed via the property replacer (nice name, huh) and
-# it can do cool things, too. For example, it can pick a substring or
-# do date-specific formatting. More on this is below, on some lines of the
-# property replacer.
-#
-# The <options> part is optional. It carries options that influence the
-# template as whole. Details are below. Be sure NOT to mistake template
-# options with property options - the later ones are processed by the
-# property replacer and apply to a SINGLE property, only (and not the
-# whole template).
-#
-# Template options are case-insensitive. Currently defined are:
-# sql - format the string suitable for a SQL statement. This will replace single
-#       quotes ("'") by two single quotes ("''") inside each field. This option MUST
-#       be specified when a template is used for writing to a database, otherwise SQL
-#       injection might occur.
-#
-# 	Please note that the database writer *checks* that the sql option is
-#	present in the template. If it is not present, the write database action
-#	is disabled. This is to guard you against accidential forgetting it and
-#	then becoming vulnerable for SQL injection.
-#	The sql option can also be useful with files - especially if you want
-#	to run them on another machine for performance reasons. However, do NOT
-#	use it if you do not have a real need for it - among others, it takes
-#	some toll on the processing time. Not much, but on a really busy system
-#	you might notice it ;)
-#
-# To escape:
-# % = \%
-# \ = \\
-# --> '\' is used to escape (as in C)
-#$template TraditionalFormat,%timegenerated% %HOSTNAME% %syslogtag%%msg%\n"
-#
-# Properties can be accessed by the property replacer. They are accessed
-# inside the template by putting them between percent signs. Properties
-# can be modifed by the property replacer. The full syntax is as follows:
-#
-# %propname:fromChar:toChar:options%
-#
-# propname is the name of the property to access. This IS case-sensitive!
-# Currently supported are:
-# msg		the MSG part of the message (aka "the message" ;))
-# rawmsg	the message excactly as it was received from the
-#		socket. Should be useful for debugging.
-# UxTradMsg	will disappear soon - do NOT use!
-# HOSTNAME	hostname from the message
-# source	alias for HOSTNAME
-# syslogtag	TAG from the message
-# PRI		PRI part of the message - undecoded (single value)
-# IUT		the monitorware InfoUnitType - used when talking to a
-#		MonitorWare backend (also for phpLogCon)
-# syslogfacility	the facility from the message - in numerical form
-# syslogpriority	the priority (actully severity!) from the
-#			message - in numerical form
-# timegenerated	timestamp when the message was RECEIVED. Always in high
-#		resolution
-# timereported	timestamp from the message. Resolution depends on what
-#		was provided in the message (in most cases, only seconds)
-# TIMESTAMP	alias for timereported
-#
-# Other properties might be available at the time you read this. Be sure
-# to consult the property replacer documentation in the doc set for all
-# properties.
-#
-# FromChar and toChar are used to build substrings. They specify the
-# offset within the string that should be copied. Offset counting
-# starts at 1, so if you need to obtain the first 2 characters of the
-# message text, you can use this syntax: "%msg:1:2%".
-# If you do not whish to specify from and to, but you want to
-# specify options, you still need to include the colons. For example,
-# if you would like to convert the full message text to lower case
-# only, use "%msg:::lowercase%".
-#
-# property options are case-insensitive, currently defined are:
-# uppercase	convert property to lowercase only
-# lowercase	convert property text to uppercase only
-# drop-last-lf	The last LF in the message (if any), is dropped. 
-#		Especially useful for PIX.
-# date-mysql	format as mysql date
-# date-rfc3164	format as RFC 3164 date
-# date-rfc3339	format as RFC 3339 date
-# escape-cc	NOT yet implemented
-
-# Below find some samples of what a template can do. Have a good
-# time finding out what they do [or just tun them] ;)
-
-# A template that resambles traditional syslogd file output:
-$template TraditionalFormat,"%timegenerated% %HOSTNAME% %syslogtag%%msg:::drop-last-lf%\n"
-
-# a template useful for debugging format issues
-$template DEBUG,"Debug line with all properties:\nFROMHOST: '%FROMHOST%', HOSTNAME: '%HOSTNAME%', PRI: %PRI%,\nsyslogtag '%syslogtag%', programname: '%programname%', APP-NAME: '%APP-NAME%', PROCID: '%PROCID%', MSGID: '%MSGID%',\nTIMESTAMP: '%TIMESTAMP%', STRUCTURED-DATA: '%STRUCTURED-DATA%',\nmsg: '%msg%'\nescaped msg: '%msg:::drop-cc%'\nrawmsg: '%rawmsg%'\n\n"
-#
-# A template that resembles RFC 3164 on-the-wire format:
-# (yes, there is NO space betwen syslogtag and msg! that's important!)
-$template RFC3164fmt,"<%PRI%>%TIMESTAMP% %HOSTNAME% %syslogtag%%msg%"
-
-# a template resembling traditional wallmessage format:
-$template wallmsg,"\r\n\7Message from syslogd@%HOSTNAME% at %timegenerated% ...\r\n %syslogtag%%msg%\n\r"
-
-# The template below emulates winsyslog format, but we need to check the time
-# stamps used. for now, it is good enough ;) This format works best with
-# other members of the MonitorWare product family. It is also a good sample
-# where you can see the property replacer in action.
-$template WinSyslogFmt,"%HOSTNAME%,%timegenerated:1:10:date-rfc3339%,%timegenerated:12:19:date-rfc3339%,%timegenerated:1:10:date-rfc3339%,%timegenerated:12:19:date-rfc3339%,%syslogfacility%,%syslogpriority%,%syslogtag%%msg%\n"
-
-# A template used for database writing (notice it *is* an actual
-# sql-statement):
-$template dbFormat,"insert into SystemEvents (Message, Facility,FromHost, Priority, DeviceReportedTime, ReceivedAt, InfoUnitID, SysLogTag) values ('%msg%', %syslogfacility%, '%HOSTNAME%',%syslogpriority%, '%timereported:::date-mysql%', '%timegenerated:::date-mysql%', %iut%, '%syslogtag%')",sql
-
-# Selector lines are somewhat different from stock syslogd. With
-# rsyslog, you can add a semicolon ";" after the target and then
-# the template name. That will assign this template to the respective
-# action. If no template name is given, a hardcoded template is used.
-# If a template name is given, but the template was not defined, the
-# selector line is DEACTIVATED.
-#
-# #############
-# # IMPORTANT #
-# #############
-# Templates MUST be defined BEFORE they are used! It is OK to
-# intermix template definitions and selector lines within the
-# config file, but each template MUST be defined before it is
-# used the first time!
-#
-
-# We have some very rough samples here - This sample file focusses
-# on the new syntax, so we do NOT describe all possible selections.
-# Use the syslog.conf if you are interested to see how to select
-# based on facility and severits (aka priority).
-
-*.*		/var/log/winsyslog-like.log;WinSyslogFmt
-
-# A selector using the traditional format defined above:
-*.*		/var/log/traditionalfile.log;TraditionalFormat
-
-# And another one using the hardcoded traditional format:
-*.*		/var/log/anothertraditionalfile.log
-
-# Templates are also fully supportd for forwarding:
-*.*		@172.19.2.16;RFC3164fmt
-
-# And this finally is a database action
-# The semicolon at the end is not necessary,
-# but some previous versions of  rsyslogd had a bug that
-# made them abort if it were missing. As Dennis Olvany
-# pointed out, it would be extremely nice to have this
-# semicolon in the sample conf - so we did in a previous
-# version and it still sticks around ;)
-*.*		>hostname,dbname,userid,password;
-# It uses the default schema (MonitorWare format). The parameters
-# should be self-explanatory.
-
-# And this one uses the template defined above:
-*.*		>hostname,dbname,userid,password;dbFormat
-
-
-#
-# Rsyslog supports TCP-based syslog. To enable receiving TCP messages,
-# use the -t <port> command line option (where port is the port it
-# shall listen to. To forward messages to the remote host, you must
-# specify a forwarding action and include the host and port. TCP
-# and UDP-based forwarding has basically the same syntax, except that
-# TCP delivery is triggered by specifying a second at-sign (@) in the
-# message.
-# This is UDP forwarding to port 514:
-*.*		@172.19.2.16
-# This is UDP forwarding to port 1514:
-*.*		@172.19.2.16:1514
-# This is TCP forwarding to port 1514:
-*.*		@@172.19.2.16:1514
-# The second @-sign is all you need (except, of course, a tcp-capable
-# syslogd like rsyslogd ;)).
-# Of course, you can also specify a template with TCP:
-*.*		@@172.19.2.16:1514;RFC3164Fmt
-# There are also some options you can select. These come between
-# paranthesis. Available are:
-# z<number> - turn on compression, number is compression mode 0 - none, 9 max
-# o         - (tcp only) use octet counting for framing EXPERIMENTAL
-#
-# Forward via TCP with maximum compression and octet couting framing:
-*.*		@@(z9,o)172.19.2.16:1514;RFC3164Fmt
-# Forward via UDP with maximum compression to port 1514
-*.*		@(z9)172.19.2.16:1514
-
-# We also support property-based filters, which allow for nice
-# things. Let's for example assume that you receive a lot of
-# nonsense messages with "ID-4711" in the message text. You know
-# that you will never need these messages. So you simply discard them
-:msg, contains, "ID-4711"	~
-
-# or you would like to store messages from a specific host to
-# a different file:
-:FROMHOST, isequal,"myhost.example.com"	/var/log/myhost.log
-
-# everyting that does not contain "error" should also be
-# discarded
-:msg, !contains, "error" 	~
-# and the rest go to a seperate file
-*.*	/var/log/error
-# (keep in mind that the two directives shown immediately
-# above must be kept in that order to actually work)
-
-# you can also execute a script. Let's assume, for example, you need
-# to execute "turn-diesel-generator-on" when "power failed" is contained
-# in a message... ;)
-:msg, contains, "power failed"	^turn-diesel-generator-on
-# (The script is passed the syslog message as first and only parameter.
-# Other parameters can currently not be specified.)
-
-# Note that boolean operations (other than not [!]) are not
-# currently supported. As such, you can not filter out different
-# facilities from different machines - hopefully later ;)
-
-# 
-# A final world. rsyslog is considered a part of Adiscon's MonitorWare product line.
-# As such, you can find current information as well as information on the
-# other product line members on http://www.monitorware.com. Please be warned, there
-# are a number of closed-source commercial Windows applications among these products ;)
-#
-# You might want to check the GPL'ed phpLogCon (http://www.phplogcon.org)
-# as a web-based front-end to a syslog message database.
-#
-# I hope this work is useful.
-# 2005-09-27 Rainer Gerhards <rgerhards@adiscon.com>
-#
diff --git a/debian/watch b/debian/watch
index b6f8643..dd306eb 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-http://rsyslog.com/tag/beta/ .*rsyslog-(.*)\.tar\.gz
+http://rsyslog.com/downloads/download-v8-stable/ .*/rsyslog-([\d\.]*)\.tar\.gz