- updated to 3.17.2

diff --git a/syslog-ng-link.patch b/syslog-ng-link.patch
index ef713cdc1d9653c42ae507f5d7df262d61385de0..d3c77fc68d0f942db3b9fab2315710009ce5a364 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 @@
+@@ -1673,9 +1673,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 $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"
  
        # 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

diff --git a/syslog-ng-simple.conf b/syslog-ng-simple.conf
index 2fa8b008a90a962610509fd2ca9ee5239095f89d..5a4752f02ab403ccff4557608fb0e0de1eb5c4d2 100644 (file)
--- a/syslog-ng-simple.conf
+++ b/syslog-ng-simple.conf
@@ -1,4 +1,4 @@
-@version: 3.16
+@version: 3.17
 #
 # Syslog-ng configuration for TLD Linux
 #

diff --git a/syslog-ng.conf b/syslog-ng.conf
index 6b2154e2bafd03558f7b3ab3ad62b4a61614f485..ddded219fffa661900f58533696a42e9f7b269f9 100644 (file)
--- a/syslog-ng.conf
+++ b/syslog-ng.conf
@@ -1,4 +1,4 @@
-@version: 3.16
+@version: 3.17
 @include "scl.conf"
 #
 # Syslog-ng configuration for TLD Linux

diff --git a/syslog-ng.spec b/syslog-ng.spec
index 0b832ccff6a25d6562e5805c5948ee2fe16c14fb..b2fd9faefe0cb5440efeea846d4ae8353598942d 100644 (file)
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -30,23 +30,23 @@
 %define        libivykis_version 0.42.3
 
 %define                glib2_ver       1:2.24.0
-%define                mver    3.16
-%define                docmver 3.16
+%define                mver    3.17
+%define                docmver 3.17
 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.16.1
-Release:       2
+Version:       3.17.2
+Release:       1
 License:       GPL v2+ with OpenSSL exception
 Group:         Daemons
 Source0:       https://github.com/balabit/syslog-ng/archive/%{name}-%{version}.tar.gz
-# Source0-md5: c00fac07d8403b44cb9a3942ad63b3d8
+# Source0-md5: cabeed054c4734f91bf6784bb14cde57
 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: 8214f912f16cb4c456e1b2b8ef89f465
+# Source4-md5: 63d323477c2ecac278c62c7e6af84788
 Source5:       %{name}-simple.conf
 Source6:       https://github.com/buytenh/ivykis/archive/v%{libivykis_version}/ivykis-%{libivykis_version}.tar.gz
 # Source6-md5: 4d84813d011ff671e66eccc952a5c78f