From e2663c45b1821d34e9f8cc0d7f6ce80deb2ee7c6 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Wed, 9 May 2018 12:51:21 +0000 Subject: [PATCH] - use upstream linking fix for eventlog --- syslog-ng-link.patch | 10 ++++------ syslog-ng.spec | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/syslog-ng-link.patch b/syslog-ng-link.patch index 0bad65a..1ba073c 100644 --- a/syslog-ng-link.patch +++ b/syslog-ng-link.patch @@ -1,18 +1,16 @@ 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) +@@ -793,7 +793,7 @@ dnl *************************************************************************** --EVTLOG_LIBS="\$(top_builddir)/lib/eventlog/src/libevtlog.la" + 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_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 *************************************************************************** -@@ -1639,9 +1639,9 @@ +@@ -1687,9 +1687,9 @@ # syslog-ng binary is linked with the default link command (e.g. libtool) SYSLOGNG_LINK='$(LINK)' else diff --git a/syslog-ng.spec b/syslog-ng.spec index ba6336c..679927c 100644 --- a/syslog-ng.spec +++ b/syslog-ng.spec @@ -37,7 +37,7 @@ 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: 3 +Release: 4 License: GPL v2+ with OpenSSL exception Group: Daemons Source0: https://github.com/balabit/syslog-ng/archive/%{name}-%{version}.tar.gz -- 2.37.3