pool/rsyslog
SHA256
12
0
Fork 1
Code Issues Pull Requests Activity

- update to 5.6.3 (v5-stable) with following bugfixes (digest):

Browse Source 
* action processor released mememory too early, resulting in
  potential issue in retry cases (very unlikely).
  * batch processing flagged invalid message as "bad" under some
  circumstances
  * unitialized variable could cause issues under extreme
  conditions plus some minor nits.
  * batches which had actions in error were not properly retried
  in all cases
  * imfile did duplicate messages under some circumstances
- enabled plain tcp input, unix socket output, last message
  parser and the libdbi module as separate package.

OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=36
This commit is contained in:
Marius Tomaschewski
2011-02-02 16:11:38 +00:00
committed by Git OBS Bridge
parent d0435add8a
commit 994b3291fa
5 changed files with 84 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
rsyslog-5.6.2.tar.bz2
View File

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

3
rsyslog-5.6.3.tar.bz2 Normal file
View File

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

15
rsyslog-systemd-integration.bnc656104.diff
View File

@@ -6,13 +6,6 @@ Date: Thu Jan 20 15:08:08 2011 +0100
Support for multiple unix sockets and activation in forking mode
commit c5132c84fc1a678b5d93fcc430871c141110b82c
Merge: c4026ec f9a4091
Author: Marius Tomaschewski <mt@suse.de>
Date: Fri Dec 3 18:07:40 2010 +0100
Merge branch 'v5.6.1-systemd1' into v5.6.2-systemd1
commit f9a409137bdcd04ebf4851a23f573c436a14e5b2
Author: Rainer Gerhards <rgerhards@adiscon.com>
Date: Wed Sep 8 12:46:03 2010 +0200
@@ -38,15 +31,15 @@ Date: Tue Sep 7 13:06:04 2010 +0200
[skipped whitespace-only changes -- mt@suse.de]
diff --git a/ChangeLog b/ChangeLog
index ca13d48..1ea95b2 100644
index 72e2946..8b7c7b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+- acquire /dev/log socket optionally from systemd
+ thanks to Lennart Poettering for this patch
---------------------------------------------------------------------------
Version 5.6.2 [V5-STABLE] (rgerhards), 2010-11-30
- bugfix: compile failed on systems without epoll_create1()
Version 5.6.3 [V5-STABLE] (rgerhards), 2011-01-26
- bugfix: action processor released mememory too early, resulting in
diff --git a/plugins/imuxsock/Makefile.am b/plugins/imuxsock/Makefile.am
index a2fe0ba..28f9f9e 100644
--- a/plugins/imuxsock/Makefile.am
@@ -877,7 +870,7 @@ index 0000000..45aac8b
+
+#endif
diff --git a/tools/syslogd.c b/tools/syslogd.c
index 2e4ea5d..701036d 100644
index ffcaa27..37c3848 100644
--- a/tools/syslogd.c
+++ b/tools/syslogd.c
@@ -135,6 +135,7 @@

16
rsyslog.changes
View File

@@ -1,3 +1,19 @@
-------------------------------------------------------------------
Wed Feb 2 16:11:12 UTC 2011 - mt@suse.de
- update to 5.6.3 (v5-stable) with following bugfixes (digest):
* action processor released mememory too early, resulting in
potential issue in retry cases (very unlikely).
* batch processing flagged invalid message as "bad" under some
circumstances
* unitialized variable could cause issues under extreme
conditions plus some minor nits.
* batches which had actions in error were not properly retried
in all cases
* imfile did duplicate messages under some circumstances
- enabled plain tcp input, unix socket output, last message
parser and the libdbi module as separate package.
-------------------------------------------------------------------
Thu Jan 20 14:10:59 UTC 2011 - mt@suse.de

83
rsyslog.spec
View File

@@ -1,5 +1,5 @@
#
# spec file for package rsyslog (Version 5.6.2)
# spec file for package rsyslog (Version 5.6.3)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -20,11 +20,12 @@
Name: rsyslog
Summary: The enhanced syslogd for Linux and Unix
Version: 5.6.2
Version: 5.6.3
Release: 1
%define upstream_version 5.6.2
# add %define build_with_relp 1 to enable relp on < 11.3, e.g.
# via <topadd>%define build_with_relp 1</topadd> in _link file.
%define upstream_version 5.6.3
%define with_dbi 1
# let's look where it fails...
# 0%{?suse_version} >= 1140 || 0%{?build_with_relp:1}
%define with_relp 0%{?suse_version} >= 1130 || 0%{?build_with_relp:1}
%define _sbindir /sbin
%define rsyslogdocdir %{_docdir}/%{name}
@@ -42,23 +43,25 @@ BuildRequires: klogd
BuildRequires: dos2unix openssl-devel pcre-devel pkgconfig zlib-devel
BuildRequires: krb5-devel mysql-devel net-snmp-devel postgresql-devel
BuildRequires: libgnutls-devel
%if %{?with_relp}
%if 0%{?with_dbi}
BuildRequires: libdbi-devel
%endif
%if 0%{?with_relp}
# RELP support
BuildRequires: librelp-devel
%endif
# UDP spoof support
%if 0%{?suse_version} > 1130
BuildRequires: libnet-devel
#
#BuildRequires: systemd
#
# unresolvable: nothing provides fsck-with-dev-lock needed by systemd
#
# The systemd package provides
# /usr/share/doc/packages/systemd/sd-daemon.[ch]
# files instead of a lib ...
BuildRequires: systemd
%else
BuildRequires: libnet
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#Source0: http://download.rsyslog.com/rsyslog/%{name}-%{upstream_version}.tar.gz
#Source0: http://download.rsyslog.com/rsyslog/rsyslog-<upstream_version>.tar.gz
Source0: %{name}-%{upstream_version}.tar.bz2
Source1: rsyslog.sysconfig
Source2: rsyslog.conf.in
@@ -138,6 +141,21 @@ package.
This module provides the support for logging into PostgreSQL databases.
%if 0%{?with_dbi}
%package module-dbi
License: GPLv3+
Group: System/Daemons
Requires: %{name} = %{version}
Summary: Database support via DBI
%description module-dbi
Rsyslog is an enhanced multi-threaded syslog daemon. See rsyslog
package.
This package provides a module with the support for logging into DBI
supported databases.
%endif
%package module-snmp
License: GPLv3+
Group: System/Daemons
@@ -164,7 +182,7 @@ package.
This module provides the ability for TLS encrypted TCP logging (based
on current syslog-transport-tls internet drafts).
%if %{?with_relp}
%if 0%{?with_relp}
%package module-relp
License: GPLv3+
@@ -196,6 +214,10 @@ This module provides a UDP forwarder that allows changing the sender address.
%setup -q -n %{name}-%{upstream_version}
%patch1 -p1
dos2unix doc/*.html
%if %suse_version > 1130
# install the files systemd provides rather than what we provide.
cp -a /usr/share/doc/packages/systemd/sd-daemon.[ch] runtime/
%endif
%build
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -W -Wall"
@@ -220,18 +242,24 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -W -Wall"
--enable-gssapi-krb5 \
--enable-mysql \
--enable-pgsql \
%if 0%{?with_dbi}
--enable-libdbi \
%endif
%if 0%{?with_relp}
--enable-relp \
%endif
--enable-snmp \
--enable-mail \
--enable-imfile \
--enable-imptcp \
--enable-imtemplate \
--enable-omprog \
--enable-omuxsock \
--enable-omtemplate \
--enable-diagtools \
%if %{?with_relp}
--enable-relp \
%endif
--enable-omudpspoof \
--enable-omstdout \
--enable-pmlastmsg \
--enable-diagtools \
--disable-static
make %{?_smp_mflags:%{_smp_mflags}} V=1
@@ -241,12 +269,15 @@ make install DESTDIR="%{buildroot}" V=1
#
rm -f %{buildroot}%{rsyslog_module_dir_nodeps}/*.la
#
# move all modules linking libraries in /usr to /usr/%_lib
# move all modules linking libraries in /usr to /usr/lib[64]
# the user has to specify them with full path then...
install -d -m0755 %{buildroot}%{rsyslog_module_dir_withdeps}
for mod in omgssapi.so imgssapi.so lmgssutil.so ommysql.so \
ompgsql.so omsnmp.so lmnsd_gtls.so \
%if %{?with_relp}
%if 0%{?with_dbi}
omlibdbi.so \
%endif
%if 0%{?with_relp}
imrelp.so omrelp.so \
%endif
; do
@@ -412,6 +443,7 @@ fi
%{rsyslog_module_dir_nodeps}/lmnet.so
%{rsyslog_module_dir_nodeps}/lmnetstrms.so
%{rsyslog_module_dir_nodeps}/lmnsd_ptcp.so
%{rsyslog_module_dir_nodeps}/imptcp.so
%{rsyslog_module_dir_nodeps}/lmregexp.so
%{rsyslog_module_dir_nodeps}/lmstrmsrv.so
%{rsyslog_module_dir_nodeps}/lmtcpclt.so
@@ -420,9 +452,11 @@ fi
%{rsyslog_module_dir_nodeps}/ommail.so
%{rsyslog_module_dir_nodeps}/omprog.so
%{rsyslog_module_dir_nodeps}/omruleset.so
%{rsyslog_module_dir_nodeps}/omstdout.so
%{rsyslog_module_dir_nodeps}/omtemplate.so
%{rsyslog_module_dir_nodeps}/omtesting.so
%{rsyslog_module_dir_nodeps}/omstdout.so
%{rsyslog_module_dir_nodeps}/omuxsock.so
%{rsyslog_module_dir_nodeps}/pmlastmsg.so
%dir %{rsyslog_module_dir_withdeps}
%{_mandir}/man5/rsyslog.conf.5*
%{_mandir}/man8/rsyslogd.8*
@@ -463,6 +497,12 @@ fi
%doc %{rsyslogdocdir}/pgsql-createDB.sql
%{rsyslog_module_dir_withdeps}/ompgsql.so
%if 0%{?with_dbi}
%files module-dbi
%defattr(-,root,root)
%{rsyslog_module_dir_withdeps}/omlibdbi.so
%endif
%files module-snmp
%defattr(-,root,root)
%{rsyslog_module_dir_withdeps}/omsnmp.so
@@ -471,8 +511,7 @@ fi
%defattr(-,root,root)
%{rsyslog_module_dir_withdeps}/lmnsd_gtls.so
%if %{?with_relp}
%if 0%{?with_relp}
%files module-relp
%defattr(-,root,root)
%{rsyslog_module_dir_withdeps}/imrelp.so