From 803d5b5c3934579dd0a90b36987def5ea9ec85f0 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Wed, 11 Jul 2018 18:23:49 +0000 Subject: [PATCH] - updated to 3.16.1 --- syslog-ng-link.patch | 52 ++++++++----------------------------------- syslog-ng-simple.conf | 2 +- syslog-ng.conf | 2 +- syslog-ng.spec | 33 ++++++++++++++++++++------- 4 files changed, 36 insertions(+), 53 deletions(-) diff --git a/syslog-ng-link.patch b/syslog-ng-link.patch index 1ba073c..ef713cd 100644 --- a/syslog-ng-link.patch +++ b/syslog-ng-link.patch @@ -1,30 +1,21 @@ -diff -dur -x '*.orig' syslog-ng-syslog-ng-3.14.1.orig/configure.ac syslog-ng-syslog-ng-3.14.1/configure.ac ---- syslog-ng-syslog-ng-3.14.1.orig/configure.ac 2018-04-03 09:50:19.000000000 +0200 -+++ syslog-ng-syslog-ng-3.14.1/configure.ac 2018-04-03 09:51:38.000000000 +0200 -@@ -793,7 +793,7 @@ - dnl *************************************************************************** - - EVTLOG_LIBS="\$(top_builddir)/lib/eventlog/src/libevtlog.la" --EVTLOG_NO_LIBTOOL_LIBS="\$(top_builddir)/lib/eventlog/src/.libs/libevtlog.la" -+EVTLOG_NO_LIBTOOL_LIBS="\$(top_builddir)/lib/eventlog/src/.libs/libevtlog.so" - EVTLOG_CFLAGS="-I\$(top_srcdir)/lib/eventlog/src -I\$(top_builddir)/lib/eventlog/src" - - dnl *************************************************************************** -@@ -1687,9 +1687,9 @@ +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 @@ # 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 $LD_START_STATIC -Wl,${WHOLE_ARCHIVE_OPT} $GLIB_LIBS $EVTLOG_NO_LIBTOOL_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 " +- 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" - 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 -dur -x '*.orig' syslog-ng-syslog-ng-3.14.1.orig/lib/logproto/tests/Makefile.am syslog-ng-syslog-ng-3.14.1/lib/logproto/tests/Makefile.am ---- syslog-ng-syslog-ng-3.14.1.orig/lib/logproto/tests/Makefile.am 2018-02-26 15:32:28.000000000 +0100 -+++ syslog-ng-syslog-ng-3.14.1/lib/logproto/tests/Makefile.am 2018-04-03 09:50:43.000000000 +0200 +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 @@ -34,28 +25,3 @@ diff -dur -x '*.orig' syslog-ng-syslog-ng-3.14.1.orig/lib/logproto/tests/Makefil ${top_builddir}/libtest/libsyslog-ng-test.a lib_logproto_tests_test_findeom_SOURCES = \ lib/logproto/tests/test_findeom.c -diff -dur -x '*.orig' syslog-ng-syslog-ng-3.14.1.orig/modules/diskq/Makefile.am syslog-ng-syslog-ng-3.14.1/modules/diskq/Makefile.am ---- syslog-ng-syslog-ng-3.14.1.orig/modules/diskq/Makefile.am 2018-02-26 15:32:28.000000000 +0100 -+++ syslog-ng-syslog-ng-3.14.1/modules/diskq/Makefile.am 2018-04-03 09:50:43.000000000 +0200 -@@ -46,8 +46,8 @@ - - modules_diskq_dqtool_SOURCES = modules/diskq/dqtool.c - modules_diskq_dqtool_LDADD = \ -- $(TOOL_DEPS_LIBS) \ - $(MODULE_DEPS_LIBS) \ -+ $(TOOL_DEPS_LIBS) \ - $(LIBSYSLOG_NG_DISK_BUFFER) - - modules/diskq modules/diskq/ mod-diskq: modules/diskq/libdisk-buffer.la \ -diff -dur -x '*.orig' syslog-ng-syslog-ng-3.14.1.orig/syslog-ng-ctl/Makefile.am syslog-ng-syslog-ng-3.14.1/syslog-ng-ctl/Makefile.am ---- syslog-ng-syslog-ng-3.14.1.orig/syslog-ng-ctl/Makefile.am 2018-02-26 15:32:28.000000000 +0100 -+++ syslog-ng-syslog-ng-3.14.1/syslog-ng-ctl/Makefile.am 2018-04-03 09:50:43.000000000 +0200 -@@ -10,5 +10,6 @@ - EXTRA_DIST += \ - syslog-ng-ctl/control-client-unix.c - --syslog_ng_ctl_syslog_ng_ctl_LDADD = lib/libsyslog-ng.la @BASE_LIBS@ @GLIB_LIBS@ @RESOLV_LIBS@ -- -+syslog_ng_ctl_syslog_ng_ctl_DEPENDENCIES = lib/libsyslog-ng.la -+syslog_ng_ctl_syslog_ng_ctl_LDADD = -L${top_builddir}/lib/.libs -lsyslog-ng @SYSLOGNG_DEPS_LIBS@ -+syslog_ng_ctl_syslog_ng_ctl_LINK = @SYSLOGNG_LINK@ diff --git a/syslog-ng-simple.conf b/syslog-ng-simple.conf index cc2a20a..2fa8b00 100644 --- a/syslog-ng-simple.conf +++ b/syslog-ng-simple.conf @@ -1,4 +1,4 @@ -@version: 3.15 +@version: 3.16 # # Syslog-ng configuration for TLD Linux # diff --git a/syslog-ng.conf b/syslog-ng.conf index 405de8f..725bdc0 100644 --- a/syslog-ng.conf +++ b/syslog-ng.conf @@ -1,4 +1,4 @@ -@version: 3.15 +@version: 3.16 @include "scl.conf" # # Syslog-ng configuration for TLD Linux diff --git a/syslog-ng.spec b/syslog-ng.spec index 679927c..3d11e27 100644 --- a/syslog-ng.spec +++ b/syslog-ng.spec @@ -27,29 +27,29 @@ %endif # as in git submodule -%define libivykis_version 0.42.2 +%define libivykis_version 0.42.3 %define glib2_ver 1:2.24.0 -%define mver 3.15 -%define docmver 3.15 +%define mver 3.16 +%define docmver 3.16 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.15.1 -Release: 4 +Version: 3.16.1 +Release: 1 License: GPL v2+ with OpenSSL exception Group: Daemons Source0: https://github.com/balabit/syslog-ng/archive/%{name}-%{version}.tar.gz -# Source0-md5: ad97a307a9ae2f26615f0aa8f7ec320f +# Source0-md5: c00fac07d8403b44cb9a3942ad63b3d8 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: a0d5f955d313262d1ce3b73d77e4038b +# Source4-md5: 8214f912f16cb4c456e1b2b8ef89f465 Source5: %{name}-simple.conf Source6: https://github.com/buytenh/ivykis/archive/v%{libivykis_version}/ivykis-%{libivykis_version}.tar.gz -# Source6-md5: aeafef422d8dafb84e1fcd16f9f4822e +# Source6-md5: 4d84813d011ff671e66eccc952a5c78f Patch0: %{name}-datadir.patch Patch1: cap_syslog-vserver-workaround.patch Patch2: %{name}-nolibs.patch @@ -412,6 +412,12 @@ ln -snf %{slibdir}/$(basename $RPM_BUILD_ROOT%{slibdir}/libevtlog-%{mver}.so.*.* %{__mv} $RPM_BUILD_ROOT%{_libdir}/libsecret-storage.so.* $RPM_BUILD_ROOT%{slibdir} ln -snf %{slibdir}/$(basename $RPM_BUILD_ROOT%{slibdir}/libsecret-storage.so.*.*.*) $RPM_BUILD_ROOT%{_libdir}/libsecret-storage.so + +%{__mv} $RPM_BUILD_ROOT%{_libdir}/libloggen_helper-%{mver}.so.* $RPM_BUILD_ROOT%{slibdir} +ln -snf %{slibdir}/$(basename $RPM_BUILD_ROOT%{slibdir}/libloggen_helper-%{mver}.so.*.*.*) $RPM_BUILD_ROOT%{_libdir}/libloggen_helper.so + +%{__mv} $RPM_BUILD_ROOT%{_libdir}/libloggen_plugin-%{mver}.so.* $RPM_BUILD_ROOT%{slibdir} +ln -snf %{slibdir}/$(basename $RPM_BUILD_ROOT%{slibdir}/libloggen_plugin-%{mver}.so.*.*.*) $RPM_BUILD_ROOT%{_libdir}/libloggen_plugin.so %endif %{__sed} -e 's|@@SBINDIR@@|%{_sbindir}|g' %{SOURCE1} > $RPM_BUILD_ROOT/etc/rc.d/init.d/syslog-ng @@ -428,6 +434,7 @@ ln -s "%{name}" $RPM_BUILD_ROOT/etc/sysconfig/%{name}@default %{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/syslog-ng-debun.1 %{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la %{__rm} $RPM_BUILD_ROOT%{moduledir}/*.la +%{__rm} $RPM_BUILD_ROOT%{moduledir}/loggen/*.la %clean rm -rf $RPM_BUILD_ROOT @@ -514,6 +521,9 @@ exit 0 %attr(755,root,root) %{moduledir}/libhook-commands.so %attr(755,root,root) %{moduledir}/libkvformat.so %attr(755,root,root) %{moduledir}/liblinux-kmsg-format.so +%dir %{moduledir}/loggen +%attr(755,root,root) %{moduledir}/loggen/libloggen_socket_plugin.so +%attr(755,root,root) %{moduledir}/loggen/libloggen_ssl_plugin.so %attr(755,root,root) %{moduledir}/libmap-value-pairs.so %attr(755,root,root) %{moduledir}/libpacctformat.so %attr(755,root,root) %{moduledir}/libpseudofile.so @@ -550,6 +560,7 @@ exit 0 %{_datadir}/syslog-ng/include/scl/snmptrap %{_datadir}/syslog-ng/include/scl/solaris %{_datadir}/syslog-ng/include/scl/sudo +%{_datadir}/syslog-ng/include/scl/telegram %{_datadir}/syslog-ng/include/scl/windowseventlog %dir %{_datadir}/syslog-ng/include/scl/syslogconf %{_datadir}/syslog-ng/include/scl/syslogconf/README @@ -640,6 +651,10 @@ exit 0 %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.*.*.* @@ -649,6 +664,8 @@ exit 0 %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}/libsyslog-ng-native-connector.a -- 2.37.3