[syslog-ng] * Update to syslog-ng 3.4.0 rc2

Sat Jan 19 17:20:59 UTC 2013

commit 1390f7dfd1a8e6ccc9433d1097c332ab13ddaa4e
Author: Jose Pedro Oliveira <jpo at di.uminho.pt>
Date:   Sat Jan 19 18:19:59 2013 +0000

     * Update to syslog-ng 3.4.0 rc2

 .gitignore     |    1 +
 sources        |    2 +-
 syslog-ng.spec |   63 +++++++++++++++++++++++++++++++++++++++++++------------
 3 files changed, 51 insertions(+), 15 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index aa01034..c0ac8fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ syslog-ng_3.1.1.tar.gz
 /syslog-ng-3.3.6.91-20121008-v3.3.6.91.tar.gz
 /syslog-ng_3.3.7.tar.gz
 /syslog-ng_3.3.8.tar.gz
+/syslog-ng_3.4.0rc2.tar.gz
diff --git a/sources b/sources
index a7cbcd1..4dcf00b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-df8910af42336988f209cbe61c996e1d  syslog-ng_3.3.8.tar.gz
+88e7078859f13f55a81c12039923323e  syslog-ng_3.4.0rc2.tar.gz
diff --git a/syslog-ng.spec b/syslog-ng.spec
index 0ba7ee6..7dd0f53 100644
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -1,23 +1,23 @@
-%global evtlog_ver 0.2.12
-%global ivykis_ver 0.30.5
+%global evtlog_ver 0.2.13
+%global ivykis_ver 0.36.1
 
 Name: syslog-ng
-Version: 3.3.8
-Release: 2%{?dist}
+Version: 3.4.0
+Release: 0.1.rc2%{?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
+Source0: http://www.balabit.com/downloads/files?path=/syslog-ng/sources/%{version}/source/%{name}_%{version}rc2.tar.gz
 Source1: syslog-ng.conf
 Source2: syslog-ng.logrotate
 
 Patch0: syslog-ng-3.3.6-syslog-ng.service.patch
-Patch1: syslog-ng-3.2.5-tests-functional-control.py.patch
+Patch1: syslog-ng-3.4.0beta1-tests-functional-control.py.patch
 Patch2: syslog-ng-3.3.6-tests-functional-sql-test.patch
 
-BuildRequires: systemd
+BuildRequires: systemd-units
 BuildRequires: pkgconfig
 BuildRequires: libtool
 BuildRequires: bison, flex
@@ -32,6 +32,11 @@ BuildRequires: libnet-devel
 BuildRequires: openssl-devel
 BuildRequires: pcre-devel >= 6.1
 BuildRequires: tcp_wrappers-devel
+BuildRequires: libuuid-devel
+BuildRequires: libesmtp-devel
+BuildRequires: libmongo-client-devel
+BuildRequires: GeoIP-devel
+#BuildRequires: librabbitmq-devel
 
 # Test suite
 BuildRequires: python
@@ -40,9 +45,9 @@ BuildRequires: libdbi-dbd-sqlite
 
 Requires: logrotate
 Requires: ivykis >= %{ivykis_ver}
-Requires(post): systemd
-Requires(preun): systemd
-Requires(postun): systemd
+Requires(post): systemd-units
+Requires(preun): systemd-units
+Requires(postun): systemd-units
 
 Provides: syslog
 # merge separate syslog-vim package into one
@@ -72,6 +77,15 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 This module supports a large number of database systems via libdbi.
 
 
+%package mongodb
+Summary: mongodb support for %{name}
+Group: Development/Libraries
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description mongodb
+This module supports the mongodb database via libmongo-client.
+
+
 %package devel
 Summary: Development files for %{name}
 Group: Development/Libraries
@@ -83,7 +97,7 @@ developing applications that use %{name}.
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}rc2
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -100,6 +114,7 @@ developing applications that use %{name}.
 
 
 %build
+GEOIP_LIBS=-lGeoIP; export GEOIP_LIBS; \
 %configure \
     --prefix=%{_prefix} \
     --sysconfdir=%{_sysconfdir}/%{name} \
@@ -108,6 +123,7 @@ developing applications that use %{name}.
     --with-module-dir=/%{_libdir}/%{name} \
     --with-systemdsystemunitdir=%{_unitdir} \
     --with-ivykis=system \
+    --with-libmongo-client=system \
     --with-embedded-crypto \
     --enable-ipv6 \
     --enable-tcp-wrapper \
@@ -117,10 +133,14 @@ developing applications that use %{name}.
     --enable-sql \
     --enable-json \
     --enable-ssl \
+    --enable-smtp \
+    --enable-geoip \
     --enable-shared \
     --disable-static \
     --enable-dynamic-linking \
-    --enable-systemd
+    --enable-systemd \
+    --disable-amqp \
+    --with-librabbitmq-client=no
 
 # remove rpath
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -211,7 +231,6 @@ fi
 %dir %{_sysconfdir}/%{name}/conf.d
 %dir %{_sysconfdir}/%{name}/patterndb.d
 %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
-%config(noreplace) %{_sysconfdir}/%{name}/modules.conf
 %config(noreplace) %{_sysconfdir}/%{name}/scl.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/syslog
 %{_unitdir}/%{name}.service
@@ -222,9 +241,10 @@ fi
 %{_bindir}/loggen
 %{_bindir}/pdbtool
 %{_bindir}/update-patterndb
-%{_libdir}/lib%{name}-%{version}.so
+%{_libdir}/lib%{name}-%{version}rc2.so
 %{_libdir}/%{name}/*.so
 %exclude %{_libdir}/%{name}/libafsql.so
+%exclude %{_libdir}/%{name}/libafmongodb.so
 
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/syslog-ng.vim
@@ -245,6 +265,9 @@ fi
 %files libdbi
 %{_libdir}/%{name}/libafsql.so
 
+%files mongodb
+%{_libdir}/%{name}/libafmongodb.so
+
 %files devel
 %{_libdir}/libsyslog-ng.so
 %{_includedir}/%{name}/
@@ -253,6 +276,18 @@ fi
 
 
 %changelog
+* Sat Jan 19 2013 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.4.0-0.1.rc2
+- Update to syslog-ng 3.4.0 rc2
+- Bumped the eventlog version requirement to 0.2.13
+- Bumped the ivykis version requirement to 0.36.1
+- New build requirement: GeoIP-devel (--enable-geoip)
+- New build requirement: libuuid-devel
+- New build requirement: libesmtp-devel (--enable-smtp)
+- New build requirement: libmongo-client--devel (--with-libmongo-client=system)
+- Splitted the mongodb support into a subpackage
+- Rebased the syslog-ng-3.2.5-tests-functional-control.py.patch patch
+- Disable the AMQP support (until it builds with an external librabbitmq library)
+
 * Sat Jan 19 2013 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.3.8-2
 - Corrected bogus dates in the changelog section
 
