[rsyslog] Rebase to an upstream snapshot
Tomas Heinrich
theinric at fedoraproject.org
Tue Jun 4 19:12:24 UTC 2013
commit db527059e0ebcb7ae3b7547426cc1a775c670b0d
Author: Tomas Heinrich <theinric at redhat.com>
Date: Tue Jun 4 19:38:33 2013 +0200
Rebase to an upstream snapshot
- src: rsyslog-7.3.15-20130604git6e72fa6.tar.gz
- drop patches 3, 4 - merged upstream
- add a patch to silence warnings emitted by the imuxsock module
- drop the imkmsg plugin
- enable compilation of additional modules
imjournal, mmanon, omjournal, omrabbitmq
- new subpackages: crypto, rabbitmq
- add python-docutils and autoconf to global BuildRequires
- drop the option for backwards compatibility from the
sysconfig file - it is no longer supported
- call autoreconf to prepare the snapshot for building
.gitignore | 1 +
rsyslog-7.3.15-imuxsock-warning.patch | 35 ++++++++++++++
rsyslog.spec | 80 ++++++++++++++++++++++++++------
rsyslog.sysconfig | 2 +-
sources | 2 +-
5 files changed, 103 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c0793ce..fa21b94 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ rsyslog-4.6.3.tar.gz
/rsyslog-7.2.5.tar.gz
/rsyslog-7.3.9.tar.gz
/rsyslog-7.3.10.tar.gz
+/rsyslog-7.3.15-20130604git6e72fa6.tar.gz
diff --git a/rsyslog-7.3.15-imuxsock-warning.patch b/rsyslog-7.3.15-imuxsock-warning.patch
new file mode 100644
index 0000000..d2eaad8
--- /dev/null
+++ b/rsyslog-7.3.15-imuxsock-warning.patch
@@ -0,0 +1,35 @@
+From ac6c45537391d67beb55b03ccf301bdaa150cd8a Mon Sep 17 00:00:00 2001
+From: Tomas Heinrich <theinric at redhat.com>
+Date: Mon, 3 Jun 2013 15:09:07 +0200
+Subject: [PATCH] imuxsock: don't report an error message for
+ $OmitLocalLogging
+
+---
+ plugins/imuxsock/imuxsock.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/plugins/imuxsock/imuxsock.c b/plugins/imuxsock/imuxsock.c
+index c503852..dad09ab 100644
+--- a/plugins/imuxsock/imuxsock.c
++++ b/plugins/imuxsock/imuxsock.c
+@@ -1284,6 +1284,8 @@ BEGINactivateCnfPrePrivDrop
+ instanceConf_t *inst;
+ CODESTARTactivateCnfPrePrivDrop
+ runModConf = pModConf;
++ if(runModConf->bOmitLocalLogging && nfd == 1)
++ ABORT_FINALIZE(RS_RET_OK);
+ for(inst = runModConf->root ; inst != NULL ; inst = inst->next) {
+ addListner(inst);
+ }
+@@ -1325,6 +1327,8 @@ BEGINrunInput
+ #endif
+
+ CODESTARTrunInput
++ if(runModConf->bOmitLocalLogging && nfd == 1)
++ ABORT_FINALIZE(RS_RET_OK);
+ /* this is an endless loop - it is terminated when the thread is
+ * signalled to do so. This, however, is handled by the framework,
+ * right into the sleep below.
+--
+1.7.10.4
+
diff --git a/rsyslog.spec b/rsyslog.spec
index 7803de2..df52dec 100644
--- a/rsyslog.spec
+++ b/rsyslog.spec
@@ -9,15 +9,16 @@
%global want_hiredis 1
%global want_mongodb 1
%endif
+%global snapshot 20130604git6e72fa6
Summary: Enhanced system logging and kernel message trapping daemon
Name: rsyslog
-Version: 7.3.10
-Release: 1%{?dist}
+Version: 7.3.15
+Release: 1.%{snapshot}%{?dist}
License: (GPLv3+ and ASL 2.0)
Group: System Environment/Daemons
URL: http://www.rsyslog.com/
-Source0: http://www.rsyslog.com/files/download/rsyslog/%{name}-%{version}.tar.gz
+Source0: %{name}-%{version}-%{snapshot}.tar.gz
Source2: rsyslog.conf
Source3: rsyslog.sysconfig
Source4: rsyslog.log
@@ -26,16 +27,16 @@ Patch0: rsyslog-7.2.2-systemd.patch
Patch1: rsyslog-7.2.2-manpage-dbg-mode.patch
# prevent modification of trusted properties (proposed upstream)
Patch2: rsyslog-7.2.1-msg_c_nonoverwrite_merge.patch
-# #950088, interim, merged upstream
-Patch3: rsyslog-7.3.10-ratelimit-segv.patch
-# interim, merged upstream
-Patch4: rsyslog-7.3.10-correct-def-val.patch
+Patch3: rsyslog-7.3.15-imuxsock-warning.patch
+BuildRequires: autoconf automake libtool
BuildRequires: bison
BuildRequires: flex
BuildRequires: json-c-devel
BuildRequires: libuuid-devel
BuildRequires: pkgconfig
+BuildRequires: python-docutils
+BuildRequires: systemd-devel >= 197
BuildRequires: zlib-devel
Requires: logrotate >= 3.5.2
@@ -47,6 +48,12 @@ Requires(postun): systemd
Provides: syslog
Obsoletes: sysklogd < 1.5-11
+%package crypto
+Summary: Encryption support
+Group: System Environment/Daemons
+Requires: %name = %version-%release
+BuildRequires: libgcrypt-devel
+
%package doc
Summary: Documentation for rsyslog
Group: Documentation
@@ -112,6 +119,12 @@ Group: System Environment/Daemons
Requires: %name = %version-%release
BuildRequires: postgresql-devel
+%package rabbitmq
+Summary: RabbitMQ support for rsyslog
+Group: System Environment/Daemons
+Requires: %name = %version-%release
+BuildRequires: librabbitmq-devel >= 0.2
+
%package gssapi
Summary: GSSAPI authentication and encryption support for rsyslog
Group: System Environment/Daemons
@@ -122,7 +135,7 @@ BuildRequires: krb5-devel
Summary: RELP protocol support for rsyslog
Group: System Environment/Daemons
Requires: %name = %version-%release
-BuildRequires: librelp-devel >= 1.0.1
+BuildRequires: librelp-devel >= 1.0.3
%package gnutls
Summary: TLS protocol support for rsyslog
@@ -150,6 +163,10 @@ and can be used as a drop-in replacement. Rsyslog is simple to set up, with
advanced features suitable for enterprise-class, encryption-protected syslog
relay chains.
+%description crypto
+This package containes a module providing log file encryption and a
+command line tool to process encrypted logs.
+
%description doc
This subpackage contains documentation for rsyslog.
@@ -196,6 +213,9 @@ MongoDB database support to rsyslog.
The rsyslog-pgsql package contains a dynamic shared object that will add
PostgreSQL database support to rsyslog.
+%description rabbitmq
+This module allows rsyslog to send messages to a RabbitMQ server.
+
%description gssapi
The rsyslog-gssapi package contains the rsyslog plugins which support GSSAPI
authentication and secure connections. GSSAPI is commonly used for Kerberos
@@ -221,12 +241,11 @@ spoof the sender address. Also, it enables to circle through a number
of source ports.
%prep
-%setup -q
+%setup -q -n rsyslog
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
%build
%ifarch sparc64
@@ -243,6 +262,7 @@ export LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now"
export HIREDIS_CFLAGS=-I/usr/include/hiredis
export HIREDIS_LIBS=-L%{_libdir}
%endif
+autoreconf -is
%configure \
--prefix=/usr \
--disable-static \
@@ -252,11 +272,12 @@ export HIREDIS_LIBS=-L%{_libdir}
--enable-gssapi-krb5 \
--enable-imdiag \
--enable-imfile \
+ --enable-imjournal \
--enable-impstats \
--enable-imptcp \
- --enable-kmsg \
--enable-libdbi \
--enable-mail \
+ --enable-mmanon \
--enable-mmaudit \
--enable-mmjsonparse \
--enable-mmnormalize \
@@ -265,10 +286,12 @@ export HIREDIS_LIBS=-L%{_libdir}
%if %{want_hiredis}
--enable-omhiredis \
%endif
+ --enable-omjournal \
%if %{want_mongodb}
--enable-ommongodb \
%endif
--enable-omprog \
+ --enable-omrabbitmq \
--enable-omstdout \
--enable-omudpspoof \
--enable-omuxsock \
@@ -280,7 +303,9 @@ export HIREDIS_LIBS=-L%{_libdir}
--enable-pmsnare \
--enable-relp \
--enable-snmp \
- --enable-unlimited-select
+ --enable-unlimited-select \
+ --enable-usertools \
+
make
%install
@@ -329,8 +354,8 @@ done
# plugins
%{_libdir}/rsyslog/imdiag.so
%{_libdir}/rsyslog/imfile.so
+%{_libdir}/rsyslog/imjournal.so
%{_libdir}/rsyslog/imklog.so
-%{_libdir}/rsyslog/imkmsg.so
%{_libdir}/rsyslog/immark.so
%{_libdir}/rsyslog/impstats.so
%{_libdir}/rsyslog/imptcp.so
@@ -345,11 +370,13 @@ done
%{_libdir}/rsyslog/lmtcpclt.so
%{_libdir}/rsyslog/lmtcpsrv.so
%{_libdir}/rsyslog/lmzlibw.so
-%{_libdir}/rsyslog/omtesting.so
+%{_libdir}/rsyslog/mmanon.so
+%{_libdir}/rsyslog/omjournal.so
%{_libdir}/rsyslog/ommail.so
%{_libdir}/rsyslog/omprog.so
%{_libdir}/rsyslog/omruleset.so
%{_libdir}/rsyslog/omstdout.so
+%{_libdir}/rsyslog/omtesting.so
%{_libdir}/rsyslog/omuxsock.so
%{_libdir}/rsyslog/pmaixforwardedfrom.so
%{_libdir}/rsyslog/pmcisconames.so
@@ -357,6 +384,10 @@ done
%{_libdir}/rsyslog/pmrfc3164sd.so
%{_libdir}/rsyslog/pmsnare.so
+%files crypto
+%{_bindir}/rscryutil
+%{_libdir}/rsyslog/lmcry_gcry.so
+
%files doc
%doc doc/*html
@@ -398,6 +429,7 @@ done
%if %{want_mongodb}
%files mongodb
%defattr(-,root,root)
+%{_bindir}/logctl
%{_libdir}/rsyslog/ommongodb.so
%endif
@@ -406,6 +438,10 @@ done
%doc plugins/ompgsql/createDB.sql
%{_libdir}/rsyslog/ompgsql.so
+%files rabbitmq
+%defattr(-,root,root)
+%{_libdir}/rsyslog/omrabbitmq.so
+
%files gssapi
%defattr(-,root,root)
%{_libdir}/rsyslog/lmgssutil.so
@@ -430,7 +466,21 @@ done
%{_libdir}/rsyslog/omudpspoof.so
%changelog
-* Wed Apr 14 2013 Tomas Heinrich <theinric at redhat.com> 7.3.10-1
+* Tue Jun 04 2013 Tomas Heinrich <theinric at redhat.com> 7.3.15-1.20130604git6e72fa6
+- rebase to an upstream snapshot, effectively version 7.3.15
+ plus several more changes
+- drop patches 3, 4 - merged upstream
+- add a patch to silence warnings emitted by the imuxsock module
+- drop the imkmsg plugin
+- enable compilation of additional modules
+ imjournal, mmanon, omjournal, omrabbitmq
+- new subpackages: crypto, rabbitmq
+- add python-docutils and autoconf to global BuildRequires
+- drop the option for backwards compatibility from the
+ sysconfig file - it is no longer supported
+- call autoreconf to prepare the snapshot for building
+
+* Wed Apr 10 2013 Tomas Heinrich <theinric at redhat.com> 7.3.10-1
- rebase to 7.3.10
- add a patch to resolve #950088 - ratelimiter segfault, merged upstream
rsyslog-7.3.10-ratelimit-segv.patch
diff --git a/rsyslog.sysconfig b/rsyslog.sysconfig
index 6c89d81..bc65731 100644
--- a/rsyslog.sysconfig
+++ b/rsyslog.sysconfig
@@ -2,4 +2,4 @@
# Syslogd options are deprecated since rsyslog v3.
# If you want to use them, switch to compatibility mode 2 by "-c 2"
# See rsyslogd(8) for more details
-SYSLOGD_OPTIONS="-c 7"
+SYSLOGD_OPTIONS=""
diff --git a/sources b/sources
index 8a9af57..44a4fe5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-003721da25a454022e35b358689634f4 rsyslog-7.3.10.tar.gz
+a2ce253138499a3a7b9c7975dcdf8417 rsyslog-7.3.15-20130604git6e72fa6.tar.gz
More information about the scm-commits
mailing list