X-Git-Url: https://git.tld-linux.org/?p=packages%2Fsyslog-ng.git;a=blobdiff_plain;f=syslog-ng.spec;fp=syslog-ng.spec;h=e9b64aefb9a2c22a3eeb1426c693018ed40ba1e7;hp=3e27a55755a4e0e5955138291c5a441b8328fc07;hb=f308a36d221567ff84e6d21b66056d20baec5572;hpb=605a9e3eca02402402f925b7a430960ec2409daa

diff --git a/syslog-ng.spec b/syslog-ng.spec
index 3e27a55..e9b64ae 100644
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -28,37 +28,39 @@
 # as in git submodule
 %define	libivykis_version 0.42.4
 
-%define		glib2_ver	1:2.28.0
-%define		mver	3.37
-%define		docmver	3.37
+%define		glib2_ver	1:2.32.0
+%define		mver	4.2
+%define		docmver	4.2
 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.37.1
-Release:	1
+Version:	4.2.0
+Release:	0.1
 License:	GPL v2+ with OpenSSL exception
 Group:		Daemons
 Source0:	https://github.com/balabit/syslog-ng/archive/%{name}-%{version}.tar.gz
-# Source0-md5:	3c6831a3863738a78c30ab186bcee271
+# Source0-md5:	755953b638c07fe6ddad4c467c47f34b
 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:	7f69858a9fcdfd09f055bb4b17a0fe0f
+# Source4-md5:	46b021e8b47ddbe15bfc9134aa54c183
 Source5:	%{name}-simple.conf
 Source6:	https://github.com/buytenh/ivykis/archive/v%{libivykis_version}/ivykis-%{libivykis_version}.tar.gz
 # 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
+Patch1:		pcre2.patch
+Patch2:		%{name}-nolibs.patch
+Patch3:		man-paths.patch
+Patch4:		%{name}-link.patch
+Patch5:		no_shared_ivykis.patch
+Patch6:		bison.patch
+Patch7:		shebang.patch
 URL:		https://syslog-ng.org/
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
-BuildRequires:	bison >= 2.4
+BuildRequires:	bison >= 3.7.6
 %{?with_http:BuildRequires:	curl-devel}
 BuildRequires:	docbook-style-xsl
 %{?with_tests:BuildRequires:	findutils}
@@ -79,7 +81,7 @@ BuildRequires:	libwrap-devel
 BuildRequires:	libxslt-progs
 BuildRequires:	lz4-devel >= r131-5
 BuildRequires:	openssl-devel >= 0.9.8
-BuildRequires:	pcre-devel >= 6.1
+BuildRequires:	pcre2-8-devel >= 10.0
 BuildRequires:	pkgconfig
 %{?with_system_rabbitmq:BuildRequires:	rabbitmq-c-devel >= 0.5.3}
 %{?with_riemann:BuildRequires:	riemann-c-client-devel >= 1.0.0}
@@ -108,7 +110,6 @@ Requires:	psmisc >= 20.1
 Requires:	rc-scripts >= 0.4.3.0
 # for afsocket
 Requires:	libnet >= 1:1.1.2.1-7
-# for afsocket and dbparser
 Requires:	openssl >= 0.9.8
 Provides:	service(klogd)
 Provides:	service(syslog)
@@ -305,6 +306,8 @@ mv ivykis-%{libivykis_version} lib/ivykis
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch7 -p1
 cp -p %{SOURCE4} doc
 cp -p %{SOURCE5} contrib/syslog-ng.conf.simple
 
@@ -319,7 +322,6 @@ cp -p %{SOURCE5} contrib/syslog-ng.conf.simple
 %configure \
 	--sysconfdir=%{_sysconfdir}/syslog-ng \
 	--disable-silent-rules \
-	--with-default-modules=affile,afprog,afsocket,afuser,basicfuncs,csvparser,dbparser,syslogformat \
 	--with-docbook=%{xsl_stylesheets_dir}/manpages/docbook.xsl \
 	--enable-java%{!?with_java:=no} \
 	--enable-java-modules%{!?with_java:=no} \
@@ -493,18 +495,20 @@ exit 0
 %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}/libcorrelation.so
 %attr(755,root,root) %{moduledir}/libcryptofuncs.so
 %attr(755,root,root) %{moduledir}/libcsvparser.so
-%attr(755,root,root) %{moduledir}/libdbparser.so
 %attr(755,root,root) %{moduledir}/libdisk-buffer.so
 %attr(755,root,root) %{moduledir}/libexamples.so
 %if %{with geoip2}
 %attr(755,root,root) %{moduledir}/libgeoip2-plugin.so
 %endif
 %attr(755,root,root) %{moduledir}/libgraphite.so
+%attr(755,root,root) %{moduledir}/libkafka.so
 %attr(755,root,root) %{moduledir}/libhook-commands.so
 %attr(755,root,root) %{moduledir}/libkvformat.so
 %attr(755,root,root) %{moduledir}/liblinux-kmsg-format.so
+%attr(755,root,root) %{moduledir}/libmetrics-probe.so
 %dir %{moduledir}/loggen
 %attr(755,root,root) %{moduledir}/loggen/libloggen_socket_plugin.so
 %attr(755,root,root) %{moduledir}/loggen/libloggen_ssl_plugin.so
@@ -531,6 +535,7 @@ exit 0
 %attr(755,root,root) %{_bindir}/slogkey
 %attr(755,root,root) %{_bindir}/slogverify
 %attr(755,root,root) %{_bindir}/update-patterndb
+%attr(755,root,root) %{_bindir}/syslog-ng-update-virtualenv
 
 %dir %{_datadir}/syslog-ng/include
 %dir %{_datadir}/syslog-ng/include/scl
@@ -545,7 +550,7 @@ exit 0
 %{_datadir}/syslog-ng/include/scl/graphite
 %{_datadir}/syslog-ng/include/scl/hdfs
 %{_datadir}/syslog-ng/include/scl/kafka
-%{_datadir}/syslog-ng/include/scl/kubernetes
+#%{_datadir}/syslog-ng/include/scl/kubernetes
 %{_datadir}/syslog-ng/include/scl/iptables
 %{_datadir}/syslog-ng/include/scl/junos
 %{_datadir}/syslog-ng/include/scl/linux-audit
@@ -560,9 +565,11 @@ exit 0
 %{_datadir}/syslog-ng/include/scl/osquery
 %{_datadir}/syslog-ng/include/scl/pacct
 %{_datadir}/syslog-ng/include/scl/paloalto
+%{_datadir}/syslog-ng/include/scl/python
 %{_datadir}/syslog-ng/include/scl/rewrite
 %{_datadir}/syslog-ng/include/scl/snmptrap
 %{_datadir}/syslog-ng/include/scl/solaris
+%{_datadir}/syslog-ng/include/scl/splunk
 %{_datadir}/syslog-ng/include/scl/sudo
 %{_datadir}/syslog-ng/include/scl/sumologic
 %{_datadir}/syslog-ng/include/scl/websense
@@ -572,6 +579,7 @@ exit 0
 %attr(755,root,root) %{_datadir}/syslog-ng/include/scl/syslogconf/convert-syslogconf.awk
 %{_datadir}/syslog-ng/include/scl/syslogconf/plugin.conf
 %{_datadir}/syslog-ng/include/scl/system
+%{_datadir}/syslog-ng/smart-multi-line.fsm
 %{_datadir}/syslog-ng/xsd
 
 %dir %{_var}/lib/%{name}
@@ -682,6 +690,7 @@ exit 0
 %{_includedir}/syslog-ng/control
 %{_includedir}/syslog-ng/debugger
 %{_includedir}/syslog-ng/filter
+%{_includedir}/syslog-ng/healthcheck
 %if %{without system_libivykis}
 %{_includedir}/syslog-ng/ivykis
 %endif
@@ -690,6 +699,7 @@ exit 0
 %{_includedir}/syslog-ng/logthrdest
 %{_includedir}/syslog-ng/logthrsource
 %{_includedir}/syslog-ng/modules
+%{_includedir}/syslog-ng/multi-line
 %{_includedir}/syslog-ng/parser
 %{_includedir}/syslog-ng/rewrite
 %{_includedir}/syslog-ng/scanner