- fix obsoleted keyword stats_freq in config files

[packages/syslog-ng.git] / syslog-ng-link.patch

diff --git a/syslog-ng-link.patch b/syslog-ng-link.patch
index ef713cdc1d9653c42ae507f5d7df262d61385de0..58c5f05053b45ae22f220ab0787491d320e8706f 100644 (file)
--- a/syslog-ng-link.patch
+++ b/syslog-ng-link.patch
@@ -1,27 +1,15 @@
-diff -ur syslog-ng-syslog-ng-3.16.1.orig/configure.ac syslog-ng-syslog-ng-3.16.1/configure.ac
---- syslog-ng-syslog-ng-3.16.1.orig/configure.ac       2018-07-11 16:33:39.521544308 +0000
-+++ syslog-ng-syslog-ng-3.16.1/configure.ac    2018-07-11 16:36:27.353534304 +0000
-@@ -1658,9 +1658,9 @@
+diff -urNp -x '*.orig' syslog-ng-syslog-ng-4.2.0.org/configure.ac syslog-ng-syslog-ng-4.2.0/configure.ac
+--- syslog-ng-syslog-ng-4.2.0.org/configure.ac 2023-07-18 21:48:12.708426233 +0200
++++ syslog-ng-syslog-ng-4.2.0/configure.ac     2023-07-18 21:48:12.849428240 +0200
+@@ -1913,9 +1913,9 @@ 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 $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 $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 $RESOLV_LIBS $LIBCAP_LIBS $PCRE_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"
++      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=""
 +      CORE_DEPS_LIBS="$IVYKIS_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 -ur syslog-ng-syslog-ng-3.16.1.orig/lib/logproto/tests/Makefile.am syslog-ng-syslog-ng-3.16.1/lib/logproto/tests/Makefile.am
---- syslog-ng-syslog-ng-3.16.1.orig/lib/logproto/tests/Makefile.am     2018-06-18 15:14:55.000000000 +0000
-+++ syslog-ng-syslog-ng-3.16.1/lib/logproto/tests/Makefile.am  2018-07-11 16:34:00.392543064 +0000
-@@ -22,7 +22,7 @@
-       $(TEST_CFLAGS) \
-       -I${top_srcdir}/libtest
- lib_logproto_tests_test_findeom_LDADD = \
--      ${top_builddir}/lib/libsyslog-ng.la \
-+      $(TEST_LDADD) \
-       ${top_builddir}/libtest/libsyslog-ng-test.a
- lib_logproto_tests_test_findeom_SOURCES = \
-       lib/logproto/tests/test_findeom.c