- updated to 4.10.2, partial PLD merge

diff --git a/bad-tests.patch b/bad-tests.patch
new file mode 100644 (file)
index 0000000..7ae397e
--- /dev/null
+++ b/bad-tests.patch
@@ -0,0 +1,19 @@
+--- syslog-ng-4.10.2/modules/kafka/tests/Makefile.am~  2025-10-14 13:43:46.000000000 +0200
++++ syslog-ng-4.10.2/modules/kafka/tests/Makefile.am   2025-10-18 14:30:05.063327140 +0200
+@@ -1,4 +1,4 @@
+-if ENABLE_KAFKA
++if FALSE
+ 
+ modules_kafka_tests_TESTS                     = \
+       modules/kafka/tests/test_kafka_props \
+--- syslog-ng-4.10.2/modules/python-modules/syslogng/modules/hypr/tests/test_hypr_audit_source.py~     2025-10-14 13:43:46.000000000 +0200
++++ syslog-ng-4.10.2/modules/python-modules/syslogng/modules/hypr/tests/test_hypr_audit_source.py      2025-10-18 14:31:26.263327169 +0200
+@@ -64,7 +64,7 @@
+     assert sut.close() is None
+     sut.deinit()
+ 
+-
++@pytest.mark.skip(reason="no way of currently testing this")
+ def test_hypr_audit_source_complete_lifecycle(minimal_config, mocker):
+ 
+     response_json = [

diff --git a/glib-static.patch b/glib-static.patch
index 08232508afb6f66ee5053c9a62222beff50b16d2..5b73761041cd6eb573addb8a9c1c914aafc51b48 100644 (file)
--- a/glib-static.patch
+++ b/glib-static.patch
@@ -1,24 +1,22 @@
-diff -urNp -x '*.orig' syslog-ng-syslog-ng-4.8.0.org/configure.ac syslog-ng-syslog-ng-4.8.0/configure.ac
---- syslog-ng-syslog-ng-4.8.0.org/configure.ac 2024-08-18 17:12:27.037244049 +0200
-+++ syslog-ng-syslog-ng-4.8.0/configure.ac     2024-08-18 17:12:27.205247136 +0200
-@@ -1036,16 +1036,18 @@ dnl GLib headers/libraries
- dnl ***************************************************************************
+--- 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,15 +1036,17 @@ dnl GLib headers/libraries
+ SAFE_C_CHECK_BEGIN
  
  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,,)
-       # 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)|(-lpcre2-8)$" | tr '\n' ' '`
++    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)|(-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
+     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=$LIBS_SAVE
 +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
  
- old_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$GLIB_CFLAGS"

diff --git a/man-paths.patch b/man-paths.patch
deleted file mode 100644 (file)
index b4c1bc1..0000000
--- a/man-paths.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-diff -urNp -x '*.orig' syslog-ng-syslog-ng-4.8.0.org/doc/man/dqtool.1.xml syslog-ng-syslog-ng-4.8.0/doc/man/dqtool.1.xml
---- syslog-ng-syslog-ng-4.8.0.org/doc/man/dqtool.1.xml 2024-07-23 13:41:56.000000000 +0200
-+++ syslog-ng-syslog-ng-4.8.0/doc/man/dqtool.1.xml     2024-08-18 17:09:02.533486753 +0200
-@@ -105,7 +105,7 @@ Mar  3 10:52:05 tristram localprg[1234]:
-     <refsection>
-       <title>Files</title>
-       <para>
--        <filename>/opt/syslog-ng/bin/dqtool</filename>
-+        <filename>/usr/bin/dqtool</filename>
-       </para>
-     </refsection>
-     <refsection>
-diff -urNp -x '*.orig' syslog-ng-syslog-ng-4.8.0.org/doc/man/loggen.1.xml syslog-ng-syslog-ng-4.8.0/doc/man/loggen.1.xml
---- syslog-ng-syslog-ng-4.8.0.org/doc/man/loggen.1.xml 2024-07-23 13:41:56.000000000 +0200
-+++ syslog-ng-syslog-ng-4.8.0/doc/man/loggen.1.xml     2024-08-18 17:09:02.533486753 +0200
-@@ -271,7 +271,7 @@
-     <refsection>
-       <title>Files</title>
-       <para>
--        <filename>/opt/syslog-ng/bin/loggen</filename>
-+        <filename>/usr/bin/loggen</filename>
-       </para>
-     </refsection>
-     <refsection>
-diff -urNp -x '*.orig' syslog-ng-syslog-ng-4.8.0.org/doc/man/pdbtool.1.xml syslog-ng-syslog-ng-4.8.0/doc/man/pdbtool.1.xml
---- syslog-ng-syslog-ng-4.8.0.org/doc/man/pdbtool.1.xml        2024-07-23 13:41:56.000000000 +0200
-+++ syslog-ng-syslog-ng-4.8.0/doc/man/pdbtool.1.xml    2024-08-18 17:09:02.533486753 +0200
-@@ -447,10 +447,10 @@
-     <refsection>
-       <title>Files</title>
-       <para>
--        <filename>/opt/syslog-ng/</filename>
-+        <filename>/usr/share/</filename>
-       </para>
-       <para>
--        <filename>/opt/syslog-ng/etc/syslog-ng.conf</filename>
-+        <filename>//etc/syslog-ng/syslog-ng.conf</filename>
-       </para>
-     </refsection>
-     <refsection>
-diff -urNp -x '*.orig' syslog-ng-syslog-ng-4.8.0.org/doc/man/syslog-ng-ctl.1.xml syslog-ng-syslog-ng-4.8.0/doc/man/syslog-ng-ctl.1.xml
---- syslog-ng-syslog-ng-4.8.0.org/doc/man/syslog-ng-ctl.1.xml  2024-07-23 13:41:56.000000000 +0200
-+++ syslog-ng-syslog-ng-4.8.0/doc/man/syslog-ng-ctl.1.xml      2024-08-18 17:09:02.533486753 +0200
-@@ -161,7 +161,7 @@ destination;df_facility_dot_err;;a;proce
-     <refsection>
-       <title>Files</title>
-       <para>
--        <filename>/opt/syslog-ng/sbin/syslog-ng-ctl</filename>
-+        <filename>/sbin/syslog-ng-ctl</filename>
-       </para>
-     </refsection>
-     <refsection>
-diff -urNp -x '*.orig' syslog-ng-syslog-ng-4.8.0.org/doc/man/syslog-ng-debun.1.xml syslog-ng-syslog-ng-4.8.0/doc/man/syslog-ng-debun.1.xml
---- syslog-ng-syslog-ng-4.8.0.org/doc/man/syslog-ng-debun.1.xml        2024-07-23 13:41:56.000000000 +0200
-+++ syslog-ng-syslog-ng-4.8.0/doc/man/syslog-ng-debun.1.xml    2024-08-18 17:09:02.533486753 +0200
-@@ -81,7 +81,7 @@
-             <command>-R &lt;directory&gt;</command>
-           </term>
-           <listitem>
--            <para>The directory where  is installed instead of <filename>/opt/syslog-ng</filename>.</para>
-+            <para>The directory where  is installed instead of <filename>/usr/share</filename>.</para>
-           </listitem>
-         </varlistentry>
-         <varlistentry>
-@@ -233,7 +233,7 @@
-     <refsection>
-       <title>Files</title>
-       <para>
--        <filename>/opt/syslog-ng/bin/loggen</filename>
-+        <filename>/usr/bin/loggen</filename>
-       </para>
-     </refsection>
-     <refsection>
-diff -urNp -x '*.orig' syslog-ng-syslog-ng-4.8.0.org/doc/man/syslog-ng.8.xml syslog-ng-syslog-ng-4.8.0/doc/man/syslog-ng.8.xml
---- syslog-ng-syslog-ng-4.8.0.org/doc/man/syslog-ng.8.xml      2024-07-23 13:41:56.000000000 +0200
-+++ syslog-ng-syslog-ng-4.8.0/doc/man/syslog-ng.8.xml  2024-08-18 17:09:02.533486753 +0200
-@@ -73,9 +73,9 @@
-               </listitem>
-             </itemizedlist>
-             <para>For example:</para>
--            <synopsis>/opt/syslog-ng/sbin/syslog-ng -Fv --caps cap_sys_admin,cap_chown,cap_dac_override,cap_net_bind_service,cap_fowner=pi</synopsis>
-+            <synopsis>/sbin/syslog-ng -Fv --caps cap_sys_admin,cap_chown,cap_dac_override,cap_net_bind_service,cap_fowner=pi</synopsis>
-             <para>Note that the capabilities are not case sensitive, the following command is also good: <command>
--/opt/syslog-ng/sbin/syslog-ng -Fv --caps CAP_SYS_ADMIN,CAP_CHOWN,CAP_DAC_OVERRIDE,CAP_NET_BIND_SERVICE,CAP_FOWNER=pi</command></para>
-+/sbin/syslog-ng -Fv --caps CAP_SYS_ADMIN,CAP_CHOWN,CAP_DAC_OVERRIDE,CAP_NET_BIND_SERVICE,CAP_FOWNER=pi</command></para>
-             <para>For details on the capability flags, see the following man pages: <filename>cap_from_text(3)</filename> and <filename>capabilities(7)</filename></para>
-           </listitem>
-         </varlistentry>
-@@ -314,10 +314,10 @@
-     <refsection>
-       <title>Files</title>
-       <para>
--        <filename>/opt/syslog-ng/</filename>
-+        <filename>/usr/share/</filename>
-       </para>
-       <para>
--        <filename>/opt/syslog-ng/etc/syslog-ng.conf</filename>
-+        <filename>//etc/syslog-ng/syslog-ng.conf</filename>
-       </para>
-     </refsection>
-     <refsection>
-diff -urNp -x '*.orig' syslog-ng-syslog-ng-4.8.0.org/doc/man/syslog-ng.conf.5.xml syslog-ng-syslog-ng-4.8.0/doc/man/syslog-ng.conf.5.xml
---- syslog-ng-syslog-ng-4.8.0.org/doc/man/syslog-ng.conf.5.xml 2024-07-23 13:41:56.000000000 +0200
-+++ syslog-ng-syslog-ng-4.8.0/doc/man/syslog-ng.conf.5.xml     2024-08-18 17:09:02.533486753 +0200
-@@ -449,10 +449,10 @@ log { source(s_localhost); destination(d
-     <refsection>
-       <title>Files</title>
-       <para>
--        <filename>/opt/syslog-ng/</filename>
-+        <filename>/usr/share/</filename>
-       </para>
-       <para>
--        <filename>/opt/syslog-ng/etc/syslog-ng.conf</filename>
-+        <filename>//etc/syslog-ng/syslog-ng.conf</filename>
-       </para>
-     </refsection>
-     <refsection>

diff --git a/syslog-ng-link.patch b/syslog-ng-link.patch
index 64544859ab10d7ea320aef6a350500ceb9b6761d..0d653b89b45c4f85f9324e472c0f79fd176cb3a0 100644 (file)
--- a/syslog-ng-link.patch
+++ b/syslog-ng-link.patch
@@ -1,35 +1,34 @@
-diff -urNp -x '*.orig' syslog-ng-syslog-ng-4.8.0.org/configure.ac syslog-ng-syslog-ng-4.8.0/configure.ac
---- syslog-ng-syslog-ng-4.8.0.org/configure.ac 2024-08-18 17:09:04.681526217 +0200
-+++ syslog-ng-syslog-ng-4.8.0/configure.ac     2024-08-18 17:09:04.841529157 +0200
-@@ -2208,7 +2210,7 @@
+diff -urNp -x '*.orig' syslog-ng-3.29.1.org/configure.ac syslog-ng-3.29.1/configure.ac
+--- 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 $PCRE2_LIBS $REGEX_LIBS  -Wl,${NO_WHOLE_ARCHIVE_OPT} $IVYKIS_NO_LIBTOOL_LIBS $LD_END_STATIC $LIBCAP_LIBS $DL_LIBS $LIBUNWIND_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"
+-      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 $LIBUNWIND_LIBS $JSON_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_NO_LIBTOOL_LIBS $LIBCAP_LIBS $DL_LIBS $LIBUNWIND_LIBS $JSON_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 $JSON_LIBS"
        CORE_DEPS_LIBS=""
  
-diff -urNp -x '*.orig' syslog-ng-syslog-ng-4.8.0.org/lib/Makefile.am syslog-ng-syslog-ng-4.8.0/lib/Makefile.am
---- syslog-ng-syslog-ng-4.8.0.org/lib/Makefile.am      2024-07-23 13:41:56.000000000 +0200
-+++ syslog-ng-syslog-ng-4.8.0/lib/Makefile.am  2024-08-18 17:09:04.841529157 +0200
+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
+@@ -23,7 +23,6 @@ lib_logproto_tests_test_findeom_CFLAGS       =
+       $(TEST_CFLAGS) \
+       -I${top_srcdir}/libtest
+ lib_logproto_tests_test_findeom_LDADD = \
+-      ${top_builddir}/lib/libsyslog-ng.la \
+       ${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@
++lib_libsyslog_ng_la_LIBADD            += @OPENSSL_LIBS@ @JSON_LIBS@ @LIBUNWIND_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 -urNp -x '*.orig' syslog-ng-syslog-ng-4.8.0.org/lib/logproto/tests/Makefile.am syslog-ng-syslog-ng-4.8.0/lib/logproto/tests/Makefile.am
---- syslog-ng-syslog-ng-4.8.0.org/lib/logproto/tests/Makefile.am       2024-07-23 13:41:56.000000000 +0200
-+++ syslog-ng-syslog-ng-4.8.0/lib/logproto/tests/Makefile.am   2024-08-18 17:09:04.841529157 +0200
-@@ -24,7 +24,6 @@ lib_logproto_tests_test_findeom_CFLAGS       =
-       $(TEST_CFLAGS) \
-       -I${top_srcdir}/libtest
- lib_logproto_tests_test_findeom_LDADD = \
--      ${top_builddir}/lib/libsyslog-ng.la \
-       ${top_builddir}/libtest/libsyslog-ng-test.a \
-       $(TEST_LDADD)
- lib_logproto_tests_test_findeom_SOURCES = \

diff --git a/syslog-ng-nolibs.patch b/syslog-ng-nolibs.patch
index 0fe4c8a8176b658939d16fd1d8db31b71e43ce1b..7fb3e07c3243e15f794f0b488b8adfc40ca3d3b4 100644 (file)
--- a/syslog-ng-nolibs.patch
+++ b/syslog-ng-nolibs.patch
@@ -1,6 +1,5 @@
-diff -urNp -x '*.orig' syslog-ng-syslog-ng-4.8.0.org/configure.ac syslog-ng-syslog-ng-4.8.0/configure.ac
---- syslog-ng-syslog-ng-4.8.0.org/configure.ac 2024-07-23 13:41:56.000000000 +0200
-+++ syslog-ng-syslog-ng-4.8.0/configure.ac     2024-08-18 17:08:58.917420316 +0200
+--- 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")
@@ -14,5 +13,5 @@ diff -urNp -x '*.orig' syslog-ng-syslog-ng-4.8.0.org/configure.ac syslog-ng-sysl
 +AC_CHECK_FUNC([gethostbyname], [:], [AC_CHECK_LIB(nsl, gethostbyname, BASE_LIBS="$BASE_LIBS -lnsl")])
 +AC_CHECK_FUNC([regexec], [:], [AC_CHECK_LIB(regex, regexec, REGEX_LIBS="-lregex")])
  
- AC_CHECK_FUNCS(strdup         \
-       strtol                  \
+ CHECK_FUNCS_AND_DEFINE([
+     fmemopen

diff --git a/syslog-ng.spec b/syslog-ng.spec
index 87fa7e4fce3c4d8f604fd3e409f3aebfeb7fcd1a..6f8786326e0fce7bf6742bf8c6d81a9efb9a4572 100644 (file)
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -30,18 +30,18 @@
 %define        libivykis_version 0.43.2
 
 %define                glib2_ver       1:2.32.0
-%define                mver    4.9
+%define                mver    4.10
 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:       4.9.0
+Version:       4.10.2
 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: 83e9f6daac2b5767da6232e68067a6e0
+# Source0-md5: 0c97637b266efcf932b5fdea5f40235e
 Source1:       %{name}.init
 Source2:       %{name}.conf
 Source3:       %{name}.logrotate
@@ -60,7 +60,6 @@ Source10:     https://downloads.sourceforge.net/libivykis/ivykis-%{libivykis_version
 %endif
 Patch0:                %{name}-datadir.patch
 Patch2:                %{name}-nolibs.patch
-Patch4:                man-paths.patch
 Patch5:                %{name}-link.patch
 Patch6:                no_shared_ivykis.patch
 Patch7:                32bit.patch
@@ -73,7 +72,7 @@ BuildRequires:        bison >= 3.7.6
 BuildRequires: criterion-devel >= 2.3.3-5
 %endif
 %{?with_http:BuildRequires:    curl-devel}
-BuildRequires: docbook-style-xsl-nons
+BuildRequires: docbook-style-xsl
 BuildRequires: eventlog-devel >= 0.2.12
 BuildRequires: flex
 BuildRequires: glib2-devel >= %{glib2_ver}
@@ -116,6 +115,7 @@ BuildRequires:      python3
 BuildRequires: python3-pep8
 BuildRequires: python3-ply
 BuildRequires: python3-pytest-mock
+BuildRequires: python3-requests
 BuildRequires: tzdata
 %endif
 %if %{without dynamic}
@@ -141,12 +141,12 @@ Provides: syslogdaemon
 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:     cronie < 1.5.0-3
+Conflicts:     fcron < 3.1.2-5
 Conflicts:     klogd
 Conflicts:     msyslog
 Conflicts:     rsyslog
 Conflicts:     syslog
-Conflicts:     cronie < 1.5.0-3
-Conflicts:     fcron < 3.1.2-5
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define        xsl_stylesheets_dir /usr/share/sgml/docbook/xsl-stylesheets
@@ -165,7 +165,7 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %else
 %define                slibdir                         %{_libdir}
 %endif
-# or just %{_libdir}? modules seem to be always linked dynamically
+# or just %%{_libdir}? modules seem to be always linked dynamically
 %define                moduledir                       %{slibdir}/syslog-ng
 
 %description
@@ -258,18 +258,18 @@ Moduł sysloga-ng do obsługi uwierzytelniania w chmurze, używany przez
 Google PubSub.
 
 %package module-grpc
-Summary:       GRPC modules for syslog-ng: bigquery, loki, otel
-Summary(pl.UTF-8):     Moduły GRPC dla sysloga-ng: bigquery, loki, otel
+Summary:       GRPC modules for syslog-ng: bigquery, clickhouse, loki, otel, pubsub
+Summary(pl.UTF-8):     Moduły GRPC dla sysloga-ng: bigquery, clickhouse, loki, otel, pubsub
 Group:         Libraries
 Requires:      %{name} = %{version}-%{release}
 
 %description module-grpc
-GRPC protocols support for syslog-ng, currently: bigquery, loki and
-otel.
+GRPC protocols support for syslog-ng, currently: bigquery, clickhouse,
+loki, otel and pubsub.
 
 %description module-grpc -l pl.UTF-8
-Obsługa protokołów GRPC dla sysloga-ng, obecnie: bigquery, loki i
-otel.
+Obsługa protokołów GRPC dla sysloga-ng, obecnie: bigquery, clickhouse,
+loki, otel i pubsub.
 
 %package module-json-plugin
 Summary:       JSON formatting template function for syslog-ng
@@ -412,7 +412,6 @@ rmdir lib/ivykis
 
 %patch -P0 -p1
 %patch -P2 -p1
-%patch -P4 -p1
 %patch -P5 -p1
 %patch -P6 -p1
 %patch -P7 -p1
@@ -619,50 +618,50 @@ rm -f %{_var}/lib/%{name}/syslog-ng.persist
 %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
 %dir %{moduledir}
-%attr(755,root,root) %{moduledir}/libadd-contextual-data.so
+%{moduledir}/libadd-contextual-data.so
 %if %{with amqp}
-%attr(755,root,root) %{moduledir}/libafamqp.so
+%{moduledir}/libafamqp.so
 %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}/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
+%{moduledir}/libaffile.so
+%{moduledir}/libafprog.so
+%{moduledir}/libafsnmp.so
+%{moduledir}/libafsocket.so
+%{moduledir}/libafstomp.so
+%{moduledir}/libafuser.so
+%{moduledir}/libappmodel.so
+%{moduledir}/libazure-auth-header.so
+%{moduledir}/libbasicfuncs.so
+%{moduledir}/libcef.so
+%{moduledir}/libconfgen.so
+%{moduledir}/libcorrelation.so
+%{moduledir}/libcryptofuncs.so
+%{moduledir}/libcsvparser.so
+#%%{moduledir}/libdbparser.so
+%{moduledir}/libdisk-buffer.so
 %if %{with geoip2}
-%attr(755,root,root) %{moduledir}/libgeoip2-plugin.so
+%{moduledir}/libgeoip2-plugin.so
 %endif
-%attr(755,root,root) %{moduledir}/libgraphite.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}/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
-%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
-%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
+%{moduledir}/libgraphite.so
+%{moduledir}/libhook-commands.so
+%{moduledir}/libkvformat.so
+%{moduledir}/liblinux-kmsg-format.so
+%{moduledir}/libmap-value-pairs.so
+%{moduledir}/libmetrics-probe.so
+%{moduledir}/libpacctformat.so
+%{moduledir}/libpseudofile.so
+%{moduledir}/librate-limit-filter.so
+%{moduledir}/libregexp-parser.so
+%{moduledir}/libsecure-logging.so
+%{moduledir}/libstardate.so
+%{moduledir}/libtags-parser.so
+%{moduledir}/libtfgetent.so
+%{moduledir}/libtimestamp.so
+%{moduledir}/libxml.so
+%{moduledir}/libsyslogformat.so
+%{moduledir}/libsystem-source.so
 %dir %{moduledir}/loggen
-%attr(755,root,root) %{moduledir}/loggen/libloggen_socket_plugin.so
-%attr(755,root,root) %{moduledir}/loggen/libloggen_ssl_plugin.so
+%{moduledir}/loggen/libloggen_socket_plugin.so
+%{moduledir}/loggen/libloggen_ssl_plugin.so
 %attr(755,root,root) %{_sbindir}/syslog-ng
 %attr(755,root,root) %{_sbindir}/syslog-ng-ctl
 %attr(755,root,root) %{_bindir}/dqtool
@@ -715,6 +714,7 @@ rm -f %{_var}/lib/%{name}/syslog-ng.persist
 %{_datadir}/syslog-ng/include/scl/snmptrap
 %{_datadir}/syslog-ng/include/scl/solaris
 %{_datadir}/syslog-ng/include/scl/splunk
+%{_datadir}/syslog-ng/include/scl/stats-exporter
 %{_datadir}/syslog-ng/include/scl/sudo
 %{_datadir}/syslog-ng/include/scl/sumologic
 %{_datadir}/syslog-ng/include/scl/websense
@@ -758,46 +758,49 @@ rm -f %{_var}/lib/%{name}/syslog-ng.persist
 %if %{with mongodb}
 %files module-afmongodb
 %defattr(644,root,root,755)
-%attr(755,root,root) %{moduledir}/libafmongodb.so
+%{moduledir}/libafmongodb.so
 %endif
 
 %if %{with smtp}
 %files module-afsmtp
 %defattr(644,root,root,755)
-%attr(755,root,root) %{moduledir}/libafsmtp.so
+%{moduledir}/libafsmtp.so
 %endif
 
 %if %{with sql}
 %files module-afsql
 %defattr(644,root,root,755)
-%attr(755,root,root) %{moduledir}/libafsql.so
+%{moduledir}/libafsql.so
 %endif
 
 %if %{with http}
 %files module-http
 %defattr(644,root,root,755)
-%attr(755,root,root) %{moduledir}/libhttp.so
+%{moduledir}/libhttp.so
 %{_datadir}/syslog-ng/include/scl/telegram
 %endif
 
 %files module-cloudauth
 %defattr(644,root,root,755)
-%attr(755,root,root) %{moduledir}/libcloud_auth.so
+%{moduledir}/libcloud_auth.so
+%{_datadir}/syslog-ng/include/scl/azure
 %{_datadir}/syslog-ng/include/scl/google
 
 %files module-grpc
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libgrpc-protos.so.*.*.*
+%{_libdir}/libgrpc-protos.so.*.*.*
 %ghost %{_libdir}/libgrpc-protos.so.0
 %{_libdir}/libgrpc-protos.so
-%attr(755,root,root) %{moduledir}/libbigquery.so
-%attr(755,root,root) %{moduledir}/libloki.so
-%attr(755,root,root) %{moduledir}/libotel.so
+%{moduledir}/libbigquery.so
+%{moduledir}/libclickhouse.so
+%{moduledir}/libloki.so
+%{moduledir}/libotel.so
+%{moduledir}/libpubsub.so
 
 %if %{with json}
 %files module-json-plugin
 %defattr(644,root,root,755)
-%attr(755,root,root) %{moduledir}/libjson-plugin.so
+%{moduledir}/libjson-plugin.so
 # all below configs require json-plugin
 %{_datadir}/syslog-ng/include/scl/cee
 # R: basicfuncs http json-plugin
@@ -817,55 +820,55 @@ rm -f %{_var}/lib/%{name}/syslog-ng.persist
 %if %{with kafka}
 %files module-kafka
 %defattr(644,root,root,755)
-%attr(755,root,root) %{moduledir}/libkafka.so
+%{moduledir}/libkafka.so
 %endif
 
 %if %{with mqtt}
 %files module-mqtt
 %defattr(644,root,root,755)
-%attr(755,root,root) %{moduledir}/libmqtt.so
+%{moduledir}/libmqtt.so
 %endif
 
 %if %{with python}
 %files module-python
 %defattr(644,root,root,755)
-%attr(755,root,root) %{moduledir}/libmod-python.so
+%{moduledir}/libmod-python.so
 %{moduledir}/python
 %endif
 
 %if %{with redis}
 %files module-redis
 %defattr(644,root,root,755)
-%attr(755,root,root) %{moduledir}/libredis.so
+%{moduledir}/libredis.so
 %endif
 
 %if %{with riemann}
 %files module-riemann
 %defattr(644,root,root,755)
-%attr(755,root,root) %{moduledir}/libriemann.so
+%{moduledir}/libriemann.so
 %endif
 
 %files libs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{slibdir}/libevtlog-%{mver}.so.*.*.*
-%attr(755,root,root) %{slibdir}/libevtlog-%{mver}.so.0
-%attr(755,root,root) %{slibdir}/libloggen_helper-%{mver}.so.*.*.*
-%attr(755,root,root) %{slibdir}/libloggen_helper-%{mver}.so.0
-%attr(755,root,root) %{slibdir}/libloggen_plugin-%{mver}.so.*.*.*
-%attr(755,root,root) %{slibdir}/libloggen_plugin-%{mver}.so.0
-%attr(755,root,root) %{slibdir}/libsecret-storage.so.*.*.*
-%attr(755,root,root) %{slibdir}/libsecret-storage.so.0
-%attr(755,root,root) %{slibdir}/libsyslog-ng-%{mver}.so.*.*.*
-%attr(755,root,root) %ghost %{slibdir}/libsyslog-ng-%{mver}.so.0
+%{slibdir}/libevtlog-%{mver}.so.*.*.*
+%{slibdir}/libevtlog-%{mver}.so.0
+%{slibdir}/libloggen_helper-%{mver}.so.*.*.*
+%{slibdir}/libloggen_helper-%{mver}.so.0
+%{slibdir}/libloggen_plugin-%{mver}.so.*.*.*
+%{slibdir}/libloggen_plugin-%{mver}.so.0
+%{slibdir}/libsecret-storage.so.*.*.*
+%{slibdir}/libsecret-storage.so.0
+%{slibdir}/libsyslog-ng-%{mver}.so.*.*.*
+%ghost %{slibdir}/libsyslog-ng-%{mver}.so.0
 %dir %{_datadir}/syslog-ng
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libevtlog.so
-%attr(755,root,root) %{_libdir}/libloggen_helper.so
-%attr(755,root,root) %{_libdir}/libloggen_plugin.so
-%attr(755,root,root) %{_libdir}/libsecret-storage.so
-%attr(755,root,root) %{_libdir}/libsyslog-ng.so
+%{_libdir}/libevtlog.so
+%{_libdir}/libloggen_helper.so
+%{_libdir}/libloggen_plugin.so
+%{_libdir}/libsecret-storage.so
+%{_libdir}/libsyslog-ng.so
 %{_libdir}/libsyslog-ng-native-connector.a
 %{_includedir}/syslog-ng
 %exclude %{_includedir}/syslog-ng/libtest