[packages/syslog-ng] - system libivykiss causes segfaults on x32, use builtin - updated BRs - disable java and python for

[baggins]

commit eebad2d53e7d1c835c90edabf5d6cb124d13990d
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Oct 29 21:48:35 2016 +0200

    - system libivykiss causes segfaults on x32, use builtin
    - updated BRs
    - disable java and python for now (TODO: package these)
    - fixed linking with internal libivykis

 syslog-ng-link.patch | 13 +++++++++++++
 syslog-ng.spec       | 14 ++++++++------
 2 files changed, 21 insertions(+), 6 deletions(-)
---
diff --git a/syslog-ng.spec b/syslog-ng.spec
index d61ea3c..72773c3 100644
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -20,7 +20,9 @@
 %bcond_without	geoip			# support for GeoIP
 %bcond_without	riemann			# support for Riemann monitoring system
 %bcond_without	systemd			# systemd (daemon and journal) support
-%bcond_without	system_libivykis	# use system libivykis
+%bcond_with	python			# python module
+%bcond_with	java			# java modules and support
+%bcond_with	system_libivykis	# use system libivykis
 %bcond_with	system_rabbitmq		# use system librabbitmq [not supported yet]
 
 %if "%{pld_release}" == "ac"
@@ -84,6 +86,7 @@ BuildRequires:	rpmbuild(macros) >= 1.623
 %{?with_systemd:BuildRequires:	systemd-devel >= 1:195}
 BuildRequires:	which
 %if %{with tests}
+BuildRequires:	GeoIP-db-Country
 BuildRequires:	pylint
 BuildRequires:	python
 BuildRequires:	python-pep8
@@ -262,6 +265,7 @@ Summary:	syslog-ng template function module to get GeoIP info from an IPv4 addre
 Summary(pl.UTF-8):	Moduł funkcji szablonu sysloga-ng do pobierania informacji GeoIP z adresów IPv4
 Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
+Requires:	GeoIP-db-Country
 Requires:	GeoIP-libs >= 1.5.1
 
 %description module-tfgeoip
@@ -321,11 +325,6 @@ cp -p %{SOURCE5} contrib/syslog-ng.conf.simple
 
 %{__sed} -i -e 's|/usr/bin/awk|/bin/awk|' scl/syslogconf/convert-syslogconf.awk
 
-# timestamp paring on x32 confuses glib2 testsuite
-%ifarch x32
-%{__sed} -i -e '/tests\/unit\/test_msgparse/d' tests/unit/Makefile.am
-%endif
-
 %build
 for i in . lib/ivykis; do
 cd $i
@@ -341,6 +340,9 @@ done
 	--disable-silent-rules \
 	--with-default-modules=affile,afprog,afsocket,afuser,basicfuncs,csvparser,dbparser,syslogformat \
 	--with-docbook=%{xsl_stylesheets_dir}/manpages/docbook.xsl \
+	--enable-java%{!?with_java:=no} \
+	--enable-java-modules%{!?with_java:=no} \
+	--enable-python%{!?with_python:=no} \
 %if %{with mongodb}
 	--enable-mongodb \
 	--with-libmongo-client=system \
diff --git a/syslog-ng-link.patch b/syslog-ng-link.patch
index 255a281..f04eae5 100644
--- a/syslog-ng-link.patch
+++ b/syslog-ng-link.patch
@@ -31,3 +31,16 @@
  	${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)
+ 
+ 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 \
================================================================

---- gitweb:

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