- updated to 3.30.1

[packages/syslog-ng.git] / syslog-ng.spec

diff --git a/syslog-ng.spec b/syslog-ng.spec
index 75590aa36d61b4edb195dede79601041b0749ab3..8cae05b9c295367af7e8d8f5bb1cc63ab0675827 100644 (file)
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -13,7 +13,6 @@
 %bcond_without mongodb                 # support for mongodb destination
 %bcond_without redis                   # support for Redis destination
 %bcond_without smtp                    # support for logging into SMTP
-%bcond_without geoip                   # support for GeoIP
 %bcond_without geoip2                  # support for GeoIP2
 %bcond_without riemann                 # support for Riemann monitoring system
 %bcond_without amqp                    # AMQP support
@@ -27,36 +26,36 @@
 %endif
 
 # as in git submodule
-%define        libivykis_version 0.42.3
+%define        libivykis_version 0.42.4
 
-%define                glib2_ver       1:2.24.0
-%define                mver    3.18
-%define                docmver 3.18
+%define                glib2_ver       1:2.28.0
+%define                mver    3.30
+%define                docmver 3.30
 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.18.1
-Release:       2
+Version:       3.30.1
+Release:       1
 License:       GPL v2+ with OpenSSL exception
 Group:         Daemons
 Source0:       https://github.com/balabit/syslog-ng/archive/%{name}-%{version}.tar.gz
-# Source0-md5: 43dc0dbe1c6de5118b2684d009c2ca04
+# Source0-md5: c17a8df8def95dbbe6c93db18842cedd
 Source1:       %{name}.init
 Source2:       %{name}.conf
 Source3:       %{name}.logrotate
 Source4:       https://syslog-ng.com/documents/html/syslog-ng-ose-%{docmver}-guides/en/syslog-ng-ose-guide-admin/pdf/syslog-ng-ose-guide-admin.pdf
-# Source4-md5: 63d323477c2ecac278c62c7e6af84788
+# Source4-md5: 306cd320be8237a8587e531b4b64a18c
 Source5:       %{name}-simple.conf
 Source6:       https://github.com/buytenh/ivykis/archive/v%{libivykis_version}/ivykis-%{libivykis_version}.tar.gz
-# Source6-md5: 4d84813d011ff671e66eccc952a5c78f
+# Source6-md5: e09caeb95a01a541ec40d3b757dada12
 Patch0:                %{name}-datadir.patch
 Patch1:                %{name}-nolibs.patch
 Patch2:                man-paths.patch
 Patch3:                %{name}-link.patch
 Patch4:                no_shared_ivykis.patch
+Patch5:                bison.patch
 URL:           https://syslog-ng.org/
-%{?with_geoip:BuildRequires:   GeoIP-devel >= 1.5.1}
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake
 BuildRequires: bison >= 2.4
@@ -66,10 +65,10 @@ BuildRequires:      docbook-style-xsl
 BuildRequires: flex
 BuildRequires: glib2-devel >= %{glib2_ver}
 %{?with_redis:BuildRequires:   hiredis-devel}
-%{?with_json:BuildRequires:    json-c-devel >= 0.9}
+%{?with_json:BuildRequires:    json-c-devel >= 0.13}
 %{?with_mongodb:BuildRequires: libbson-devel}
 BuildRequires: libcap-devel
-%{?with_sql:BuildRequires:     libdbi-devel >= 0.8.3-2}
+%{?with_sql:BuildRequires:     libdbi-devel >= 0.9.0}
 %{?with_smtp:BuildRequires:    libesmtp-devel}
 %{?with_system_libivykis:BuildRequires:        libivykis-devel >= %{libivykis_version}}
 %{?with_mongodb:BuildRequires: mongo-c-driver-devel}
@@ -82,7 +81,7 @@ BuildRequires:        lz4-devel >= r131-5
 BuildRequires: openssl-devel >= 0.9.8
 BuildRequires: pcre-devel >= 6.1
 BuildRequires: pkgconfig
-%{?with_system_rabbitmq:BuildRequires: rabbitmq-c-devel >= 0.0.1}
+%{?with_system_rabbitmq:BuildRequires: rabbitmq-c-devel >= 0.5.3}
 %{?with_riemann:BuildRequires: riemann-c-client-devel >= 1.0.0}
 BuildRequires: rpm >= 4.4.9-56
 BuildRequires: rpmbuild(macros) >= 1.623
@@ -116,6 +115,7 @@ Provides:   service(syslog)
 Provides:      syslogdaemon
 Obsoletes:     syslog-ng-module-afsocket
 Obsoletes:     syslog-ng-module-dbparser
+Obsoletes:     syslog-ng-module-tfgeoip
 Obsoletes:     syslog-ng-systemd
 Conflicts:     klogd
 Conflicts:     msyslog
@@ -259,22 +259,6 @@ 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
-Group:         Libraries
-Requires:      %{name} = %{version}-%{release}
-Requires:      GeoIP-db-Country
-Requires:      GeoIP-libs >= 1.5.1
-
-%description module-tfgeoip
-syslog-ng template function module to get GeoIP info from an IPv4
-addresses.
-
-%description module-tfgeoip -l pl.UTF-8
-Moduł funkcji szablonu sysloga-ng do pobierania informacji GeoIP z
-adresów IPv4.
-
 %package libs
 Summary:       Shared library for syslog-ng
 Summary(pl.UTF-8):     Biblioteka współdzielona sysloga-ng
@@ -320,6 +304,7 @@ mv ivykis-%{libivykis_version} lib/ivykis
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 cp -p %{SOURCE4} doc
 cp -p %{SOURCE5} contrib/syslog-ng.conf.simple
 
@@ -355,7 +340,6 @@ cp -p %{SOURCE5} contrib/syslog-ng.conf.simple
        --with-pidfile-dir=/var/run \
        --with-timezone-dir=%{_datadir}/zoneinfo \
        %{__enable_disable amqp} \
-       %{__enable_disable geoip} \
        %{__enable_disable geoip2} \
        --enable-http%{!?with_http:=no} \
        --enable-ipv6 \
@@ -500,16 +484,17 @@ exit 0
 %endif
 %attr(755,root,root) %{moduledir}/libaffile.so
 %attr(755,root,root) %{moduledir}/libafprog.so
+%attr(755,root,root) %{moduledir}/libafsnmp.so
 %attr(755,root,root) %{moduledir}/libafsocket.so
 %attr(755,root,root) %{moduledir}/libafstomp.so
 %attr(755,root,root) %{moduledir}/libafuser.so
 %attr(755,root,root) %{moduledir}/libappmodel.so
+%attr(755,root,root) %{moduledir}/libazure-auth-header.so
 %attr(755,root,root) %{moduledir}/libbasicfuncs.so
 %attr(755,root,root) %{moduledir}/libcef.so
 %attr(755,root,root) %{moduledir}/libconfgen.so
 %attr(755,root,root) %{moduledir}/libcryptofuncs.so
 %attr(755,root,root) %{moduledir}/libcsvparser.so
-%attr(755,root,root) %{moduledir}/libdate.so
 %attr(755,root,root) %{moduledir}/libdbparser.so
 %attr(755,root,root) %{moduledir}/libdisk-buffer.so
 %attr(755,root,root) %{moduledir}/libexamples.so
@@ -526,10 +511,11 @@ exit 0
 %attr(755,root,root) %{moduledir}/libmap-value-pairs.so
 %attr(755,root,root) %{moduledir}/libpacctformat.so
 %attr(755,root,root) %{moduledir}/libpseudofile.so
-%attr(755,root,root) %{moduledir}/libsnmptrapd-parser.so
+%attr(755,root,root) %{moduledir}/libsecure-logging.so
 %attr(755,root,root) %{moduledir}/libstardate.so
 %attr(755,root,root) %{moduledir}/libtags-parser.so
 %attr(755,root,root) %{moduledir}/libtfgetent.so
+%attr(755,root,root) %{moduledir}/libtimestamp.so
 %attr(755,root,root) %{moduledir}/libxml.so
 %attr(755,root,root) %{moduledir}/libsyslogformat.so
 %attr(755,root,root) %{moduledir}/libsystem-source.so
@@ -538,16 +524,24 @@ exit 0
 %attr(755,root,root) %{_bindir}/dqtool
 %attr(755,root,root) %{_bindir}/loggen
 %attr(755,root,root) %{_bindir}/pdbtool
+%attr(755,root,root) %{_bindir}/persist-tool
+%attr(755,root,root) %{_bindir}/slogencrypt
+%attr(755,root,root) %{_bindir}/slogkey
+%attr(755,root,root) %{_bindir}/slogverify
 %attr(755,root,root) %{_bindir}/update-patterndb
 
 %dir %{_datadir}/syslog-ng/include
 %dir %{_datadir}/syslog-ng/include/scl
 %{_datadir}/syslog-ng/include/scl/apache
+%{_datadir}/syslog-ng/include/scl/checkpoint
+%{_datadir}/syslog-ng/include/scl/cisco
+%{_datadir}/syslog-ng/include/scl/collectd
 %{_datadir}/syslog-ng/include/scl/default-network-drivers
 %{_datadir}/syslog-ng/include/scl/graphite
 %{_datadir}/syslog-ng/include/scl/hdfs
 %{_datadir}/syslog-ng/include/scl/kafka
 %{_datadir}/syslog-ng/include/scl/iptables
+%{_datadir}/syslog-ng/include/scl/junos
 %{_datadir}/syslog-ng/include/scl/linux-audit
 
 %dir %{_datadir}/syslog-ng/include/scl/loadbalancer
@@ -557,10 +551,13 @@ exit 0
 %{_datadir}/syslog-ng/include/scl/nodejs
 %{_datadir}/syslog-ng/include/scl/osquery
 %{_datadir}/syslog-ng/include/scl/pacct
+%{_datadir}/syslog-ng/include/scl/paloalto
 %{_datadir}/syslog-ng/include/scl/rewrite
 %{_datadir}/syslog-ng/include/scl/snmptrap
 %{_datadir}/syslog-ng/include/scl/solaris
 %{_datadir}/syslog-ng/include/scl/sudo
+%{_datadir}/syslog-ng/include/scl/sumologic
+%{_datadir}/syslog-ng/include/scl/websense
 %{_datadir}/syslog-ng/include/scl/windowseventlog
 %dir %{_datadir}/syslog-ng/include/scl/syslogconf
 %{_datadir}/syslog-ng/include/scl/syslogconf/README
@@ -574,6 +571,11 @@ exit 0
 %{_mandir}/man1/dqtool.1*
 %{_mandir}/man1/loggen.1*
 %{_mandir}/man1/pdbtool.1*
+%{_mandir}/man1/slogencrypt.1*
+%{_mandir}/man1/slogkey.1*
+%{_mandir}/man1/slogverify.1*
+%{_mandir}/man1/persist-tool.1*
+%{_mandir}/man7/secure-logging.7*
 %{_mandir}/man1/syslog-ng-ctl.1*
 %{_mandir}/man5/syslog-ng.conf.5*
 %{_mandir}/man8/syslog-ng.8*
@@ -622,12 +624,13 @@ exit 0
 %defattr(644,root,root,755)
 %attr(755,root,root) %{moduledir}/libjson-plugin.so
 %{_datadir}/syslog-ng/include/scl/cim
-%{_datadir}/syslog-ng/include/scl/cisco
 %{_datadir}/syslog-ng/include/scl/elasticsearch
 %{_datadir}/syslog-ng/include/scl/ewmm
 %{_datadir}/syslog-ng/include/scl/graylog2
 %{_datadir}/syslog-ng/include/scl/loggly
 %{_datadir}/syslog-ng/include/scl/logmatic
+%{_datadir}/syslog-ng/include/scl/netskope
+%{_datadir}/syslog-ng/include/scl/slack
 %endif
 
 %if %{with redis}
@@ -642,12 +645,6 @@ exit 0
 %attr(755,root,root) %{moduledir}/libriemann.so
 %endif
 
-%if %{with geoip}
-%files module-tfgeoip
-%defattr(644,root,root,755)
-%attr(755,root,root) %{moduledir}/libgeoip-plugin.so
-%endif
-
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{slibdir}/libevtlog-%{mver}.so.*.*.*
@@ -672,6 +669,7 @@ exit 0
 %{_libdir}/libsyslog-ng-native-connector.a
 %dir %{_includedir}/syslog-ng
 %{_includedir}/syslog-ng/*.h
+%{_includedir}/syslog-ng/ack-tracker
 %{_includedir}/syslog-ng/compat
 %{_includedir}/syslog-ng/control
 %{_includedir}/syslog-ng/debugger
@@ -681,15 +679,17 @@ exit 0
 %endif
 %{_includedir}/syslog-ng/logmsg
 %{_includedir}/syslog-ng/logproto
+%{_includedir}/syslog-ng/logthrdest
 %{_includedir}/syslog-ng/logthrsource
-%dir %{_includedir}/syslog-ng/modules
-%{_includedir}/syslog-ng/modules/add-contextual-data
+%{_includedir}/syslog-ng/modules
 %{_includedir}/syslog-ng/parser
 %{_includedir}/syslog-ng/rewrite
 %{_includedir}/syslog-ng/scanner
+%{_includedir}/syslog-ng/signal-slot-connector
 %{_includedir}/syslog-ng/stats
 %{_includedir}/syslog-ng/str-repr
 %{_includedir}/syslog-ng/template
+%{_includedir}/syslog-ng/timeutils
 %{_includedir}/syslog-ng/transport
 %{_includedir}/syslog-ng/value-pairs
 %{_datadir}/syslog-ng/tools