Rebased to 8.24

- changed name of created file in logrotate.d to non-generic one
  resolves: rhbz1269244
- added symlink to syslog.service
  resolves: rhbz1343132
- added documentation for recover_qi
  resolves: rhbz1286707
- changed default .conf added imuxsock, seqfault is not present anymore
  https://github.com/rsyslog/rsyslog/pull/1289

.gitignore

@@ -33,3 +33,5 @@ rsyslog-4.6.3.tar.gz
 /rsyslog-8.22.0.tar.gz
 /rsyslog-8.23.0.tar.gz
 /rsyslog-doc-8.23.0.tar.gz
+/rsyslog-8.24.0.tar.gz
+/rsyslog-doc-8.24.0.tar.gz

rsyslog-8.24.0-recover_qi-doc.patch

@@ -0,0 +1,27 @@
+From ff07a7cfc171dc2151cc8afe44776525d34a9e01 Mon Sep 17 00:00:00 2001
+From: jvymazal <jvymazal@redhat.com>
+Date: Tue, 3 Jan 2017 10:24:26 +0100
+Subject: [PATCH] Update queues.rst
+
+Update queues.rst
+---
+ source/concepts/queues.rst | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/source/concepts/queues.rst b/source/concepts/queues.rst
+index eb394e8..c71413c 100644
+--- a/source/concepts/queues.rst
++++ b/source/concepts/queues.rst
+@@ -153,6 +153,12 @@ can be requested via "*<object>QueueSyncQueueFiles on/off* with the
+ default being off. Activating this option has a performance penalty, so
+ it should not be turned on without reason.
+ 
++If you happen to lose or otherwise need the housekeeping structures and 
++have all yours queue chunks you can use perl script included in rsyslog
++package to generate it. 
++Usage: recover_qi.pl -w *$WorkDirectory* -f QueueFileName -d 8 > QueueFileName.qi
++
++
+ In-Memory Queues
+ ~~~~~~~~~~~~~~~~
+ 

rsyslog.conf

@@ -6,8 +6,9 @@
 #### MODULES ####
 
 # The imjournal module bellow is now used as a message source instead of imuxsock.
+$ModLoad imuxsock # provides support for local system logging (e.g. via logger command)
 $ModLoad imjournal # provides access to the systemd journal
-#$ModLoad imklog   # provides kernel logging support (previously done by rklogd)
+#$ModLoad imklog # reads kernel messages (the same are read from journald)
 #$ModLoad immark  # provides --MARK-- message capability
 
 # Provides UDP syslog reception
@@ -18,13 +19,6 @@ $ModLoad imjournal # provides access to the systemd journal
 #$ModLoad imtcp
 #$InputTCPServerRun 514
 
-# By default, all system logs are read from journald through the
-# imjournal module. To read messages from the syslog socket, the
-# imuxsock module has to be loaded and a path to the socket specified.
-#$ModLoad imuxsock
-# The default path to the syslog socket provided by journald:
-#$SystemLogSocketName /run/systemd/journal/syslog
-
 
 #### GLOBAL DIRECTIVES ####
 
@@ -41,12 +35,13 @@ $ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
 # Include all config files in /etc/rsyslog.d/
 $IncludeConfig /etc/rsyslog.d/*.conf
 
+# Turn off message reception via local log socket;
+# local messages are retrieved through imjournal now.
+$OmitLocalLogging on
+
 # File to store the position in the journal
 $IMJournalStateFile imjournal.state
-# If there is no saved state yet, don't read in the whole bulk of messages.
+
-# This means some of the older messages won't be collected by rsyslog,
-# but it also prevents a potential huge spike in resource utilization.
-$IMJournalIgnorePreviousMessages on
 
 #### RULES ####
 

rsyslog.spec

@@ -11,8 +11,8 @@
 
 Summary: Enhanced system logging and kernel message trapping daemon
 Name: rsyslog
-Version: 8.23.0
+Version: 8.24.0
-Release: 2%{?dist}
+Release: 1%{?dist}
 License: (GPLv3+ and ASL 2.0)
 Group: System Environment/Daemons
 URL: http://www.rsyslog.com/
@@ -51,6 +51,7 @@ Obsoletes: sysklogd < 1.5-11
 # tweak the upstream service file to honour configuration from /etc/sysconfig/rsyslog
 Patch0: rsyslog-8.8.0-sd-service.patch
 Patch1: rsyslog-8.23.0-msg_c_nonoverwrite_merge.patch
+Patch2: rsyslog-8.24.0-recover_qi-doc.patch
 
 %package crypto
 Summary: Encryption support
@@ -257,6 +258,7 @@ The omamqp1 output module can be used to send log messages via an AMQP
 %prep
 # set up rsyslog-doc sources
 %setup -q -a 1 -T -c
+%patch2 -p1
 rm -r LICENSE README.md build.sh source build/objects.inv
 mv build doc
 # set up rsyslog sources
@@ -349,7 +351,7 @@ install -d -m 755 %{buildroot}%{rsyslog_docdir}/html
 
 install -p -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/rsyslog.conf
 install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/rsyslog
-install -p -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/logrotate.d/syslog
+install -p -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/logrotate.d/rsyslog
 install -p -m 644 plugins/ommysql/createDB.sql %{buildroot}%{rsyslog_docdir}/mysql-createDB.sql
 install -p -m 644 plugins/ompgsql/createDB.sql %{buildroot}%{rsyslog_docdir}/pgsql-createDB.sql
 dos2unix tools/recover_qi.pl
@@ -371,6 +373,10 @@ do
 done
 %systemd_post rsyslog.service
 
+# Make symlink for syslog service. (This is supposed
+# to fail when the link already exists - e.g. done by systemd or other log package)
+ln -s /usr/lib/systemd/system/rsyslog.service /etc/systemd/system/syslog.service >/dev/null 2>&1 || :
+
 %preun
 %systemd_preun rsyslog.service
 
@@ -396,7 +402,7 @@ done
 %{_unitdir}/rsyslog.service
 %config(noreplace) %{_sysconfdir}/rsyslog.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/rsyslog
-%config(noreplace) %{_sysconfdir}/logrotate.d/syslog
+%config(noreplace) %{_sysconfdir}/logrotate.d/rsyslog
 # plugins
 %{_libdir}/rsyslog/imfile.so
 %{_libdir}/rsyslog/imjournal.so
@@ -518,6 +524,17 @@ done
 %{_libdir}/rsyslog/omamqp1.so
 
 %changelog
+* Fri Jan 13 2017 Jiri Vymazal <jvymazal@redhat.com> - 8.24.0-1
+- rsyslog rebase to 8.24
+- changed name of created file in logrotate.d to non-generic one
+  resolves: rhbz1269244
+- added symlink to syslog.service
+  resolves: rhbz1343132
+- added documentation for recover_qi
+  resolves: rhbz1286707
+- changed default .conf added imuxsock, seqfault is not present anymore
+  https://github.com/rsyslog/rsyslog/pull/1289
+
 * Tue Dec 20 2016 Radovan Sroka <rsroka@redhat.com> - 8.23.0-2
 - added forgoten patch rsyslog-8.23.0-msg_c_nonoverwrite_merge.patch
 

sources

@@ -1,2 +1,2 @@
-SHA512 (rsyslog-8.23.0.tar.gz) = 4e4832287f02d4b0435b3711241d58cad9f393ce14318bbccce7b89dceeed01205960e7df4b2629831429e550c0865407374eb6a5548ecb47a3aea90c7d7df2d
+SHA512 (rsyslog-8.24.0.tar.gz) = b25b8ae72133376f732f54863c97aea3c8dfbf37c62c6a61840932996913c9d4e63155a24ffc577db48a18514f3e35b6fb109b1864380ba93ddf3fa6d84d728d
-SHA512 (rsyslog-doc-8.23.0.tar.gz) = 5c57159e17c728e0fcada5cd03dfe45edca2f9b6554628729387eedb94936c0ef16254f5b0e3524dd6ce732d57e42994e1293478bd28b51747a49f725f148bc0
+SHA512 (rsyslog-doc-8.24.0.tar.gz) = b55cde1485a7baec6d4c4928107c22a078cf412a2994c0dfcbb12c47b49c3b263af8a64011b1329567cf86e04927b9e383581dc868eaea81d554adada6b3786b