From a68153c3723b4ff099e0ea1c2d272abc26b1f81e4228f57c991efca13c9df412 Mon Sep 17 00:00:00 2001 From: Andreas Stieger Date: Tue, 19 May 2015 20:02:13 +0000 Subject: [PATCH 1/2] Accepting request 308054 from home:AndreasStieger:branches:Base:System rsyslog 8.10.0 OBS-URL: https://build.opensuse.org/request/show/308054 OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=225 --- rsyslog-8.10.0.tar.gz | 3 +++ rsyslog-8.9.0.tar.gz | 3 --- rsyslog-doc-8.10.0.tar.gz | 3 +++ rsyslog-doc-8.9.0.tar.gz | 3 --- rsyslog.changes | 16 ++++++++++++++++ rsyslog.spec | 36 ++++++++++++++++++++++++++++++++++-- 6 files changed, 56 insertions(+), 8 deletions(-) create mode 100644 rsyslog-8.10.0.tar.gz delete mode 100644 rsyslog-8.9.0.tar.gz create mode 100644 rsyslog-doc-8.10.0.tar.gz delete mode 100644 rsyslog-doc-8.9.0.tar.gz diff --git a/rsyslog-8.10.0.tar.gz b/rsyslog-8.10.0.tar.gz new file mode 100644 index 0000000..d5dde56 --- /dev/null +++ b/rsyslog-8.10.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b92df3f367108219e2fffccd463bf49d75cb8ab3ceaa52e9789f85eace066912 +size 2013205 diff --git a/rsyslog-8.9.0.tar.gz b/rsyslog-8.9.0.tar.gz deleted file mode 100644 index 0d22d6e..0000000 --- a/rsyslog-8.9.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eab00e8e758cd9dd33b3e2cf6af80297d1951dc7db37bd723a6488a35d577adc -size 2022294 diff --git a/rsyslog-doc-8.10.0.tar.gz b/rsyslog-doc-8.10.0.tar.gz new file mode 100644 index 0000000..98c4073 --- /dev/null +++ b/rsyslog-doc-8.10.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:838c8fb56c3e1d46c3066d5b0c542abfdb8b7ed98f141ff8e39d1969a5d1279c +size 4107582 diff --git a/rsyslog-doc-8.9.0.tar.gz b/rsyslog-doc-8.9.0.tar.gz deleted file mode 100644 index aa6c395..0000000 --- a/rsyslog-doc-8.9.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d3c6747439fabbfa976922ca26ffa695778668e757261e00103f2444cf153afa -size 4100654 diff --git a/rsyslog.changes b/rsyslog.changes index 279ae43..ce025ae 100644 --- a/rsyslog.changes +++ b/rsyslog.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Tue May 19 19:23:30 UTC 2015 - astieger@suse.com + +- rsyslog 8.10.0: + * imfile: add capability to process multi-line messages based on regex + * pmrfc3164: add new parameter "detect.yearAfterTimestamp" + * pmrfc3164: add new parameter "permit.squareBracesInHostname" + * supplementary groups are now set when dropping privileges + * imfile: added brace glob expansion to wildcard + * zmq: add the ability for zeromq input and outputs to advertise their + presence on UDP via the zbeacon API. + * added omhttpfs: contributed module for writing to HDFS via HTTP + * bug fixes +- packaging changes: + * build with GnuTLS support again as 3.4.0 is now supported + ------------------------------------------------------------------- Thu Apr 30 12:39:07 UTC 2015 - jengelh@inai.de diff --git a/rsyslog.spec b/rsyslog.spec index 7767e66..839344e 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -1,7 +1,7 @@ # # spec file for package rsyslog # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -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.9.0 +Version: 8.10.0 Release: 0 %if 0%{?suse_version} >= 1210 %bcond_without systemd @@ -55,6 +55,7 @@ Release: 0 %bcond_without diagtools %bcond_without mmnormalize %bcond_without elasticsearch +%bcond_without omhttpfs # TODO: ... doesnt have a proper configure check but wants hdfs.h %bcond_with hdfs %bcond_with mongodb @@ -114,6 +115,9 @@ BuildRequires: liblogging-devel %if %{with elasticsearch} BuildRequires: curl-devel %endif +%if %{with omhttpfs} +BuildRequires: curl-devel >= 7.0.0 +%endif %if %{with hiredis} BuildRequires: hiredis-devel >= 0.10.1 %endif @@ -438,6 +442,21 @@ This module provides support to output to an ElasticSearch database. %endif +%if %{with omhttpfs} + +%package module-omhttpfs +Requires: %{name} = %{version} +Summary: HDFS via HTTP output module for syslog +Group: System/Daemons + +%description module-omhttpfs +Rsyslog is an enhanced multi-threaded syslog daemon. See rsyslog +package. + +This module provides support to output to HDFS via HTTP. + +%endif + %if %{with hdfs} %package module-hdfs @@ -531,6 +550,9 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -W -Wall -I../grammar -I../.. %if %{with elasticsearch} --enable-elasticsearch \ %endif +%if %{with omhttpfs} + --enable-omhttpfs \ +%endif %if %{with gnutls} --enable-gnutls \ %endif @@ -664,6 +686,9 @@ if test "%{rsyslog_module_dir_nodeps}" != "%{rsyslog_module_dir_withdeps}" ; the %endif %if %{with elasticsearch} omelasticsearch.so \ +%endif +%if %{with omhttpfs} + omhttpfs.so \ %endif ; do mv -f %{buildroot}%{rsyslog_module_dir_nodeps}/$mod \ @@ -1050,6 +1075,13 @@ fi %{rsyslog_module_dir_withdeps}/omelasticsearch.so %endif +%if %{with omhttpfs} + +%files module-omhttpfs +%defattr(-,root,root) +%{rsyslog_module_dir_withdeps}/omhttpfs.so +%endif + %if %{with hdfs} %files module-hdfs From 029ceca540798bdbc1efa1d9bcf0366eac921145cc9f5d069b66fffc644acf37 Mon Sep 17 00:00:00 2001 From: Andreas Stieger Date: Tue, 19 May 2015 20:05:06 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=226 --- rsyslog.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rsyslog.spec b/rsyslog.spec index 839344e..cfbcd86 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -44,7 +44,7 @@ Release: 0 %bcond_with journal %endif %bcond_without gssapi -%bcond_with gnutls +%bcond_without gnutls %bcond_without gcrypt %bcond_without guardtime %bcond_without mysql