commit 6599601ca6df31bf69056287048d5f7029d30f35
Author: Jacek Konieczny <[email protected]>
Date: Tue Apr 3 10:25:24 2018 +0200
force linking syslog-ng library with libivykis
If only plugins are linked with libivykis, then the library is
initialized too late and the daemon crashes while loading the plugins.
syslog-ng-link.patch | 66 ++++++++++++++++++++++++++++------------------------
syslog-ng.spec | 7 +++---
2 files changed, 40 insertions(+), 33 deletions(-)
---
diff --git a/syslog-ng.spec b/syslog-ng.spec
index 0fee2ae..8b3a6a6 100644
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -328,6 +328,10 @@ Pliki nagłówkowe do tworzenia modułów dla sysloga-ng.
%prep
%setup -q -n %{name}-%{name}-%{version} -a 6
+
+rmdir lib/ivykis
+mv ivykis-%{libivykis_version} lib/ivykis
+
%patch0 -p1
%patch1 -p1
%patch2 -p1
@@ -340,9 +344,6 @@ cp -p %{SOURCE5} contrib/syslog-ng.conf.simple
%{__sed} -i -e 's|/usr/bin/awk|/bin/awk|' scl/syslogconf/convert-syslogconf.awk
-rmdir lib/ivykis
-mv ivykis-%{libivykis_version} lib/ivykis
-
%build
for i in . ; do
cd $i
diff --git a/syslog-ng-link.patch b/syslog-ng-link.patch
index f04eae5..9ae4190 100644
--- a/syslog-ng-link.patch
+++ b/syslog-ng-link.patch
@@ -1,40 +1,34 @@
-#--- syslog-ng-3.5.2/configure.ac~ 2013-12-01 22:52:03.000000000 +0100
-#+++ syslog-ng-3.5.2/configure.ac 2013-12-01 23:02:32.955209559 +0100
-#@@ -1145,7 +1145,7 @@
-# else
-# SYSLOGNG_DEPS_LIBS="$LIBS $BASE_LIBS $RESOLV_LIBS $LD_START_STATIC
-Wl,--whole-archive $GLIB_LIBS $EVTLOG_LIBS $PCRE_LIBS $REGEX_LIBS
-Wl,--no-whole-archive $IVYKIS_NO_LIBTOOL_LIBS $LD_END_STATIC $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="$GLIB_LIBS $EVTLOG_LIBS $LIBCAP_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.
---- syslog-ng-3.6.3/syslog-ng-ctl/Makefile.am.orig 2015-06-08
15:44:04.000000000 +0200
-+++ syslog-ng-3.6.3/syslog-ng-ctl/Makefile.am 2015-06-14 12:14:41.989973064
+0200
-@@ -10,5 +10,6 @@ syslog_ng_ctl_syslog_ng_ctl_SOURCES =
- 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@
---- syslog-ng-3.6.3/lib/logproto/tests/Makefile.am.orig 2015-06-08
15:44:04.000000000 +0200
-+++ syslog-ng-3.6.3/lib/logproto/tests/Makefile.am 2015-06-14
12:29:25.672597931 +0200
-@@ -20,7 +20,7 @@
+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
+@@ -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 "
+ 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"
- lib_logproto_tests_test_findeom_CFLAGS = -I${top_srcdir}/libtest
+ # 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
+@@ -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
---- syslog-ng-3.8.1/modules/diskq/Makefile.am~ 2016-10-29 16:04:03.000000000
+0200
-+++ syslog-ng-3.8.1/modules/diskq/Makefile.am 2016-10-29 16:04:53.759617687
+0200
-@@ -45,9 +45,9 @@
- modules_diskq_libdisk_buffer_la_DEPENDENCIES = $(MODULE_DEPS_LIBS)
$(LIBSYSLOG_NG_DISK_BUFFER)
+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 = \
@@ -44,3 +38,15 @@
$(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@
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/syslog-ng.git/commitdiff/6599601ca6df31bf69056287048d5f7029d30f35
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
