Accepting request 327256 from Base:System
1 OBS-URL: https://build.opensuse.org/request/show/327256 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rsyslog?expand=0&rev=109
This commit is contained in:
Stephan Kulow
Git OBS Bridge
commit
502401e5cb
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:bc64d8ba1e3fb8cfe21eadd5fb0938381bb37ed72cef9d6f14d376d2bac9bf78
|
||||
size 2060890
|
||||
60
rsyslog-8.12.0-gnutls.patch
Normal file
60
rsyslog-8.12.0-gnutls.patch
Normal file
@ -0,0 +1,60 @@
|
||||
From 588b4ca7412326abd51a5b2060eafbc04611e419 Mon Sep 17 00:00:00 2001
|
||||
From: Radovan Sroka <rsroka@redhat.com>
|
||||
Date: Tue, 11 Aug 2015 17:09:15 +0200
|
||||
Subject: [PATCH] Fix detection of the GnuTLS package
|
||||
|
||||
This commit fixes a number of issues that cropped up from these changes:
|
||||
23c5b3e replace deprecated GnuTLS functions with newer ones if available
|
||||
88f0651 bugfix: ommysql did not work when gnutls was enabled
|
||||
ce560b6 build system: Failure action in AC_CHECK_LIB check for
|
||||
|
||||
The solution is based on the assumption that the call to AC_CHECK_LIB()
|
||||
was added purely to satisfy the subsequent calls to AC_CHECK_FUNCS().
|
||||
23c5b3e had the unintentional result of libgnutls being added to LIBS
|
||||
and linked to undesired components.
|
||||
The next commit removed libgnutls from LIBS which made the following
|
||||
calls to AC_CHECK_FUNCS() nonfunctional.
|
||||
Another commit made the processing not stop upon detecting a missing
|
||||
component which, again, makes the calls to AC_CHECK_FUNCS() malfunction.
|
||||
|
||||
The solution is to get rid of AC_CHECK_LIB() and temporarily override
|
||||
LIBS for use by AC_CHECK_FUNCS().
|
||||
---
|
||||
configure.ac | 14 ++++----------
|
||||
1 file changed, 4 insertions(+), 10 deletions(-)
|
||||
|
||||
Index: rsyslog-8.12.0/configure.ac
|
||||
===================================================================
|
||||
--- rsyslog-8.12.0.orig/configure.ac 2015-08-10 12:25:41.000000000 +0200
|
||||
+++ rsyslog-8.12.0/configure.ac 2015-08-26 21:40:26.000000000 +0200
|
||||
@@ -763,18 +763,13 @@ AC_ARG_ENABLE(gnutls,
|
||||
if test "x$enable_gnutls" = "xyes"; then
|
||||
PKG_CHECK_MODULES(GNUTLS, gnutls >= 1.4.0)
|
||||
AC_DEFINE([ENABLE_GNUTLS], [1], [Indicator that GnuTLS is present])
|
||||
- AC_CHECK_LIB(
|
||||
- [gnutls],
|
||||
- [gnutls_global_init],
|
||||
- [
|
||||
- AC_DEFINE(HAVE_LIB_GNUTLS, 1, [gnutls is available])
|
||||
- ],
|
||||
- [AC_MSG_WARN([gnutls_global_init function missing or not detected])],
|
||||
- []
|
||||
- )
|
||||
+ save_libs=$LIBS
|
||||
+ LIBS="$LIBS $GNUTLS_LIBS"
|
||||
AC_CHECK_FUNCS(gnutls_certificate_set_retrieve_function,,)
|
||||
AC_CHECK_FUNCS(gnutls_certificate_type_set_priority,,)
|
||||
+ LIBS=$save_libs
|
||||
fi
|
||||
+
|
||||
AM_CONDITIONAL(ENABLE_GNUTLS, test x$enable_gnutls = xyes)
|
||||
|
||||
# libgcrypt support
|
||||
@@ -1655,7 +1650,6 @@ else
|
||||
AC_MSG_NOTICE([Not running from git source])
|
||||
fi
|
||||
|
||||
-
|
||||
AM_CONDITIONAL(ENABLE_GENERATE_MAN_PAGES, test x$have_to_generate_man_pages = xyes)
|
||||
|
||||
# rst2man
|
||||
23
rsyslog-8.12.0-parallel-build.patch
Normal file
23
rsyslog-8.12.0-parallel-build.patch
Normal file
@ -0,0 +1,23 @@
|
||||
From ac3e7d316efee0b7a2b953aebdd3268f2b7c31c5 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas D <whissi@whissi.de>
|
||||
Date: Thu, 13 Aug 2015 17:50:36 +0200
|
||||
Subject: [PATCH] Fix: Parallel build issue "cannot find
|
||||
../runtime/.libs/librsyslog.a: No such file or directory" (Fixes #479)
|
||||
|
||||
This issue was introduced with commit fb4fd2ddd2f08380ad65a8cafc5f124890b136ad.
|
||||
---
|
||||
runtime/Makefile.am | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
Index: rsyslog-8.12.0/runtime/Makefile.am
|
||||
===================================================================
|
||||
--- rsyslog-8.12.0.orig/runtime/Makefile.am 2015-08-26 21:40:29.000000000 +0200
|
||||
+++ rsyslog-8.12.0/runtime/Makefile.am 2015-08-26 21:40:36.000000000 +0200
|
||||
@@ -186,6 +186,7 @@ if ENABLE_LIBGCRYPT
|
||||
libgcry_la_SOURCES = libgcry.c libgcry_common.c libgcry.h
|
||||
libgcry_la_CPPFLAGS = $(RSRT_CFLAGS) $(LIBGCRYPT_CFLAGS)
|
||||
pkglib_LTLIBRARIES += lmcry_gcry.la
|
||||
+ lmcry_gcry_la_DEPENDENCIES = librsyslog.la
|
||||
lmcry_gcry_la_SOURCES = lmcry_gcry.c lmcry_gcry.h
|
||||
lmcry_gcry_la_CPPFLAGS = $(RSRT_CFLAGS) $(LIBGCRYPT_CFLAGS)
|
||||
lmcry_gcry_la_LDFLAGS = -module -avoid-version \
|
||||
3
rsyslog-8.12.0.tar.gz
Normal file
3
rsyslog-8.12.0.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:466bfeac8296e89de1eb9029880998ba7b5fc25694143197bb47167df6cb7e20
|
||||
size 2091620
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:591b5e6839bc38b1bff31ebf6d23236cdc5cd74ccc2437095fd946cf5a5d9a29
|
||||
size 4114015
|
||||
3
rsyslog-doc-8.12.0.tar.gz
Normal file
3
rsyslog-doc-8.12.0.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f88517c1e5ae3a8ba129d531b5b4bb79e80f70898a8a5b72a0abd7a8a0feb8f0
|
||||
size 4212441
|
||||
@ -1,3 +1,27 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 26 19:41:39 UTC 2015 - astieger@suse.com
|
||||
|
||||
- rsyslog 8.12.0:
|
||||
* Harmonize resetConfigVariables values and defaults
|
||||
* GT/KSI: fix some issues in signature file format and add conversion tool
|
||||
* bugfix: ommysql did not work when gnutls was enabled
|
||||
* bugfix omfile: potential memory leak on file close
|
||||
* bugfix omfile: potential race in dynafile detection/creation
|
||||
* bugfix omfile: Fix race-condition detection in path-creation code
|
||||
* bugfix parser subsystem: potential misadressing in SanitizeMsg()
|
||||
* imfile: files moved outside of directory are now (properly) handled
|
||||
* bugfix: imfile: segfault when using startmsg.regex
|
||||
* bugfix imfile: file table was corrupted when on file deletion
|
||||
* bugfix ompgsql: transaction were improperly handled
|
||||
* bugfix mmjsonparse: memory leak if non-cee-json message is processed
|
||||
* testbench: remove raciness from UDP based tests
|
||||
* testbench: added bash into all scripts makign it mandatory
|
||||
* bugfix testbench: Fixed problem building syslog_caller util when
|
||||
liblogging-stdlog is not available.
|
||||
- add upstream patches:
|
||||
* rsyslog-8.12.0-gnutls.patch to fix build with gnutls
|
||||
* rsyslog-8.12.0-parallel-build.patch to fix parallel build
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 1 20:03:33 UTC 2015 - astieger@suse.com
|
||||
|
||||
|
||||
20
rsyslog.spec
20
rsyslog.spec
@ -20,7 +20,7 @@ Name: rsyslog
|
||||
Summary: The enhanced syslogd for Linux and Unix
|
||||
License: (GPL-3.0+ and Apache-2.0)
|
||||
Group: System/Daemons
|
||||
Version: 8.11.0
|
||||
Version: 8.12.0
|
||||
Release: 0
|
||||
%if 0%{?suse_version} >= 1210
|
||||
%bcond_without systemd
|
||||
@ -94,6 +94,11 @@ BuildRequires: pkgconfig(libsystemd-journal) >= 197
|
||||
Requires(pre): %insserv_prereq %fillup_prereq /etc/init.d/syslog
|
||||
BuildRequires: klogd
|
||||
%endif
|
||||
# for patch1
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: libtool
|
||||
#
|
||||
BuildRequires: bison
|
||||
BuildRequires: flex
|
||||
BuildRequires: openssl-devel >= 0.9.7
|
||||
@ -138,7 +143,8 @@ BuildRequires: libgcrypt-devel
|
||||
%endif
|
||||
%if %{with guardtime}
|
||||
BuildRequires: libgt-devel >= 0.3.1
|
||||
BuildRequires: pkgconfig(libksi)
|
||||
BuildRequires: pkgconfig(libksi) >= 3.2.2.0
|
||||
BuildConflicts: libksi >= 3.3.0.0
|
||||
%endif
|
||||
%if %{with dbi}
|
||||
BuildRequires: libdbi-devel
|
||||
@ -213,6 +219,8 @@ Source15: rsyslog.firewall
|
||||
|
||||
# PATCH-FIX-OPENSUSE rsyslog-unit.patch crrodriguez@opensuse.org Customize upstream systemd unit for openSUSE needs.
|
||||
Patch0: rsyslog-unit.patch
|
||||
Patch1: rsyslog-8.12.0-gnutls.patch
|
||||
Patch2: rsyslog-8.12.0-parallel-build.patch
|
||||
|
||||
# this is a dirty hack since % dir does only work for the specified directory and nothing above
|
||||
# but I want to be able to switch this to /etc/apparmor.d once the profiles received more testing
|
||||
@ -521,6 +529,8 @@ This module provides support for ZeroMQ.
|
||||
%prep
|
||||
%setup -q -n %{name}-%{upstream_version} -a 14
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
#
|
||||
%if %{with systemd}
|
||||
for file in rsyslog-service-prepare; do
|
||||
@ -535,6 +545,10 @@ done
|
||||
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -W -Wall -I../grammar -I../../grammar"
|
||||
# needs java
|
||||
# --enable-gui \
|
||||
|
||||
# for patch1
|
||||
autoreconf -fiv
|
||||
|
||||
%configure \
|
||||
--with-moddirs=%{rsyslog_module_dir_withdeps} \
|
||||
%if ! %{with rst2man}
|
||||
@ -1120,7 +1134,6 @@ fi
|
||||
%defattr(-,root,root)
|
||||
%{rsyslog_module_dir_withdeps}/lmcry_gcry.so
|
||||
%{_bindir}/rscryutil
|
||||
%{_mandir}/man1/rscryutil.1*
|
||||
%endif
|
||||
|
||||
%if %{with guardtime}
|
||||
@ -1130,7 +1143,6 @@ fi
|
||||
%{rsyslog_module_dir_withdeps}/lmsig_gt.so
|
||||
%{rsyslog_module_dir_withdeps}/lmsig_ksi.so
|
||||
%{_bindir}/rsgtutil
|
||||
%{_mandir}/man1/rsgtutil.1*
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user