commit 2c73d9c76190253b8de0e6b75c998017f681e801 Author: Jacek Konieczny <j.koniec...@eggsoft.pl> Date: Wed Oct 24 09:22:15 2018 +0200
fix building with current automake https://github.com/balabit/syslog-ng/issues/1949 am_deps.patch | 23 +++++++++++++++++++++++ syslog-ng.spec | 2 ++ 2 files changed, 25 insertions(+) --- diff --git a/syslog-ng.spec b/syslog-ng.spec index f6a31ba..fb72958 100644 --- a/syslog-ng.spec +++ b/syslog-ng.spec @@ -67,6 +67,7 @@ Patch3: %{name}-systemd.patch Patch4: man-paths.patch Patch5: %{name}-link.patch Patch6: no_shared_ivykis.patch +Patch7: am_deps.patch URL: https://syslog-ng.org/ %{?with_geoip:BuildRequires: GeoIP-devel >= 1.5.1} BuildRequires: autoconf >= 2.59 @@ -340,6 +341,7 @@ mv ivykis-%{libivykis_version} lib/ivykis %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 cp -p %{SOURCE4} doc cp -p %{SOURCE5} contrib/syslog-ng.conf.simple diff --git a/am_deps.patch b/am_deps.patch new file mode 100644 index 0000000..4339612 --- /dev/null +++ b/am_deps.patch @@ -0,0 +1,23 @@ +From 41dd64e7b11d527f8f3cc6ae13067d0225191538 Mon Sep 17 00:00:00 2001 +From: kokan <peter.ko...@balabit.com> +Date: Sat, 31 Mar 2018 15:36:08 +0200 +Subject: [PATCH] libsyslog-ng: missing dependency libsecret-storage + +Signed-off-by: kokan <peter.ko...@balabit.com> +--- + lib/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/Makefile.am b/lib/Makefile.am +index af2f44ece2..4a0b11c92f 100644 +--- a/lib/Makefile.am ++++ b/lib/Makefile.am +@@ -47,7 +47,7 @@ lib_libsyslog_ng_la_LDFLAGS = -no-undefined -release ${LSNG_RELEASE} \ + + lib_test_subdirs = lib_filter lib_logproto lib_parser lib_rewrite lib_template lib_stats lib_control + +-lib_libsyslog_ng_la_DEPENDENCIES = lib/eventlog/src/libevtlog.la ++lib_libsyslog_ng_la_DEPENDENCIES = lib/eventlog/src/libevtlog.la lib/secret-storage/libsecret-storage.la + + if IVYKIS_INTERNAL + lib_libsyslog_ng_la_DEPENDENCIES += lib/ivykis/src/libivykis.la ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/syslog-ng.git/commitdiff/2c73d9c76190253b8de0e6b75c998017f681e801 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit