- fixes wrt mixed linking option

- moved linking fix from nolibs patch to link patch, adjusted to really enable mixed linking of syslog-ng and syslog-ng-ctl

diff --git a/syslog-ng-link.patch b/syslog-ng-link.patch
new file mode 100644 (file)
index 0000000..d7d114b
--- /dev/null
+++ b/syslog-ng-link.patch
@@ -0,0 +1,32 @@
+#--- 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 @@
+ EXTRA_DIST                                    +=      \
+       syslog-ng-ctl/control-client-unix.c
+ 
+-syslog_ng_ctl_syslog_ng_ctl_LDADD             = lib/libsyslog-ng.la $(CRYPTO_LIBS) @BASE_LIBS@ @GLIB_LIBS@ @RESOLV_LIBS@
++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_ctl_syslog_ng_ctl_DEPENDENCIES      = lib/libsyslog-ng.la lib/libsyslog-ng-crypto.la
+--- 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 @@
+ 
+ lib_logproto_tests_test_findeom_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-nolibs.patch b/syslog-ng-nolibs.patch
index 9f97ac7d6d1187476e6ef39a2b91ce41231f09b5..0906f4735328c58ff4c3dc88a6a2ab872896cfe1 100644 (file)
--- a/syslog-ng-nolibs.patch
+++ b/syslog-ng-nolibs.patch
@@ -15,14 +15,3 @@
  
  
  if test "x$enable_linux_caps" = "xyes" -o "x$enable_linux_caps" = "xauto"; then
---- 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.

diff --git a/syslog-ng.spec b/syslog-ng.spec
index b2a2895fff600ee97d052b710d70be70963a88a1..d45594b8353dbfb72a235fe96ec8ad91cfc90517 100644 (file)
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -49,6 +49,7 @@ Patch1:               cap_syslog-vserver-workaround.patch
 Patch2:                %{name}-nolibs.patch
 Patch3:                %{name}-systemd.patch
 Patch4:                man-paths.patch
+Patch5:                %{name}-link.patch
 URL:           https://www.balabit.com/network-security/syslog-ng/opensource-logging-system
 %{?with_geoip:BuildRequires:   GeoIP-devel >= 1.5.1}
 BuildRequires: autoconf >= 2.59
@@ -295,6 +296,7 @@ Pliki nagłówkowe do tworzenia modułów dla sysloga-ng.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 cp -p %{SOURCE4} doc
 cp -p %{SOURCE5} contrib/syslog-ng.conf.simple
 
@@ -383,8 +385,8 @@ install -d $RPM_BUILD_ROOT/etc/{sysconfig,logrotate.d,rc.d/init.d} \
 
 %if "%{slibdir}" != "%{_libdir}"
 install -d $RPM_BUILD_ROOT%{slibdir}
-%{__mv} $RPM_BUILD_ROOT%{_libdir}/libsyslog-ng.so.* $RPM_BUILD_ROOT%{slibdir}
-ln -snf %{slibdir}/$(basename $RPM_BUILD_ROOT%{slibdir}/libsyslog-ng.so.*.*.*) %{_libdir}/libsyslog-ng-%{mver}.so
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/libsyslog-ng-%{mver}.so.* $RPM_BUILD_ROOT%{slibdir}
+ln -snf %{slibdir}/$(basename $RPM_BUILD_ROOT%{slibdir}/libsyslog-ng-%{mver}.so.*.*.*) $RPM_BUILD_ROOT%{_libdir}/libsyslog-ng.so
 %endif
 
 %{__sed} -e 's|@@SBINDIR@@|%{_sbindir}|g' %{SOURCE1} > $RPM_BUILD_ROOT/etc/rc.d/init.d/syslog-ng
@@ -397,7 +399,7 @@ done
 touch $RPM_BUILD_ROOT/etc/sysconfig/%{name}
 
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/syslog-ng/*.la
+%{__rm} $RPM_BUILD_ROOT%{moduledir}/*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -594,7 +596,7 @@ exit 0
 %{_includedir}/syslog-ng/compat
 %{_includedir}/syslog-ng/control
 %{_includedir}/syslog-ng/filter
-%if %{without system_ivykis}
+%if %{without system_libivykis}
 %{_includedir}/syslog-ng/ivykis
 %endif
 %{_includedir}/syslog-ng/logproto