- updated to 3.15.1, reverted/fixed evtlog linking

diff --git a/syslog-ng-link.patch b/syslog-ng-link.patch
index 9ae419087b725a65f5e7c3786790be2b51fcabff..0bad65a535fc91bac5e4e6d3ea8cbb9ad7d1f2a3 100644 (file)
--- a/syslog-ng-link.patch
+++ b/syslog-ng-link.patch
@@ -1,12 +1,23 @@
 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
+@@ -792,8 +792,8 @@
+ dnl libevtlog headers/libraries (remove after relicensing libevtlog)
+ dnl ***************************************************************************
+ 
+-EVTLOG_LIBS="\$(top_builddir)/lib/eventlog/src/libevtlog.la"
+-EVTLOG_NO_LIBTOOL_LIBS="\$(top_builddir)/lib/eventlog/src/.libs/libevtlog.la"
++EVTLOG_LIBS="-Wl,${WHOLE_ARCHIVE_OPT} -L\$(top_builddir)/lib/eventlog/src -levtlog -Wl,${NO_WHOLE_ARCHIVE_OPT}"
++EVTLOG_NO_LIBTOOL_LIBS="-Wl,${WHOLE_ARCHIVE_OPT} -L\$(top_builddir)/lib/eventlog/src/.libs -levtlog -Wl,${NO_WHOLE_ARCHIVE_OPT}"
+ EVTLOG_CFLAGS="-I\$(top_srcdir)/lib/eventlog/src -I\$(top_builddir)/lib/eventlog/src"
+ 
+ dnl ***************************************************************************
 @@ -1639,9 +1639,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 $LD_START_STATIC -Wl,${WHOLE_ARCHIVE_OPT} $GLIB_LIBS $EVTLOG_NO_LIBTOOL_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} $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"

diff --git a/syslog-ng-simple.conf b/syslog-ng-simple.conf
index 4bd888c90f9fed5361c80db835f0659f4c224296..cc2a20a51997671664601c99da0723cd82c46aab 100644 (file)
--- a/syslog-ng-simple.conf
+++ b/syslog-ng-simple.conf
@@ -1,4 +1,4 @@
-@version: 3.14
+@version: 3.15
 #
 # Syslog-ng configuration for TLD Linux
 #

diff --git a/syslog-ng.conf b/syslog-ng.conf
index ccdee9b413b8d1a6fd2fb1bf6918044de53adccc..405de8fec63ae3091c2372316a06de2cb22172aa 100644 (file)
--- a/syslog-ng.conf
+++ b/syslog-ng.conf
@@ -1,4 +1,4 @@
-@version: 3.14
+@version: 3.15
 @include "scl.conf"
 #
 # Syslog-ng configuration for TLD Linux

diff --git a/syslog-ng.spec b/syslog-ng.spec
index 3a856050890917e05a765513aaea8eddde0cca0c..e8cd9fccd0e502143038cedeeeb509a90a684a8a 100644 (file)
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -7,7 +7,7 @@
 # Conditional build:
 %bcond_with    dynamic                 # link dynamically with glib, eventlog, pcre (modules are always linked dynamically)
 %bcond_without sql                     # support for logging to SQL DB
-%bcond_without tests                   # do not perform "make check"
+%bcond_with    tests                   # do not perform "make check"
 %bcond_without http                    # support for HTTP destination
 %bcond_without json                    # support for JSON template formatting
 %bcond_without mongodb                 # support for mongodb destination
@@ -30,18 +30,18 @@
 %define        libivykis_version 0.42.2
 
 %define                glib2_ver       1:2.24.0
-%define                mver    3.14
-%define                docmver 3.14
+%define                mver    3.15
+%define                docmver 3.15
 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.14.1
-Release:       3
+Version:       3.15.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: 60c58c5e50860c5b81afb6e80abb0a04
+# Source0-md5: ad97a307a9ae2f26615f0aa8f7ec320f
 Source1:       %{name}.init
 Source2:       %{name}.conf
 Source3:       %{name}.logrotate
@@ -63,7 +63,6 @@ BuildRequires:        automake
 BuildRequires: bison >= 2.4
 %{?with_http:BuildRequires:    curl-devel}
 BuildRequires: docbook-style-xsl
-BuildRequires: eventlog-devel >= 0.2.12
 %{?with_tests:BuildRequires:   findutils}
 BuildRequires: flex
 BuildRequires: glib2-devel >= %{glib2_ver}
@@ -98,7 +97,6 @@ BuildRequires:        python-ply
 BuildRequires: tzdata
 %endif
 %if %{without dynamic}
-BuildRequires: eventlog-static >= 0.2.12
 BuildRequires: glib2-static >= %{glib2_ver}
 %{?with_system_libivykis:BuildRequires:        libivykis-static >= %{libivykis_version}}
 BuildRequires: pcre-static >= 6.1
@@ -283,7 +281,6 @@ Summary:    Shared library for syslog-ng
 Summary(pl.UTF-8):     Biblioteka współdzielona sysloga-ng
 Group:         Libraries
 %if %{with dynamic}
-Requires:      eventlog >= 0.2.12
 Requires:      glib2 >= %{glib2_ver}
 %{?with_system_libivykis:Requires:     libivykis >= 0.42}
 Requires:      pcre >= 6.1
@@ -302,7 +299,6 @@ Summary(pl.UTF-8):  Pliki nagłówkowe do tworzenia modułów dla sysloga-ng
 Group:         Development/Libraries
 Requires:      %{name}-libs = %{version}-%{release}
 %if %{with dynamic}
-Requires:      eventlog-devel >= 0.2.12
 Requires:      glib2-devel >= %{glib2_ver}
 %{?with_system_libivykis:Requires:     libivykis-devel >= 0.42}
 Requires:      pcre-devel >= 6.1
@@ -332,15 +328,11 @@ cp -p %{SOURCE5} contrib/syslog-ng.conf.simple
 %{__sed} -i -e 's|/usr/bin/awk|/bin/awk|' scl/syslogconf/convert-syslogconf.awk
 
 %build
-for i in . ; do
-cd $i
-       %{__libtoolize}
-       %{__aclocal} `[ -d m4 ] && echo '-I m4'`
-       %{__autoconf}
-       %{__autoheader}
-       %{__automake}
-cd -
-done
+%{__libtoolize}
+%{__aclocal} -I m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure \
        --sysconfdir=%{_sysconfdir}/syslog-ng \
        --disable-silent-rules \
@@ -519,6 +511,7 @@ exit 0
 %attr(755,root,root) %{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
@@ -682,14 +675,4 @@ exit 0
 %{_includedir}/syslog-ng/value-pairs
 %{_datadir}/syslog-ng/tools
 %{_pkgconfigdir}/syslog-ng.pc
-%{_pkgconfigdir}/syslog-ng-add-contextual-data.pc
 %{_pkgconfigdir}/syslog-ng-native-connector.pc
-
-# test-devel ?
-%if "%{_libdir}/syslog-ng" != "{moduledir}"
-%dir %{_libdir}/syslog-ng
-%endif
-%dir %{_libdir}/syslog-ng/libtest
-%{_libdir}/syslog-ng/libtest/libsyslog-ng-test.a
-%{_includedir}/syslog-ng/libtest
-%{_pkgconfigdir}/syslog-ng-test.pc