[packages/syslog-ng] Up to 4.8.0 (pdf docs unavailable - current docs https://syslog-ng.github.io/)

arekm arekm at pld-linux.org
Thu Aug 1 20:52:15 CEST 2024 

commit 237421d557b8fceead2e2eb2c4628b15b55d057b
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Thu Aug 1 20:38:47 2024 +0200

    Up to 4.8.0 (pdf docs unavailable - current docs https://syslog-ng.github.io/)

 glib-static.patch       | 14 ++++-----
 openssl3.patch          | 30 -------------------
 syslog-ng-link.patch    | 28 +++++++++++-------
 syslog-ng-nolibs.patch  |  9 +++---
 syslog-ng-systemd.patch | 12 ++------
 syslog-ng.conf          |  2 +-
 syslog-ng.spec          | 77 ++++++++++++++++++++++---------------------------
 7 files changed, 67 insertions(+), 105 deletions(-)
---
diff --git a/syslog-ng.spec b/syslog-ng.spec
index 055a054..0bef854 100644
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -29,32 +29,29 @@
 %endif
 
 # as in git submodule
-%define	libivykis_version 0.42.4
+%define	libivykis_version 0.43.2
 
 %define		glib2_ver	1:2.28
-%define		mver	3.36
-%define		docmver	3.12
+%define		mver	4.8
 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.36.1
-Release:	6
+Version:	4.8.0
+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:	a3a39aa2c65c4d291f96ab560ea7a4f9
+# Source0-md5:	581018ae30bc52f49e8489f0c28a43f8
 Source1:	%{name}.init
 Source2:	%{name}.conf
 Source3:	%{name}.logrotate
-Source4:	http://www.balabit.com/support/documentation/syslog-ng-ose-%{docmver}-guides/en/syslog-ng-ose-v%{docmver}-guide-admin/pdf/%{name}-ose-v%{docmver}-guide-admin.pdf
-# Source4-md5:	fce7075b03ba9501911b9812a553e680
-Source5:	%{name}-simple.conf
+Source4:	%{name}-simple.conf
 %if 0
 # for git archives (release tarballs include ivykis)
 #Source6Download: https://github.com/buytenh/ivykis/releases
-Source6:	https://github.com/buytenh/ivykis/archive/v%{libivykis_version}/ivykis-%{libivykis_version}.tar.gz
+Source5:	https://github.com/buytenh/ivykis/archive/v%{libivykis_version}/ivykis-%{libivykis_version}.tar.gz
 # Source6-md5:	e09caeb95a01a541ec40d3b757dada12
 %endif
 Source7:	syslog-ng.service
@@ -65,7 +62,7 @@ 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
@@ -363,7 +360,7 @@ Pakiet pomocniczy do testowania modułów sysloga-ng.
 %setup -q
 %else
 # git archive
-%setup -q -n %{name}-%{name}-%{version} -a 6
+%setup -q -n %{name}-%{name}-%{version} -a 5
 
 rmdir lib/ivykis
 %{__mv} ivykis-%{libivykis_version} lib/ivykis
@@ -376,10 +373,9 @@ rmdir lib/ivykis
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p1
+
 %patch9 -p1
-cp -p %{SOURCE4} doc
-cp -p %{SOURCE5} contrib/syslog-ng.conf.simple
+cp -p %{SOURCE4} 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 python3$,%{__python3},' lib/merge-grammar.py
@@ -560,13 +556,12 @@ rm -f %{_var}/lib/%{name}/syslog-ng.persist
 %defattr(644,root,root,755)
 %doc AUTHORS NEWS.md contrib/relogger.pl
 %doc contrib/syslog-ng.conf.{doc,simple,RedHat}
-%doc contrib/{apparmor,selinux,syslog2ng} doc/syslog-ng-ose-v%{docmver}-guide-admin.pdf
+%doc contrib/{apparmor,selinux,syslog2ng}
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}@default
 %attr(750,root,root) %dir %{_sysconfdir}/syslog-ng
 %attr(750,root,root) %dir %{_sysconfdir}/syslog-ng/patterndb.d
 %attr(750,root,root) %dir %{_sysconfdir}/syslog-ng.d
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/syslog-ng/scl.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/syslog-ng/syslog-ng.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/syslog-ng
 %attr(754,root,root) /etc/rc.d/init.d/syslog-ng
@@ -587,10 +582,12 @@ rm -f %{_var}/lib/%{name}/syslog-ng.persist
 %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}/libcloud_auth.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}/libdbparser.so
 %attr(755,root,root) %{moduledir}/libdisk-buffer.so
 %if %{with geoip2}
 %attr(755,root,root) %{moduledir}/libgeoip2-plugin.so
@@ -600,6 +597,7 @@ rm -f %{_var}/lib/%{name}/syslog-ng.persist
 %attr(755,root,root) %{moduledir}/libkvformat.so
 %attr(755,root,root) %{moduledir}/liblinux-kmsg-format.so
 %attr(755,root,root) %{moduledir}/libmap-value-pairs.so
+%attr(755,root,root) %{moduledir}/libmetrics-probe.so
 %attr(755,root,root) %{moduledir}/libpacctformat.so
 %attr(755,root,root) %{moduledir}/libpseudofile.so
 %attr(755,root,root) %{moduledir}/librate-limit-filter.so
@@ -627,34 +625,50 @@ rm -f %{_var}/lib/%{name}/syslog-ng.persist
 %attr(755,root,root) %{_bindir}/slogencrypt
 %attr(755,root,root) %{_bindir}/slogkey
 %attr(755,root,root) %{_bindir}/slogverify
+%attr(755,root,root) %{_bindir}/syslog-ng-update-virtualenv
 %attr(755,root,root) %{_bindir}/update-patterndb
 
+%{_datadir}/syslog-ng/smart-multi-line.fsm
 %dir %{_datadir}/syslog-ng/include
+%{_datadir}/syslog-ng/include/scl.conf
 %dir %{_datadir}/syslog-ng/include/scl
 %{_datadir}/syslog-ng/include/scl/apache
+%{_datadir}/syslog-ng/include/scl/arr
 %{_datadir}/syslog-ng/include/scl/checkpoint
 %{_datadir}/syslog-ng/include/scl/cisco
 # R: basicfuncs
 %{_datadir}/syslog-ng/include/scl/collectd
+%{_datadir}/syslog-ng/include/scl/darwinosl
 %{_datadir}/syslog-ng/include/scl/default-network-drivers
 %{_datadir}/syslog-ng/include/scl/fortigate
+%{_datadir}/syslog-ng/include/scl/google
 %{_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/jellyfin
 %{_datadir}/syslog-ng/include/scl/junos
 %{_datadir}/syslog-ng/include/scl/linux-audit
 %dir %{_datadir}/syslog-ng/include/scl/loadbalancer
 %attr(755,root,root) %{_datadir}/syslog-ng/include/scl/loadbalancer/gen-loadbalancer.sh
 %{_datadir}/syslog-ng/include/scl/loadbalancer/plugin.conf
+%{_datadir}/syslog-ng/include/scl/logscale
+%{_datadir}/syslog-ng/include/scl/mariadb
 %{_datadir}/syslog-ng/include/scl/mbox
 %{_datadir}/syslog-ng/include/scl/nodejs
+%{_datadir}/syslog-ng/include/scl/openobserve
+%{_datadir}/syslog-ng/include/scl/opensearch
 %{_datadir}/syslog-ng/include/scl/osquery
 %{_datadir}/syslog-ng/include/scl/pacct
 %{_datadir}/syslog-ng/include/scl/paloalto
+%{_datadir}/syslog-ng/include/scl/pgsql
+%{_datadir}/syslog-ng/include/scl/pihole
+%{_datadir}/syslog-ng/include/scl/python
+%{_datadir}/syslog-ng/include/scl/qbittorrent
 %{_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
@@ -786,31 +800,8 @@ rm -f %{_var}/lib/%{name}/syslog-ng.persist
 %attr(755,root,root) %{_libdir}/libsecret-storage.so
 %attr(755,root,root) %{_libdir}/libsyslog-ng.so
 %{_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
-%{_includedir}/syslog-ng/filter
-%if %{without system_libivykis}
-%{_includedir}/syslog-ng/ivykis
-%endif
-%{_includedir}/syslog-ng/logmsg
-%{_includedir}/syslog-ng/logproto
-%{_includedir}/syslog-ng/logthrdest
-%{_includedir}/syslog-ng/logthrsource
-%{_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
+%{_includedir}/syslog-ng
+%exclude %{_includedir}/syslog-ng/libtest
 %{_datadir}/syslog-ng/tools
 %{_pkgconfigdir}/syslog-ng.pc
 %{_pkgconfigdir}/syslog-ng-native-connector.pc
diff --git a/glib-static.patch b/glib-static.patch
index 58229a5..3f7de0c 100644
--- a/glib-static.patch
+++ b/glib-static.patch
@@ -1,23 +1,23 @@
---- syslog-ng-3.36.1/configure.ac.orig	2022-11-19 19:54:27.666859016 +0100
-+++ syslog-ng-3.36.1/configure.ac	2022-11-19 19:55:44.214304211 +0100
-@@ -919,16 +919,18 @@
+--- syslog-ng-4.8.0/configure.ac~	2024-08-01 19:27:51.000000000 +0200
++++ syslog-ng-4.8.0/configure.ac	2024-08-01 19:28:54.109970068 +0200
+@@ -1036,16 +1036,18 @@ dnl GLib headers/libraries
  dnl ***************************************************************************
  
  GLIB_ADDONS="gmodule-2.0 gthread-2.0"
 -PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_MIN_VERSION $GLIB_ADDONS,,)
  
  if test "$linking_mode" != "dynamic"; then
-+	PKG_CHECK_MODULES_STATIC(GLIB, glib-2.0 >= $GLIB_MIN_VERSION $GLIB_ADDONS,,)
++        PKG_CHECK_MODULES_STATIC(GLIB, glib-2.0 >= $GLIB_MIN_VERSION $GLIB_ADDONS,,)
  	# strip out -ldl & -lrt as it cannot be linked statically
 -	GLIB_LIBS=`echo $GLIB_LIBS | tr ' ' '\n' | egrep -v "^(-ldld?)|(-lrt)$" | tr '\n' ' '`
-+	GLIB_LIBS=`echo $GLIB_LIBS | tr ' ' '\n' | egrep -v "^(-ldld?)|(-lrt)|(-lm)$" | tr '\n' ' '`
++        GLIB_LIBS=`echo $GLIB_LIBS | tr ' ' '\n' | egrep -v "^(-ldld?)|(-lrt)|(-lm)|(-lpcre2-8)$" | tr '\n' ' '`
  
  	old_LIBS=$LIBS
  	LIBS="$LD_START_STATIC $GLIB_LIBS $LD_END_STATIC $BASE_LIBS"
  	AC_CHECK_FUNC(g_hash_table_new, blb_cv_static_glib=yes, blb_cv_static_glib=no)
  	LIBS=$old_LIBS
 +else
-+	PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_MIN_VERSION $GLIB_ADDONS,,)
++        PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_MIN_VERSION $GLIB_ADDONS,,)
  fi
  
- GLIB_CFLAGS="${GLIB_CFLAGS} -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32"
+ old_CPPFLAGS=$CPPFLAGS
diff --git a/openssl3.patch b/openssl3.patch
deleted file mode 100644
index 8740e3f..0000000
--- a/openssl3.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- syslog-ng-3.34.1/modules/cryptofuncs/cryptofuncs.c~	2021-09-10 13:01:49.000000000 +0200
-+++ syslog-ng-3.34.1/modules/cryptofuncs/cryptofuncs.c	2021-10-11 22:51:20.705912103 +0200
-@@ -162,7 +162,6 @@
-   TEMPLATE_FUNCTION_PLUGIN(tf_hash, "sha1"),
-   TEMPLATE_FUNCTION_PLUGIN(tf_hash, "sha256"),
-   TEMPLATE_FUNCTION_PLUGIN(tf_hash, "sha512"),
--  TEMPLATE_FUNCTION_PLUGIN(tf_hash, "md4"),
-   TEMPLATE_FUNCTION_PLUGIN(tf_hash, "md5"),
- };
- 
---- syslog-ng-3.34.1/modules/cryptofuncs/tests/test_cryptofuncs.c~	2021-09-10 13:01:49.000000000 +0200
-+++ syslog-ng-3.34.1/modules/cryptofuncs/tests/test_cryptofuncs.c	2021-10-11 22:51:41.905839413 +0200
-@@ -50,7 +50,6 @@
-   assert_template_format("$(sha1 bar)", "62cdb7020ff920e5aa642c3d4066950dd1f01f4d");
-   assert_template_format("$(md5 foo)", "acbd18db4cc2f85cedef654fccc4a4d8");
-   assert_template_format("$(hash foo)", "2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae");
--  assert_template_format("$(md4 foo)", "0ac6700c491d70fb8650940b1ca1e4b2");
-   assert_template_format("$(sha256 foo)", "2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae");
-   assert_template_format("$(sha512 foo)",
-                          "f7fbba6e0636f890e56fbbf3283e524c6fa3204ae298382d624741d0dc6638326e282c41be5e4254d8820772c5518a2c5a8c0c7f7eda19594a7eb539453e1ed7");
---- syslog-ng-3.34.1/modules/python/pylib/syslogng/debuggercli/syslognginternals.py~	2021-09-10 13:01:49.000000000 +0200
-+++ syslog-ng-3.34.1/modules/python/pylib/syslogng/debuggercli/syslognginternals.py	2021-10-11 22:52:29.489009746 +0200
-@@ -52,7 +52,6 @@
-         "sha1",
-         "sha256",
-         "sha512",
--        "md4",
-         "md5",
-         "format-json",
-         "grep",
diff --git a/syslog-ng-link.patch b/syslog-ng-link.patch
index 382f8f2..66d6d6c 100644
--- a/syslog-ng-link.patch
+++ b/syslog-ng-link.patch
@@ -1,18 +1,15 @@
 diff -urNp -x '*.orig' syslog-ng-3.29.1.org/configure.ac syslog-ng-3.29.1/configure.ac
---- syslog-ng-3.29.1.org/configure.ac	2021-02-28 14:27:09.946954361 +0100
-+++ syslog-ng-3.29.1/configure.ac	2021-02-28 14:27:10.230296549 +0100
-@@ -1775,9 +1775,9 @@ if test "x$linking_mode" = "xdynamic"; t
+--- syslog-ng-4.8.0/configure.ac.orig	2024-08-01 19:24:08.129970075 +0200
++++ syslog-ng-4.8.0/configure.ac	2024-08-01 19:26:09.006636741 +0200
+@@ -2164,7 +2164,7 @@ if test "x$linking_mode" = "xdynamic"; t
  	# syslog-ng binary is linked with the default link command (e.g. libtool)
  	SYSLOGNG_LINK='$(LINK)'
  else
--	SYSLOGNG_DEPS_LIBS="$LIBS $BASE_LIBS $RESOLV_LIBS $EVTLOG_NO_LIBTOOL_LIBS $SECRETSTORAGE_NO_LIBTOOL_LIBS $LD_START_STATIC -Wl,${WHOLE_ARCHIVE_OPT} $GLIB_LIBS $PCRE_LIBS $REGEX_LIBS  -Wl,${NO_WHOLE_ARCHIVE_OPT} $IVYKIS_NO_LIBTOOL_LIBS $LD_END_STATIC $LIBCAP_LIBS $DL_LIBS"
-+        SYSLOGNG_DEPS_LIBS="$LIBS $BASE_LIBS $RESOLV_LIBS $EVTLOG_NO_LIBTOOL_LIBS $SECRETSTORAGE_NO_LIBTOOL_LIBS $LD_START_STATIC -Wl,${WHOLE_ARCHIVE_OPT} $GLIB_LIBS $PCRE_LIBS $REGEX_LIBS  -Wl,${NO_WHOLE_ARCHIVE_OPT} $LD_END_STATIC $IVYKIS_LIBS $LIBCAP_LIBS $DL_LIBS"
- 	TOOL_DEPS_LIBS="$LIBS $BASE_LIBS $GLIB_LIBS $EVTLOG_LIBS $SECRETSTORAGE_LIBS $RESOLV_LIBS $LIBCAP_LIBS $PCRE_LIBS $REGEX_LIBS $IVYKIS_LIBS $DL_LIBS"
--	CORE_DEPS_LIBS=""
-+        CORE_DEPS_LIBS="$IVYKIS_LIBS"
+-	SYSLOGNG_DEPS_LIBS="$LIBS $BASE_LIBS $RESOLV_LIBS $EVTLOG_NO_LIBTOOL_LIBS $SECRETSTORAGE_NO_LIBTOOL_LIBS $LD_START_STATIC -Wl,${WHOLE_ARCHIVE_OPT} $GLIB_LIBS $PCRE2_LIBS $REGEX_LIBS  -Wl,${NO_WHOLE_ARCHIVE_OPT} $IVYKIS_NO_LIBTOOL_LIBS $LD_END_STATIC $LIBCAP_LIBS $DL_LIBS"
++	SYSLOGNG_DEPS_LIBS="$LIBS $BASE_LIBS $RESOLV_LIBS $EVTLOG_NO_LIBTOOL_LIBS $SECRETSTORAGE_NO_LIBTOOL_LIBS $LD_START_STATIC -Wl,${WHOLE_ARCHIVE_OPT} $GLIB_LIBS $PCRE2_LIBS $REGEX_LIBS  -Wl,${NO_WHOLE_ARCHIVE_OPT} $LD_END_STATIC $IVYKIS_LIBS  $LIBCAP_LIBS $DL_LIBS"
+ 	TOOL_DEPS_LIBS="$LIBS $BASE_LIBS $GLIB_LIBS $EVTLOG_LIBS $SECRETSTORAGE_LIBS $RESOLV_LIBS $LIBCAP_LIBS $PCRE2_LIBS $REGEX_LIBS $IVYKIS_LIBS $DL_LIBS"
+ 	CORE_DEPS_LIBS=""
  
- 	# bypass libtool in case we want to do mixed linking because it
- 	# doesn't support -Wl,-Bstatic -Wl,-Bdynamic on a per-library basis.
 diff -urNp -x '*.orig' syslog-ng-3.29.1.org/lib/logproto/tests/Makefile.am syslog-ng-3.29.1/lib/logproto/tests/Makefile.am
 --- syslog-ng-3.29.1.org/lib/logproto/tests/Makefile.am	2020-08-10 20:04:39.000000000 +0200
 +++ syslog-ng-3.29.1/lib/logproto/tests/Makefile.am	2021-02-28 14:27:10.230296549 +0100
@@ -24,3 +21,14 @@ diff -urNp -x '*.orig' syslog-ng-3.29.1.org/lib/logproto/tests/Makefile.am syslo
  	${top_builddir}/libtest/libsyslog-ng-test.a \
  	$(TEST_LDADD)
  lib_logproto_tests_test_findeom_SOURCES = \
+--- syslog-ng-4.8.0/lib/Makefile.am~	2024-07-23 13:42:10.000000000 +0200
++++ syslog-ng-4.8.0/lib/Makefile.am	2024-08-01 19:36:57.976636728 +0200
+@@ -311,7 +311,7 @@ lib_libsyslog_ng_la_SOURCES		= \
+ lib_libsyslog_ng_la_CFLAGS		= \
+ 	$(AM_CFLAGS) \
+ 	$(libsystemd_CFLAGS)
+-lib_libsyslog_ng_la_LIBADD		+= @OPENSSL_LIBS@
++lib_libsyslog_ng_la_LIBADD		+= @OPENSSL_LIBS@ @JSON_LIBS@
+ 
+ # each line with closely related files (e.g. the ones generated from the same source)
+ BUILT_SOURCES += lib/cfg-lex.c lib/cfg-lex.h						\
diff --git a/syslog-ng-nolibs.patch b/syslog-ng-nolibs.patch
index 8c40a23..273c404 100644
--- a/syslog-ng-nolibs.patch
+++ b/syslog-ng-nolibs.patch
@@ -1,9 +1,8 @@
-diff -urNp -x '*.orig' syslog-ng-3.29.1.org/configure.ac syslog-ng-3.29.1/configure.ac
---- syslog-ng-3.29.1.org/configure.ac	2020-08-28 14:08:43.000000000 +0200
-+++ syslog-ng-3.29.1/configure.ac	2021-02-28 14:26:43.099448649 +0100
-@@ -765,11 +765,10 @@ fi
- dnl ***************************************************************************
+--- syslog-ng-4.8.0/configure.ac~	2024-07-23 13:42:10.000000000 +0200
++++ syslog-ng-4.8.0/configure.ac	2024-08-01 19:20:42.196636751 +0200
+@@ -900,11 +900,10 @@ dnl ************************************
  dnl Checks for libraries
+ AC_CHECK_LIB(m, round, BASE_LIBS="$BASE_LIBS -lm")
  AC_CHECK_LIB(door, door_create, BASE_LIBS="$BASE_LIBS -ldoor")
 -AC_CHECK_LIB(socket, socket, BASE_LIBS="$BASE_LIBS -lsocket")
 +AC_CHECK_FUNC([socket], [:], [AC_CHECK_LIB(socket, socket, BASE_LIBS="$BASE_LIBS -lsocket")])
diff --git a/syslog-ng-systemd.patch b/syslog-ng-systemd.patch
index 9250285..96ff4cf 100644
--- a/syslog-ng-systemd.patch
+++ b/syslog-ng-systemd.patch
@@ -1,7 +1,6 @@
-diff -dur -x '*~' syslog-ng-syslog-ng-3.14.1.orig/contrib/systemd/syslog-ng at .service syslog-ng-syslog-ng-3.14.1/contrib/systemd/syslog-ng at .service
---- syslog-ng-syslog-ng-3.14.1.orig/contrib/systemd/syslog-ng at .service	2018-02-26 15:32:28.000000000 +0100
-+++ syslog-ng-syslog-ng-3.14.1/contrib/systemd/syslog-ng at .service	2018-03-30 15:38:31.000000000 +0200
-@@ -5,13 +5,17 @@
+--- syslog-ng-4.8.0/contrib/systemd/syslog-ng at .service.orig	2024-08-01 19:21:06.909970083 +0200
++++ syslog-ng-4.8.0/contrib/systemd/syslog-ng at .service	2024-08-01 19:23:37.569970075 +0200
+@@ -7,9 +7,13 @@ After=network.target network-online.targ
  
  [Service]
  Type=notify
@@ -16,8 +15,3 @@ diff -dur -x '*~' syslog-ng-syslog-ng-3.14.1.orig/contrib/systemd/syslog-ng at .ser
  ExecReload=/bin/kill -HUP $MAINPID
  StandardOutput=journal
  StandardError=journal
- Restart=on-failure
- 
- [Install]
-+DefaultInstance=default
--WantedBy=multi-user.target
diff --git a/syslog-ng.conf b/syslog-ng.conf
index 6ac6636..bb3879b 100644
--- a/syslog-ng.conf
+++ b/syslog-ng.conf
@@ -15,7 +15,7 @@ options {
 	dir_owner(root);
 	dir_group(logs);
 	dir_perm(0750);
-	stats_freq(3600);
+	stats(freq(3600));
 	time_reopen(10);
 	time_reap(360);
 	mark_freq(600);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/syslog-ng.git/commitdiff/237421d557b8fceead2e2eb2c4628b15b55d057b

More information about the pld-cvs-commit mailing list