[syslog-ng] update to syslog-ng 3.6 rc1

[Peter Czanik]

commit df44319cafe3b9d47d4222d705b65d77057593cf
Author: Peter Czanik <pczanik at fang.fa.gau.hu>
Date:   Tue Sep 30 09:02:00 2014 +0200

    update to syslog-ng 3.6 rc1

 syslog-ng-3.5.0-syslog-ng.service.patch |   12 ------------
 syslog-ng-3.6.0-syslog-ng.service.patch |   11 +++++++++++
 syslog-ng.conf                          |    2 +-
 syslog-ng.spec                          |   22 ++++++++++++----------
 4 files changed, 24 insertions(+), 23 deletions(-)
---
diff --git a/syslog-ng-3.6.0-syslog-ng.service.patch b/syslog-ng-3.6.0-syslog-ng.service.patch
new file mode 100644
index 0000000..92459ca
--- /dev/null
+++ b/syslog-ng-3.6.0-syslog-ng.service.patch
@@ -0,0 +1,11 @@
+--- syslog-ng-3.6.0alpha3/contrib/systemd/syslog-ng.service.old	2014-08-22 11:35:58.270943345 +0200
++++ syslog-ng-3.6.0alpha3/contrib/systemd/syslog-ng.service	2014-08-22 11:36:54.706942527 +0200
+@@ -5,7 +5,7 @@
+ 
+ [Service]
+ Type=notify
+-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
diff --git a/syslog-ng.conf b/syslog-ng.conf
index 5919f9a..e2c1189 100644
--- a/syslog-ng.conf
+++ b/syslog-ng.conf
@@ -1,4 +1,4 @@
- at version:3.5
+ at version:3.6
 @include "scl.conf"
 
 # syslog-ng configuration file.
diff --git a/syslog-ng.spec b/syslog-ng.spec
index 6562779..1024d3e 100644
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -2,8 +2,8 @@
 %global ivykis_ver 0.36.1
 
 Name: syslog-ng
-Version: 3.5.6
-Release: 3%{?dist}
+Version: 3.6.0rc1
+Release: 1%{?dist}
 Summary: Next-generation syslog server
 
 Group: System Environment/Daemons
@@ -13,7 +13,7 @@ Source0: http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/%{
 Source1: syslog-ng.conf
 Source2: syslog-ng.logrotate
 
-Patch0: syslog-ng-3.5.0-syslog-ng.service.patch
+Patch0: syslog-ng-3.6.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
 
@@ -26,7 +26,6 @@ BuildRequires: eventlog-devel >= %{evtlog_ver}
 BuildRequires: glib2-devel >= 2.10.1
 BuildRequires: ivykis-devel >= %{ivykis_ver}
 BuildRequires: json-c-devel
-#BuildRequires: json-glib-devel
 BuildRequires: libcap-devel
 BuildRequires: libdbi-devel
 BuildRequires: libnet-devel
@@ -39,7 +38,6 @@ BuildRequires: libmongo-client-devel
 BuildRequires: GeoIP-devel
 BuildRequires: systemd-devel
 BuildRequires: hiredis-devel
-#BuildRequires: librabbitmq-devel
 
 # Test suite
 BuildRequires: python
@@ -175,9 +173,8 @@ GEOIP_LIBS=-lGeoIP; export GEOIP_LIBS; \
     --enable-man-pages \
     --enable-ipv6 \
     --enable-tcp-wrapper \
-    --enable-pcre \
     --enable-spoof-source \
-    --enable-linux-caps \
+    --with-linux-caps=auto \
     --enable-sql \
     --enable-json \
     --enable-ssl \
@@ -233,7 +230,7 @@ rm %{buildroot}/%{_libdir}/syslog-ng/libtest/libsyslog-ng-test.a
 
 
 %check
-LD_LIBRARY_PATH=%{buildroot}/%{_libdir}:%{buildroot}/%{_libdir}/%{name} make check
+LD_LIBRARY_PATH=%{buildroot}/%{_libdir}:%{buildroot}/%{_libdir}/%{name} VERBOSE=1 make check
 
 
 %post
@@ -276,7 +273,7 @@ fi
 
 
 %files
-%doc AUTHORS COPYING NEWS
+%doc AUTHORS COPYING NEWS.md
 %doc doc/security/*.txt
 %doc contrib/{relogger.pl,syslog2ng,syslog-ng.conf.doc}
 
@@ -294,7 +291,7 @@ fi
 %{_bindir}/loggen
 %{_bindir}/pdbtool
 %{_bindir}/update-patterndb
-%{_libdir}/lib%{name}-%{version}.so
+%{_libdir}/lib%{name}-3.6.so.*
 %{_libdir}/%{name}/*.so
 %exclude %{_libdir}/%{name}/libafsql.so
 %exclude %{_libdir}/%{name}/libafmongodb.so
@@ -346,6 +343,11 @@ fi
 
 
 %changelog
+* Fri Sep 26 2014 Peter Czanik <czanik at balabit.hu> - 3.6.0rc1-1
+- update to syslog-ng 3.6.0rc1
+- removed --enable-pcre, as it's always required
+- configuration file version bump to 3.6
+
 * Thu Aug 21 2014 Kevin Fenzi <kevin at scrye.com> - 3.5.6-3
 - Rebuild for rpm bug 1131960