[packages/syslog-ng] - up to 3.19.1; tests require https://github.com/Snaipe/Criterion

arekm arekm at pld-linux.org
Wed Feb 13 14:32:25 CET 2019 

commit 02680757c3ce4fe6060dfcb8e565058d011fb631
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Wed Feb 13 14:32:08 2019 +0100

    - up to 3.19.1; tests require https://github.com/Snaipe/Criterion

 am_deps.patch                       | 23 -----------------
 cap_syslog-vserver-workaround.patch | 50 -------------------------------------
 syslog-ng-link.patch                | 43 +++++++------------------------
 syslog-ng.conf                      |  6 ++++-
 syslog-ng.spec                      | 44 +++++++++++++++++++++-----------
 5 files changed, 44 insertions(+), 122 deletions(-)
---
diff --git a/syslog-ng.spec b/syslog-ng.spec
index f932466..1dc5891 100644
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -39,18 +39,18 @@
 %else
 %define		glib2_ver	1:2.24.0
 %endif
-%define		mver	3.14
+%define		mver	3.19
 %define		docmver	3.12
 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:	7
+Version:	3.19.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:	370b066fda02da03b9d4653652519217
 Source1:	%{name}.init
 Source2:	%{name}.conf
 Source3:	%{name}.logrotate
@@ -61,13 +61,12 @@ Source6:	https://github.com/buytenh/ivykis/archive/v%{libivykis_version}/ivykis-
 # Source6-md5:	aeafef422d8dafb84e1fcd16f9f4822e
 Source7:	syslog-ng.service
 Patch0:		%{name}-datadir.patch
-Patch1:		cap_syslog-vserver-workaround.patch
+
 Patch2:		%{name}-nolibs.patch
 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
@@ -76,7 +75,10 @@ BuildRequires:	bison >= 2.4
 %{?with_http:BuildRequires:	curl-devel}
 BuildRequires:	docbook-style-xsl
 BuildRequires:	eventlog-devel >= 0.2.12
-%{?with_tests:BuildRequires:	findutils}
+%if %{with tests}
+BuildRequires:	criterion-devel
+BuildRequires:	findutils
+%endif
 BuildRequires:	flex
 BuildRequires:	glib2-devel >= %{glib2_ver}
 %{?with_redis:BuildRequires:	hiredis-devel}
@@ -335,13 +337,12 @@ rmdir lib/ivykis
 mv ivykis-%{libivykis_version} lib/ivykis
 
 %patch0 -p1
-%patch1 -p1
+
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
 cp -p %{SOURCE4} doc
 cp -p %{SOURCE5} contrib/syslog-ng.conf.simple
 
@@ -419,7 +420,7 @@ export LD_LIBRARY_PATH PYTHONPATH
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/{sysconfig,logrotate.d,rc.d/init.d} \
+install -d $RPM_BUILD_ROOT/etc/{syslog-ng.d,sysconfig,logrotate.d,rc.d/init.d} \
 	$RPM_BUILD_ROOT%{_sysconfdir}/syslog-ng/patterndb.d \
 	$RPM_BUILD_ROOT/var/{log,lib/%{name}/xsd}
 
@@ -435,6 +436,12 @@ ln -snf %{slibdir}/$(basename $RPM_BUILD_ROOT%{slibdir}/libsyslog-ng-%{mver}.so.
 %{__mv} $RPM_BUILD_ROOT%{_libdir}/libevtlog-%{mver}.so.* $RPM_BUILD_ROOT%{slibdir}
 ln -snf %{slibdir}/$(basename $RPM_BUILD_ROOT%{slibdir}/libevtlog-%{mver}.so.*.*.*) $RPM_BUILD_ROOT%{_libdir}/libevtlog.so
 
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/libloggen_helper-%{mver}.so.* $RPM_BUILD_ROOT%{slibdir}
+ln -snf %{slibdir}/$(basename $RPM_BUILD_ROOT%{slibdir}/libloggen_helper-%{mver}.so.*.*.*) $RPM_BUILD_ROOT%{_libdir}/libloggen_helper.so
+
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/libloggen_plugin-%{mver}.so.* $RPM_BUILD_ROOT%{slibdir}
+ln -snf %{slibdir}/$(basename $RPM_BUILD_ROOT%{slibdir}/libloggen_plugin-%{mver}.so.*.*.*) $RPM_BUILD_ROOT%{_libdir}/libloggen_plugin.so
+
 %{__mv} $RPM_BUILD_ROOT%{_libdir}/libsecret-storage.so.* $RPM_BUILD_ROOT%{slibdir}
 ln -snf %{slibdir}/$(basename $RPM_BUILD_ROOT%{slibdir}/libsecret-storage.so.*.*.*) $RPM_BUILD_ROOT%{_libdir}/libsecret-storage.so
 %endif
@@ -519,6 +526,7 @@ exit 0
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}@default
 %attr(750,root,root) %dir %{_sysconfdir}/syslog-ng
 %attr(750,root,root) %dir %{_sysconfdir}/syslog-ng/patterndb.d
+%attr(750,root,root) %dir %{_sysconfdir}/syslog-ng.d
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/syslog-ng/scl.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/syslog-ng/syslog-ng.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/syslog-ng
@@ -563,6 +571,9 @@ exit 0
 %endif
 %attr(755,root,root) %{moduledir}/libsyslogformat.so
 %attr(755,root,root) %{moduledir}/libsystem-source.so
+%dir %{moduledir}/loggen
+%attr(755,root,root) %{moduledir}/loggen/libloggen_socket_plugin.so
+%attr(755,root,root) %{moduledir}/loggen/libloggen_ssl_plugin.so
 %attr(755,root,root) %{_sbindir}/syslog-ng
 %attr(755,root,root) %{_sbindir}/syslog-ng-ctl
 %attr(755,root,root) %{_bindir}/dqtool
@@ -574,7 +585,6 @@ exit 0
 %dir %{_datadir}/syslog-ng/include/scl
 %{_datadir}/syslog-ng/include/scl/apache
 %{_datadir}/syslog-ng/include/scl/default-network-drivers
-%{_datadir}/syslog-ng/include/scl/elasticsearch
 %{_datadir}/syslog-ng/include/scl/graphite
 %{_datadir}/syslog-ng/include/scl/hdfs
 %{_datadir}/syslog-ng/include/scl/kafka
@@ -582,8 +592,6 @@ exit 0
 %dir %{_datadir}/syslog-ng/include/scl/loadbalancer
 %attr(755,root,root) %{_datadir}/syslog-ng/include/scl/loadbalancer/gen-loadbalancer.sh
 %{_datadir}/syslog-ng/include/scl/loadbalancer/plugin.conf
-%{_datadir}/syslog-ng/include/scl/loggly
-%{_datadir}/syslog-ng/include/scl/logmatic
 %{_datadir}/syslog-ng/include/scl/mbox
 %{_datadir}/syslog-ng/include/scl/nodejs
 %{_datadir}/syslog-ng/include/scl/osquery
@@ -653,6 +661,9 @@ exit 0
 %attr(755,root,root) %{moduledir}/libjson-plugin.so
 %{_datadir}/syslog-ng/include/scl/cim
 %{_datadir}/syslog-ng/include/scl/cisco
+%{_datadir}/syslog-ng/include/scl/elasticsearch
+%{_datadir}/syslog-ng/include/scl/loggly
+%{_datadir}/syslog-ng/include/scl/logmatic
 %{_datadir}/syslog-ng/include/scl/ewmm
 %{_datadir}/syslog-ng/include/scl/graylog2
 %endif
@@ -679,6 +690,10 @@ exit 0
 %defattr(644,root,root,755)
 %attr(755,root,root) %{slibdir}/libevtlog-%{mver}.so.*.*.*
 %attr(755,root,root) %{slibdir}/libevtlog-%{mver}.so.0
+%attr(755,root,root) %{slibdir}/libloggen_helper-%{mver}.so.*.*.*
+%attr(755,root,root) %{slibdir}/libloggen_helper-%{mver}.so.0
+%attr(755,root,root) %{slibdir}/libloggen_plugin-%{mver}.so.*.*.*
+%attr(755,root,root) %{slibdir}/libloggen_plugin-%{mver}.so.0
 %attr(755,root,root) %{slibdir}/libsecret-storage.so.*.*.*
 %attr(755,root,root) %{slibdir}/libsecret-storage.so.0
 %attr(755,root,root) %{slibdir}/libsyslog-ng-%{mver}.so.*.*.*
@@ -714,9 +729,9 @@ 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
 
+%if %{with tests}
 # test-devel ?
 %if "%{_libdir}/syslog-ng" != "{moduledir}"
 %dir %{_libdir}/syslog-ng
@@ -725,3 +740,4 @@ exit 0
 %{_libdir}/syslog-ng/libtest/libsyslog-ng-test.a
 %{_includedir}/syslog-ng/libtest
 %{_pkgconfigdir}/syslog-ng-test.pc
+%endif
diff --git a/am_deps.patch b/am_deps.patch
deleted file mode 100644
index 4339612..0000000
--- a/am_deps.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 41dd64e7b11d527f8f3cc6ae13067d0225191538 Mon Sep 17 00:00:00 2001
-From: kokan <peter.kokai at balabit.com>
-Date: Sat, 31 Mar 2018 15:36:08 +0200
-Subject: [PATCH] libsyslog-ng: missing dependency libsecret-storage
-
-Signed-off-by: kokan <peter.kokai at 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
diff --git a/cap_syslog-vserver-workaround.patch b/cap_syslog-vserver-workaround.patch
deleted file mode 100644
index 0cd5a79..0000000
--- a/cap_syslog-vserver-workaround.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -ur syslog-ng-3.2.4.org/lib/gprocess.c syslog-ng-3.2.4/lib/gprocess.c
---- syslog-ng-3.2.4.org/lib/gprocess.c	2011-09-10 19:11:42.848926449 +0200
-+++ syslog-ng-3.2.4/lib/gprocess.c	2011-09-10 19:21:08.665586449 +0200
-@@ -305,10 +305,23 @@
-   return;
- }
- 
-+#define LINUX_VERSION(x,y,z)    (0x10000*(x) + 0x100*(y) + z)
-+
-+static int
-+get_kernel_version(void) {
-+	static struct utsname uts;
-+	int x = 0, y = 0, z = 0;
-+	if ((uname(&uts) == -1) || (sscanf(uts.release, "%u.%u.%u", &x, &y, &z) < 2)) {
-+		msg_error("Unable to retrieve kernel version.", NULL);
-+		return -1;
-+	}
-+	return LINUX_VERSION(x, y, z);
-+}
-+
- gboolean
- g_process_check_cap_syslog(void)
- {
--  int ret;
-+  int ret, kver;
- 
-   if (have_capsyslog)
-     return TRUE;
-@@ -320,6 +333,10 @@
-   if (ret == -1)
-     return FALSE;
- 
-+  kver = get_kernel_version();
-+  if (kver > 0 && kver < LINUX_VERSION(2,6,38))
-+    return FALSE;
-+
-   have_capsyslog = TRUE;
-   return TRUE;
- }
-diff -ur syslog-ng-3.2.4.org/lib/gprocess.h syslog-ng-3.2.4/lib/gprocess.h
---- syslog-ng-3.2.4.org/lib/gprocess.h	2011-09-10 19:11:42.848926449 +0200
-+++ syslog-ng-3.2.4/lib/gprocess.h	2011-09-10 19:15:44.334619870 +0200
-@@ -28,6 +28,7 @@
- #include "syslog-ng.h"
- 
- #include <sys/types.h>
-+#include <sys/utsname.h>
- 
- #if ENABLE_LINUX_CAPS
- #  include <sys/capability.h>
diff --git a/syslog-ng-link.patch b/syslog-ng-link.patch
index 9ae4190..7ce274f 100644
--- a/syslog-ng-link.patch
+++ b/syslog-ng-link.patch
@@ -1,52 +1,27 @@
 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 @@
+@@ -1626,9 +1626,9 @@ if test "x$linking_mode" = "xdynamic"; t
  	# 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"
+-	SYSLOGNG_DEPS_LIBS="$LIBS $BASE_LIBS $RESOLV_LIBS $EVTLOG_NO_LIBTOOL_LIBS $SECRETSTORAGE_NO_LIBTOOL_LIBS $LD_START_STATIC -Wl,${WHOLE_ARCHIVE_OPT} $GLIB_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 $EVTLOG_NO_LIBTOOL_LIBS $SECRETSTORAGE_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 $SECRETSTORAGE_LIBS $RESOLV_LIBS $LIBCAP_LIBS $PCRE_LIBS $REGEX_LIBS $IVYKIS_LIBS $DL_LIBS"
 -	CORE_DEPS_LIBS=""
-+	CORE_DEPS_LIBS="$IVYKIS_LIBS"
++        CORE_DEPS_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 -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 @@
+@@ -24,8 +24,7 @@ lib_logproto_tests_test_findeom_CFLAGS	=
  	$(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
+ 	${top_builddir}/libtest/libsyslog-ng-test.a \
+ 	$(TEST_LDADD)
  lib_logproto_tests_test_findeom_SOURCES = \
- 	lib/logproto/tests/test_findeom.c
-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 = \
--  $(TOOL_DEPS_LIBS) \
-   $(MODULE_DEPS_LIBS) \
-+  $(TOOL_DEPS_LIBS) \
-   $(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@
+
diff --git a/syslog-ng.conf b/syslog-ng.conf
index 0201b02..4333781 100644
--- a/syslog-ng.conf
+++ b/syslog-ng.conf
@@ -1,4 +1,4 @@
- at version: 3.14
+ at version: 3.19
 @include "scl.conf"
 #
 # Syslog-ng configuration for PLD Linux
@@ -138,3 +138,7 @@ log { source(s_sys); destination(d_messages); flags(fallback); };
 
 # Network syslogging
 #log { source(s_sys); destination(d_loghost); };
+
+
+# put any customization files in this directory
+ at include "/etc/syslog-ng.d/"
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/syslog-ng.git/commitdiff/02680757c3ce4fe6060dfcb8e565058d011fb631

More information about the pld-cvs-commit mailing list