pool/rsyslog
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 333511 from home:AndreasStieger:branches:Base:System

Browse Source 
rsyslog 8.13.0

OBS-URL: https://build.opensuse.org/request/show/333511
OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=231
This commit is contained in:
Andreas Stieger 2015-09-24 19:39:38 +00:00 committed by Git OBS Bridge
parent 670ae72f46
commit 2bebf8fd89
8 changed files with 27 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
rsyslog-8.12.0-gnutls.patch
View File

@ -1,60 +0,0 @@
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
View File

@ -1,23 +0,0 @@
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
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:466bfeac8296e89de1eb9029880998ba7b5fc25694143197bb47167df6cb7e20
size 2091620

3
rsyslog-8.13.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b182bd0a7686bef093be570bfb850417191292522fb58e0ad32f2c824f754a33
size 2077267

3
rsyslog-doc-8.12.0.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f88517c1e5ae3a8ba129d531b5b4bb79e80f70898a8a5b72a0abd7a8a0feb8f0
size 4212441

3
rsyslog-doc-8.13.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cfed262416d7b1cb75cf567b9ef9ca8796dd002402e4d374d33e68cc0a576aa6
size 4207005

12
rsyslog.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Thu Sep 24 18:55:21 UTC 2015 - astieger@suse.com
- rsyslog 8.13.0:
* ZeroMQ enhancements
* Redis enhancements
* mmnormalize: liblognorm error messages are now emitted via
regular rsyslog error reporting mechanism (aka "are now logged")
* networking improvements
- drop rsyslog-8.12.0-parallel-build.patch, is upstream
- drop rsyslog-8.12.0-gnutls.patch, same
-------------------------------------------------------------------
Wed Aug 26 19:41:39 UTC 2015 - astieger@suse.com

28
rsyslog.spec
View File

@ -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.12.0
Version: 8.13.0
Release: 0
%if 0%{?suse_version} >= 1210
%bcond_without systemd
@ -62,7 +62,6 @@ Release: 0
%bcond_with hiredis
%bcond_with zeromq
%define upstream_version %{version}
%define rsyslogdocdir %{_docdir}/%{name}
%if %{defined _rundir}
%define rsyslog_rundir %{_rundir}/rsyslog
@ -174,10 +173,10 @@ BuildRequires: libnet-devel
# mmnormalize support
%if %{with pkgconfig}
BuildRequires: pkgconfig(libee) >= 0.4.0
BuildRequires: pkgconfig(lognorm) >= 1.0.2
BuildRequires: pkgconfig(lognorm) >= 1.1.2
%else
BuildRequires: libee-devel
BuildRequires: liblognorm-devel
BuildRequires: libee-devel >= 0.4.0
BuildRequires: liblognorm-devel >= 1.1.2
%endif
%endif
#
@ -189,23 +188,17 @@ BuildRequires: pkgconfig(libee) >= 0.4.0
BuildRequires: pkgconfig(libestr) >= 0.1.9
BuildRequires: pkgconfig(uuid) >= 2.21.0
%else
BuildRequires: libee-devel
BuildRequires: libee-devel >= 0.4.0
BuildRequires: libestr-devel
BuildRequires: libjson-c-devel
BuildRequires: libuuid-devel
%endif
BuildRequires: python-docutils
%if 0%{?suse_version} >= 1200
%bcond_without rst2man
%else
%bcond_with rst2man
%endif
%if %{with systemd}
%{?systemd_requires}
BuildRequires: pkgconfig(systemd)
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: http://www.rsyslog.com/files/download/%{name}/%{name}-%{upstream_version}.tar.gz
Source0: http://www.rsyslog.com/files/download/%{name}/%{name}-%{version}.tar.gz
Source1: rsyslog.sysconfig
Source2: rsyslog.conf.in
Source4: rsyslog.d.remote.conf.in
@ -214,13 +207,12 @@ Source6: usr.sbin.rsyslogd
Source7: module-mysql
Source8: module-snmp
Source9: module-udpspoof
Source14: http://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-%{upstream_version}.tar.gz
# generated from https://github.com/rsyslog/ ./release_build.sh this is WIP upstream
Source14: rsyslog-doc-%{version}.tar.gz
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
@ -527,10 +519,8 @@ This module provides support for ZeroMQ.
%endif
%prep
%setup -q -n %{name}-%{upstream_version} -a 14
%setup -q -a 14
%patch0 -p1
%patch1 -p1
%patch2 -p1
#
%if %{with systemd}
for file in rsyslog-service-prepare; do