Sync the logrotate configuration file from rsyslog-7.4.7-12.el7 (#1287469)

Signed-off-by: Peter Czanik <pczanik@fang.fa.gau.hu>

.gitignore

@@ -13,3 +13,9 @@ syslog-ng_3.1.1.tar.gz
 /syslog-ng_3.4.1.tar.gz
 /syslog-ng_3.4.3.tar.gz
 /syslog-ng_3.4.4.tar.gz
+/syslog-ng_3.4.5.tar.gz
+/syslog-ng_3.4.6.tar.gz
+/syslog-ng_3.4.7.tar.gz
+/syslog-ng_3.5.4.1.tar.gz
+/syslog-ng_3.5.5.tar.gz
+/syslog-ng_3.5.6.tar.gz

sources

@@ -1 +1 @@
-bf755fc3e110f9953da4371842b7fba7  syslog-ng_3.4.4.tar.gz
+eee31ddb012b1fcf2b6a6a99f073a9a6  syslog-ng_3.5.6.tar.gz

syslog-ng-3.4.3-syslog-ng.service.patch

@@ -1,12 +0,0 @@
-diff -ruN syslog-ng-3.4.3/contrib/systemd/syslog-ng.service syslog-ng-3.4.3-modified/contrib/systemd/syslog-ng.service
---- syslog-ng-3.4.3/contrib/systemd/syslog-ng.service	2013-08-13 10:25:18.000000000 +0100
-+++ syslog-ng-3.4.3-modified/contrib/systemd/syslog-ng.service	2013-08-13 22:21:10.780304735 +0100
-@@ -4,7 +4,7 @@
- 
- [Service]
- Sockets=syslog.socket
--ExecStart=/usr/sbin/syslog-ng -F
-+ExecStart=/usr/sbin/syslog-ng -F -p /var/run/syslogd.pid
- ExecReload=/bin/kill -HUP $MAINPID
- StandardOutput=null
- Restart=on-failure

syslog-ng-3.5.0-syslog-ng.service.patch

@@ -0,0 +1,12 @@
+diff -ruN syslog-ng-3.5.0beta3/contrib/systemd/syslog-ng.service syslog-ng-3.5.0beta3-modified/contrib/systemd/syslog-ng.service
+--- syslog-ng-3.5.0beta3/contrib/systemd/syslog-ng.service	2013-09-17 16:43:11.000000000 +0100
++++ syslog-ng-3.5.0beta3-modified/contrib/systemd/syslog-ng.service	2013-10-17 15:56:13.085757469 +0100
+@@ -5,7 +5,7 @@
+ [Service]
+ Type=notify
+ Sockets=syslog.socket
+-ExecStart=/usr/sbin/syslog-ng -F
++ExecStart=/usr/sbin/syslog-ng -F -p /var/run/syslogd.pid
+ ExecReload=/bin/kill -HUP $MAINPID
+ StandardOutput=null
+ Restart=on-failure

syslog-ng.conf

@@ -1,4 +1,5 @@
-@version:3.3
+@version:3.5
+@include "scl.conf"
 
 # syslog-ng configuration file.
 #
@@ -22,8 +23,7 @@ options {
 };
 
 source s_sys {
-    file ("/proc/kmsg" program_override("kernel") flags(kernel));
-    unix-dgram ("/dev/log");
+    system();
     internal();
     # udp(ip(0.0.0.0) port(514));
 };

syslog-ng.logrotate

@@ -4,6 +4,7 @@
 /var/log/secure
 /var/log/spooler
 {
+    missingok
     sharedscripts
     postrotate
 	/bin/kill -HUP `cat /var/run/syslogd.pid 2> /dev/null` 2> /dev/null || true

syslog-ng.spec

@@ -2,18 +2,18 @@
 %global ivykis_ver 0.36.1
 
 Name: syslog-ng
-Version: 3.4.4
-Release: 1%{?dist}
+Version: 3.5.6
+Release: 3%{?dist}
 Summary: Next-generation syslog server
 
 Group: System Environment/Daemons
 License: GPLv2+
-Url: http://www.balabit.com/network-security/syslog-ng
-Source0: http://www.balabit.com/downloads/files?path=/syslog-ng/sources/%{version}/source/%{name}_%{version}.tar.gz
+URL: http://www.balabit.com/network-security/syslog-ng
+Source0: http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/%{version}/source/%{name}_%{version}.tar.gz
 Source1: syslog-ng.conf
 Source2: syslog-ng.logrotate
 
-Patch0: syslog-ng-3.4.3-syslog-ng.service.patch
+Patch0: syslog-ng-3.5.0-syslog-ng.service.patch
 Patch1: syslog-ng-3.4.0beta1-tests-functional-control.py.patch
 Patch2: syslog-ng-3.3.6-tests-functional-sql-test.patch
 
@@ -21,6 +21,7 @@ BuildRequires: systemd-units
 BuildRequires: pkgconfig
 BuildRequires: libtool
 BuildRequires: bison, flex
+BuildRequires: libxslt
 BuildRequires: eventlog-devel >= %{evtlog_ver}
 BuildRequires: glib2-devel >= 2.10.1
 BuildRequires: ivykis-devel >= %{ivykis_ver}
@@ -36,12 +37,14 @@ BuildRequires: libuuid-devel
 BuildRequires: libesmtp-devel
 BuildRequires: libmongo-client-devel
 BuildRequires: GeoIP-devel
+BuildRequires: systemd-devel
+BuildRequires: hiredis-devel
 #BuildRequires: librabbitmq-devel
 
 # Test suite
 BuildRequires: python
 # Test suite: the SQL tests
-BuildRequires: libdbi-dbd-sqlite
+# BuildRequires: libdbi-dbd-sqlite
 
 Requires: logrotate
 Requires: ivykis >= %{ivykis_ver}
@@ -59,13 +62,20 @@ Conflicts: filesystem < 3
 
 
 %description
-syslog-ng, as the name shows, is a syslogd replacement, but with new
-functionality for the new generation. The original syslogd allows
-messages only to be sorted based on priority/facility pairs; syslog-ng
-adds the possibility to filter based on message contents using regular
-expressions. The new configuration scheme is intuitive and powerful.
-Forwarding logs over TCP and remembering all forwarding hops makes it
-ideal for firewalled environments.
+syslog-ng is an enhanced log daemon, supporting a wide range of input and
+output methods: syslog, unstructured text, message queues, databases (SQL
+and NoSQL alike) and more.
+
+Key features:
+
+ * receive and send RFC3164 and RFC5424 style syslog messages
+ * work with any kind of unstructured data
+ * receive and send JSON formatted messages
+ * classify and structure logs with builtin parsers (csv-parser(),
+   db-parser(), ...)
+ * normalize, crunch and process logs as they flow through the system
+ * hand on messages for further processing using message queues (like
+   AMQP), files or databases (like PostgreSQL or MongoDB).
 
 
 %package libdbi
@@ -86,6 +96,43 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 This module supports the mongodb database via libmongo-client.
 
 
+%package smtp
+Summary: smtp support for %{name}
+Group: Development/Libraries
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description smtp
+This module supports sending e-mail alerts through an smtp server.
+
+
+%package json
+Summary: json support for %{name}
+Group: Development/Libraries
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description json
+This module supports writing and parsing JSON logs.
+
+
+%package geoip
+Summary: geoip support for %{name}
+Group: Development/Libraries
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description geoip
+This template function returns the 2-letter country code of
+any IPv4 address or host.
+
+
+%package redis
+Summary: redis support for %{name}
+Group: Development/Libraries
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description redis
+This module supports the redis key-value store via hiredis.
+
+
 %package devel
 Summary: Development files for %{name}
 Group: Development/Libraries
@@ -125,6 +172,7 @@ GEOIP_LIBS=-lGeoIP; export GEOIP_LIBS; \
     --with-ivykis=system \
     --with-libmongo-client=system \
     --with-embedded-crypto \
+    --enable-man-pages \
     --enable-ipv6 \
     --enable-tcp-wrapper \
     --enable-pcre \
@@ -139,6 +187,7 @@ GEOIP_LIBS=-lGeoIP; export GEOIP_LIBS; \
     --disable-static \
     --enable-dynamic-linking \
     --enable-systemd \
+    --enable-redis \
     --disable-amqp \
     --with-librabbitmq-client=no
 
@@ -178,6 +227,10 @@ done
 
 find %{buildroot} -name "*.la" -exec rm -f {} \;
 
+# remove some extra testing related files
+rm %{buildroot}/%{_libdir}/pkgconfig/syslog-ng-test.pc
+rm %{buildroot}/%{_libdir}/syslog-ng/libtest/libsyslog-ng-test.a
+
 
 %check
 LD_LIBRARY_PATH=%{buildroot}/%{_libdir}:%{buildroot}/%{_libdir}/%{name} make check
@@ -245,6 +298,10 @@ fi
 %{_libdir}/%{name}/*.so
 %exclude %{_libdir}/%{name}/libafsql.so
 %exclude %{_libdir}/%{name}/libafmongodb.so
+%exclude %{_libdir}/%{name}/libredis.so
+%exclude %{_libdir}/%{name}/libafsmtp.so
+%exclude %{_libdir}/%{name}/libjson-plugin.so
+%exclude %{_libdir}/%{name}/libtfgeoip.so
 
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/syslog-ng.vim
@@ -268,6 +325,19 @@ fi
 %files mongodb
 %{_libdir}/%{name}/libafmongodb.so
 
+%files redis
+%{_libdir}/%{name}/libredis.so
+
+%files smtp
+%{_libdir}/%{name}/libafsmtp.so
+
+%files json
+%{_libdir}/%{name}/libjson-plugin.so
+
+%files geoip
+%{_libdir}/%{name}/libtfgeoip.so
+
+
 %files devel
 %{_libdir}/libsyslog-ng.so
 %{_includedir}/%{name}/
@@ -276,6 +346,40 @@ fi
 
 
 %changelog
+* Wed Dec 30 2015 Jose Pedro Oliveira <jose.p.oliveira.oss at gmail.com> - 3.5.6-3
+- Sync the logrotate configuration file from rsyslog-7.4.7-12.el7 (#1287469)
+
+* Wed Oct  7 2015 Peter Czanik <czanik@balabit.hu> - 3.5.6-2
+- rebuilt for hiredis
+
+* Tue Aug  5 2014 Peter Czanik <czanik@balabit.hu> - 3.5.6-1
+- Update to syslog-ng 3.5.6 (bugfix release)
+
+* Thu Jul 31 2014 Peter Czanik <czanik@balabit.hu> - 3.5.5-2
+- enabled mongodb destination support
+- merged with master for easier editing
+- disabled installing libdbi-dbd-sqlite as it's not available
+
+* Mon Jul 21 2014 Peter Czanik <czanik@balabit.hu> - 3.5.5-1
+- update to 3.5.5 (bugfix release)
+- enable SQL, smtp, json and geoip support
+
+* Mon Jun  2 2014 Peter Czanik <czanik@balabit.hu> - 3.5.4.1-1
+- Update to syslog-ng 3.5.4.1
+- enable SCL in syslog-ng.conf
+- use system() in syslog-ng.conf
+- add redis support to separate subpackage
+  due to dependencies
+
+* Wed Dec 25 2013 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.4.7-1
+- Update to syslog-ng 3.4.7
+
+* Wed Nov 27 2013 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.4.6-1
+- Update to syslog-ng 3.4.6
+
+* Mon Nov  4 2013 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.4.5-1
+- Update to syslog-ng 3.4.5
+
 * Thu Oct 17 2013 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.4.4-1
 - Update to syslog-ng 3.4.4