- PLD merge, updated to 3.6.4

diff --git a/syslog-ng.spec b/syslog-ng.spec
index 5afb517ef228b47040c6c70324d7864167229868..390d94e487b4b82a61b2b20e45d22d1da9fb4e6f 100644 (file)
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -10,6 +10,7 @@
 %bcond_without json                    # support for JSON template formatting
 %bcond_without mongodb                 # support for mongodb destination
 %bcond_without redis                   # support for Redis destination
+%bcond_without riemann                 # support for Riemann monitoring system
 %bcond_without smtp                    # support for logging into SMTP
 %bcond_without geoip                   # support for GeoIP
 %bcond_without system_libivykis        # use system libivykis
@@ -20,25 +21,25 @@ Summary:    Syslog-ng - new generation of the system logger
 Summary(pl.UTF-8):     Syslog-ng - systemowy demon logujący nowej generacji
 Summary(pt_BR.UTF-8):  Daemon de log nova geração
 Name:          syslog-ng
-Version:       3.6.2
-Release:       4
+Version:       3.6.4
+Release:       1
 License:       GPL v2+ with OpenSSL exception
 Group:         Daemons
 Source0:       http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/%{version}/source/%{name}_%{version}.tar.gz
-# Source0-md5: 6928e9be3499a2e9ae52ea8aa204b165
+# Source0-md5: e9f401615e92e5eb27396c995c1446ba
 Source1:       %{name}.init
 Source2:       %{name}.conf
 Source3:       %{name}.logrotate
 Source4:       http://www.balabit.com/support/documentation/syslog-ng-ose-3.6-guides/en/syslog-ng-ose-v3.6-guide-admin/pdf/%{name}-ose-v3.6-guide-admin.pdf
-# Source4-md5: bb12c18aef655096987911c4a9fe3ffa
+# Source4-md5: 2b6bd4f0da9c4f843691409a3e16f4d7
 Source5:       %{name}-simple.conf
 Patch0:                %{name}-datadir.patch
 Patch1:                cap_syslog-vserver-workaround.patch
 Patch2:                %{name}-nolibs.patch
 Patch3:                man-paths.patch
-URL:           http://www.balabit.com/products/syslog_ng/
+URL:           https://www.balabit.com/network-security/syslog-ng/opensource-logging-system
 %{?with_geoip:BuildRequires:   GeoIP-devel >= 1.5.1}
-BuildRequires: autoconf >= 2.53
+BuildRequires: autoconf >= 2.59
 BuildRequires: automake
 BuildRequires: bison >= 2.4
 BuildRequires: docbook-style-xsl
@@ -52,7 +53,7 @@ BuildRequires:        libcap-devel
 %{?with_sql:BuildRequires:     libdbi-devel >= 0.8.3-2}
 %{?with_smtp:BuildRequires:    libesmtp-devel}
 %{?with_system_libivykis:BuildRequires:        libivykis-devel >= 0.36.1}
-%{?with_mongodb:BuildRequires: libmongo-client-devel >= 0.1.6}
+%{?with_mongodb:BuildRequires: libmongo-client-devel >= 0.1.8}
 BuildRequires: libnet-devel >= 1:1.1.2.1-3
 BuildRequires: libtool >= 2:2.0
 BuildRequires: libwrap-devel
@@ -60,6 +61,7 @@ BuildRequires:        openssl-devel >= 0.9.8
 BuildRequires: pcre-devel >= 6.1
 BuildRequires: pkgconfig
 %{?with_system_rabbitmq:BuildRequires: rabbitmq-c-devel >= 0.0.1}
+%{?with_riemann:BuildRequires: riemann-c-client-devel >= 1.0.0}
 BuildRequires: rpm >= 4.4.9-56
 BuildRequires: rpmbuild(macros) >= 1.623
 BuildRequires: which
@@ -139,28 +141,12 @@ melhorias, como, por exemplo, a habilidade de filtrar mensagens de log
 por seu conteúdo (usando expressões regulares) e não apenas pelo par
 facility/prioridade como o syslog original.
 
-%package upstart
-Summary:       Upstart job description for syslog-ng
-Summary(pl.UTF-8):     Opis zadania Upstart dla demona syslog-ng
-Group:         Daemons
-Requires:      %{name} = %{version}-%{release}
-Requires:      upstart >= 0.6
-Conflicts:     avahi-upstart < 0.6.30-2
-Conflicts:     openssh-server-upstart < 2:5.8p2-2
-Conflicts:     postgresql-upstart < 9.0.4-2
-
-%description upstart
-Upstart job description for syslog-ng.
-
-%description upstart -l pl.UTF-8
-Opis zadania Upstart dla demona syslog-ng.
-
 %package module-afmongodb
 Summary:       MongoDB destination support module for syslog-ng
 Summary(pl.UTF-8):     Moduł sysloga-ng do obsługi zapisu logów w bazie MongoDB
 Group:         Libraries
 Requires:      %{name} = %{version}-%{release}
-Requires:      libmongo-client >= 0.1.6
+Requires:      libmongo-client >= 0.1.8
 
 %description module-afmongodb
 MongoDB destination support module for syslog-ng.
@@ -223,6 +209,19 @@ Redis destination support module for syslog-ng (via libhiredis).
 Moduł sysloga-ng do obsługi zapisu logów w bazie Redis (poprzez
 libhiredis).
 
+%package module-riemann
+Summary:       Riemann destination support module for syslog-ng
+Summary(pl.UTF-8):     Moduł sysloga-ng do obsługi zapisu logów do systemu Riemann
+Group:         Libraries
+Requires:      %{name} = %{version}-%{release}
+Requires:      riemann-c-client >= 1.0.0
+
+%description module-riemann
+Riemann destination support module for syslog-ng.
+
+%description module-riemann -l pl.UTF-8
+Moduł sysloga-ng do obsługi zapisu logów do systemu Riemann.
+
 %package module-tfgeoip
 Summary:       syslog-ng template function module to get GeoIP info from an IPv4 addresses
 Summary(pl.UTF-8):     Moduł funkcji szablonu sysloga-ng do pobierania informacji GeoIP z adresów IPv4
@@ -300,6 +299,7 @@ done
        --datadir=%{_datadir}/syslog-ng \
        --disable-silent-rules \
        --with-default-modules=affile,afprog,afsocket,afuser,basicfuncs,csvparser,dbparser,syslogformat \
+       --with-docbook=%{xsl_stylesheets_dir}/manpages/docbook.xsl \
 %if %{with mongodb}
        --enable-mongodb \
        --with-libmongo-client=system \
@@ -321,9 +321,11 @@ done
        --enable-ipv6 \
        --enable-json%{!?with_json:=no} \
        --enable-linux-caps \
+       --enable-manpages \
        --enable-pacct \
        --enable-pcre \
        --enable-redis%{!?with_redis:=no} \
+       --enable-riemann%{!?with_riemann:=no} \
        --enable-smtp%{!?with_smtp:=no} \
        --enable-spoof-source \
        --enable-ssl \
@@ -337,8 +339,7 @@ done
        --enable-mixed-linking
 %endif
 
-%{__make} \
-       XSL_STYLESHEET=%{xsl_stylesheets_dir}/manpages/docbook.xsl
+%{__make}
 
 %if %{with tests}
 LD_LIBRARY_PATH=$(find $PWD -name '*.so*' -printf "%h:")
@@ -349,7 +350,7 @@ export LD_LIBRARY_PATH PYTHONPATH
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/{sysconfig,logrotate.d,rc.d/init.d,init} \
+install -d $RPM_BUILD_ROOT/etc/{sysconfig,logrotate.d,rc.d/init.d} \
        $RPM_BUILD_ROOT%{_sysconfdir}/syslog-ng/patterndb.d \
        $RPM_BUILD_ROOT/var/{log,lib/%{name}/xsd}
 
@@ -525,6 +526,12 @@ exit 0
 %attr(755,root,root) %{_libdir}/syslog-ng/libredis.so
 %endif
 
+%if %{with riemann}
+%files module-riemann
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/syslog-ng/libriemann.so
+%endif
+ 
 %if %{with geoip}
 %files module-tfgeoip
 %defattr(644,root,root,755)