[syslog-ng] Update to syslog-ng 3.5.0 beta 3

[Jose Pedro Oliveira]

commit 6536513ee670a1e2e45c3ba91a264ace38a49279
Author: Jose Pedro Oliveira <jpo at di.uminho.pt>
Date:   Sat Oct 19 17:55:39 2013 +0100

    Update to syslog-ng 3.5.0 beta 3

 .gitignore                              |    1 +
 sources                                 |    2 +-
 syslog-ng-3.4.3-syslog-ng.service.patch |   12 --------
 syslog-ng-3.5.0-syslog-ng.service.patch |   12 ++++++++
 syslog-ng.spec                          |   43 +++++++++++++++++++++++++------
 5 files changed, 49 insertions(+), 21 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 521cce4..8301e59 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ 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.5.0beta3.tar.gz
diff --git a/sources b/sources
index a75c8e9..5fa75c8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bf755fc3e110f9953da4371842b7fba7  syslog-ng_3.4.4.tar.gz
+aacac97e7b50ae60a51c1bc86b0aeca7  syslog-ng_3.5.0beta3.tar.gz
diff --git a/syslog-ng-3.5.0-syslog-ng.service.patch b/syslog-ng-3.5.0-syslog-ng.service.patch
new file mode 100644
index 0000000..3aa641f
--- /dev/null
+++ b/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
diff --git a/syslog-ng.spec b/syslog-ng.spec
index cbe3a1d..2d5473f 100644
--- a/syslog-ng.spec
+++ b/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.0
+Release: 0.beta3.1%{?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}beta3.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
 
@@ -36,6 +36,8 @@ BuildRequires: libuuid-devel
 BuildRequires: libesmtp-devel
 BuildRequires: libmongo-client-devel
 BuildRequires: GeoIP-devel
+BuildRequires: systemd-devel
+BuildRequires: hiredis-devel
 #BuildRequires: librabbitmq-devel
 
 # Test suite
@@ -86,6 +88,15 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 This module supports the mongodb database via libmongo-client.
 
 
+%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
@@ -97,7 +108,8 @@ developing applications that use %{name}.
 
 
 %prep
-%setup -q
+#setup -q
+%setup -q -n %{name}-%{version}beta3
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -139,6 +151,7 @@ GEOIP_LIBS=-lGeoIP; export GEOIP_LIBS; \
     --disable-static \
     --enable-dynamic-linking \
     --enable-systemd \
+    --enable-redis \
     --disable-amqp \
     --with-librabbitmq-client=no
 
@@ -146,7 +159,8 @@ GEOIP_LIBS=-lGeoIP; export GEOIP_LIBS; \
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
-make %{_smp_mflags}
+#make %{_smp_mflags}
+make
 
 
 %install
@@ -241,10 +255,12 @@ fi
 %{_bindir}/loggen
 %{_bindir}/pdbtool
 %{_bindir}/update-patterndb
-%{_libdir}/lib%{name}-%{version}.so
+#{_libdir}/lib%{name}-%{version}.so
+%{_libdir}/lib%{name}-%{version}beta3.so
 %{_libdir}/%{name}/*.so
 %exclude %{_libdir}/%{name}/libafsql.so
 %exclude %{_libdir}/%{name}/libafmongodb.so
+%exclude %{_libdir}/%{name}/libredis.so
 
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/syslog-ng.vim
@@ -268,6 +284,9 @@ fi
 %files mongodb
 %{_libdir}/%{name}/libafmongodb.so
 
+%files redis
+%{_libdir}/%{name}/libredis.so
+
 %files devel
 %{_libdir}/libsyslog-ng.so
 %{_includedir}/%{name}/
@@ -276,6 +295,14 @@ fi
 
 
 %changelog
+* Sat Oct 19 2013 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.5.0-0.beta3.1
+- Update to syslog-ng 3.5.0 beta 3
+- Updated source0 URL
+- syslog-ng.service patch rebased (syslog-ng-3.5.0-syslog-ng.service.patch)
+- New BR: systemd-devel
+- New subpackage: syslog-ng-redis (new BR: hiredis-devel)
+- Disabled parallel build (currently fails)
+
 * Thu Oct 17 2013 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.4.4-1
 - Update to syslog-ng 3.4.4