X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=syslog-ng.spec;h=65a175bd25ad48a44d4a629275ff3508505533b9;hb=8be4288;hp=1a7b82052486f54c8f4a7c91c836abb0090ad5fb;hpb=2571715fc93df9e82c9e7a06eb9c225e4196b713;p=packages%2Fsyslog-ng.git

diff --git a/syslog-ng.spec b/syslog-ng.spec
index 1a7b820..65a175b 100644
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -32,19 +32,19 @@
 %define	libivykis_version 0.42.4
 
 %define		glib2_ver	1:2.28
-%define		mver	3.29
+%define		mver	3.36
 %define		docmver	3.12
 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.29.1
+Version:	3.36.1
 Release:	1
 License:	GPL v2+ with OpenSSL exception
 Group:		Daemons
 #Source0Download: https://github.com/syslog-ng/syslog-ng/releases
 Source0:	https://github.com/syslog-ng/syslog-ng/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	5bc0c28d37310a3487efe0a6d79db8ab
+# Source0-md5:	a3a39aa2c65c4d291f96ab560ea7a4f9
 Source1:	%{name}.init
 Source2:	%{name}.conf
 Source3:	%{name}.logrotate
@@ -59,15 +59,14 @@ Source6:	https://github.com/buytenh/ivykis/archive/v%{libivykis_version}/ivykis-
 %endif
 Source7:	syslog-ng.service
 Patch0:		%{name}-datadir.patch
-# https://github.com/syslog-ng/syslog-ng/commit/1d90d844a39eb25ac3423f663b0409f61a064330.patch
-# https://github.com/syslog-ng/syslog-ng/commit/46fa90bdd3adee5bcbb2687cf00c08925c504c07.patch
-Patch1:		%{name}-tests-fixes.patch
 Patch2:		%{name}-nolibs.patch
 Patch3:		%{name}-systemd.patch
 Patch4:		man-paths.patch
 Patch5:		%{name}-link.patch
 Patch6:		no_shared_ivykis.patch
 Patch7:		32bit.patch
+Patch8:		openssl3.patch
+Patch9:		glib-static.patch
 URL:		https://syslog-ng.org/
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
@@ -91,11 +90,12 @@ BuildRequires:	libcap-devel
 %{?with_mongodb:BuildRequires:	mongo-c-driver-devel >= 1.0.0}
 %{?with_geoip2:BuildRequires:	libmaxminddb-devel}
 BuildRequires:	libnet-devel >= 1:1.1.2.1-3
-%{?with_kafka:BuildRequires:	librdkafka-devel >= 1.0.0}
+%{?with_kafka:BuildRequires:	librdkafka-devel >= 1.1.0}
 BuildRequires:	libtool >= 2:2.0
 BuildRequires:	libwrap-devel
 BuildRequires:	libxslt-progs
 BuildRequires:	lz4-devel >= r131-5
+BuildRequires:	net-snmp-devel
 BuildRequires:	openssl-devel >= 0.9.8
 BuildRequires:	pcre-devel >= 6.1
 BuildRequires:	pkgconfig
@@ -103,7 +103,7 @@ BuildRequires:	pkgconfig
 %{?with_riemann:BuildRequires:	riemann-c-client-devel >= 1.6.0}
 BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpmbuild(macros) >= 1.623
-%{?with_systemd:BuildRequires:	systemd-devel >= 1:209}
+%{?with_systemd:BuildRequires:	systemd-devel >= 1:245}
 BuildRequires:	which
 %if %{with tests}
 BuildRequires:	GeoIP-db-Country
@@ -136,9 +136,9 @@ Requires:	openssl >= 0.9.8
 Provides:	service(klogd)
 Provides:	service(syslog)
 Provides:	syslogdaemon
-Obsoletes:	syslog-ng-module-afsocket
-Obsoletes:	syslog-ng-module-dbparser
-Obsoletes:	syslog-ng-systemd
+Obsoletes:	syslog-ng-module-afsocket < 3.3.1-4
+Obsoletes:	syslog-ng-module-dbparser < 3.3.1-4
+Obsoletes:	syslog-ng-systemd < 3.3.4-3
 Conflicts:	klogd
 Conflicts:	msyslog
 Conflicts:	rsyslog
@@ -247,7 +247,7 @@ Summary(pl.UTF-8):	Moduł sysloga-ng do obsługi szablonów z formatowaniem JSON
 Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	json-c >= 0.9
-Obsoletes:	syslog-ng-module-tfjson
+Obsoletes:	syslog-ng-module-tfjson < 3.4.2
 
 %description module-json-plugin
 JSON formatting template function for syslog-ng.
@@ -260,7 +260,7 @@ Summary:	Apache Kafka destination support module for syslog-ng
 Summary(pl.UTF-8):	Moduł sysloga-ng do obsługi zapisu logów poprzez protokół Apache Kafka
 Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	librdkafka >= 1.0.0
+Requires:	librdkafka >= 1.1.0
 
 %description module-kafka
 Apache Kafka destination support module for syslog-ng.
@@ -318,6 +318,7 @@ Requires:	glib2 >= %{glib2_ver}
 %{?with_system_libivykis:Requires:	libivykis >= %{libivykis_version}}
 Requires:	pcre >= 6.1
 %endif
+%{?with_systemd:Requires:	systemd-libs >= 1:245}
 Conflicts:	syslog-ng < 3.3.1-3
 
 %description libs
@@ -369,18 +370,19 @@ rmdir lib/ivykis
 %endif
 
 %patch0 -p1
-%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
+%patch9 -p1
 cp -p %{SOURCE4} doc
 cp -p %{SOURCE5} contrib/syslog-ng.conf.simple
 
 %{__sed} -i -e 's|/usr/bin/awk|/bin/awk|' scl/syslogconf/convert-syslogconf.awk
-%{__sed} -i -e '1s,/usr/bin/env python$,%{__python3},' lib/merge-grammar.py
+%{__sed} -i -e '1s,/usr/bin/env python3$,%{__python3},' lib/merge-grammar.py
 
 %build
 for i in . ; do
@@ -537,7 +539,9 @@ fi
 %triggerpostun -- syslog-ng < 3.3.4-3
 %systemd_trigger syslog-ng@.service syslog-ng.service
 
-%triggerun -- syslog-ng < 3.0
+%triggerun -- syslog-ng < 3.19.1
+grep -q '^@include "/etc/syslog-ng\.d/\*\.conf"' /etc/syslog-ng/syslog-ng.conf || echo '@include "/etc/syslog-ng.d/*.conf"' >> /etc/syslog-ng/syslog-ng.conf
+# 3.0
 sed -i -e 's#sync(\(.*\))#flush_lines(\1)#g' /etc/syslog-ng/syslog-ng.conf
 sed -i -e 's#pipe ("/proc/kmsg"#file ("/proc/kmsg"#g' /etc/syslog-ng/syslog-ng.conf
 sed -i -e 's#log_prefix#program_override#g' /etc/syslog-ng/syslog-ng.conf
@@ -548,11 +552,6 @@ sed -i -e 's#match("IN\=\[A-Za-z0-9\]\* OUT=\[A-Za-z0-9\]\*");#match("IN=[A-Za-z
 sed -i -e "1 s#\(.*\)\$#@version: 3.0\n\1#g" /etc/syslog-ng/syslog-ng.conf
 rm -f %{_var}/lib/%{name}/syslog-ng.persist
 %service -q syslog-ng restart
-exit 0
-
-%triggerun -- syslog-ng < 3.19.1
-grep -q '^@include "/etc/syslog-ng\.d/\*\.conf"' /etc/syslog-ng/syslog-ng.conf || echo '@include "/etc/syslog-ng.d/*.conf"' >> /etc/syslog-ng/syslog-ng.conf
-exit 0
 
 %post	libs -p /sbin/ldconfig
 %postun	libs -p /sbin/ldconfig
@@ -603,6 +602,8 @@ 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}/librate-limit-filter.so
+%attr(755,root,root) %{moduledir}/libregexp-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
@@ -636,6 +637,7 @@ exit 0
 # R: basicfuncs
 %{_datadir}/syslog-ng/include/scl/collectd
 %{_datadir}/syslog-ng/include/scl/default-network-drivers
+%{_datadir}/syslog-ng/include/scl/fortigate
 %{_datadir}/syslog-ng/include/scl/graphite
 %{_datadir}/syslog-ng/include/scl/hdfs
 %{_datadir}/syslog-ng/include/scl/kafka
@@ -722,6 +724,9 @@ exit 0
 %defattr(644,root,root,755)
 %attr(755,root,root) %{moduledir}/libjson-plugin.so
 # all below configs require json-plugin
+%{_datadir}/syslog-ng/include/scl/cee
+# R: basicfuncs http json-plugin
+%{_datadir}/syslog-ng/include/scl/discord
 %{_datadir}/syslog-ng/include/scl/cim
 # R: http json-plugin
 %{_datadir}/syslog-ng/include/scl/elasticsearch
@@ -810,6 +815,7 @@ exit 0
 %{_pkgconfigdir}/syslog-ng.pc
 %{_pkgconfigdir}/syslog-ng-native-connector.pc
 
+%if %{with tests}
 %files test-devel
 %defattr(644,root,root,755)
 %if "%{_libdir}/syslog-ng" != "{moduledir}"
@@ -819,3 +825,4 @@ exit 0
 %{_libdir}/syslog-ng/libtest/libsyslog-ng-test.a
 %{_includedir}/syslog-ng/libtest
 %{_pkgconfigdir}/syslog-ng-test.pc
+%endif