From d68758d4c6820936d011d310b2f9d0d310ff00be2e7809bcf34a01de8497c66e Mon Sep 17 00:00:00 2001 From: Andreas Stieger Date: Fri, 16 May 2014 14:06:38 +0000 Subject: [PATCH 1/5] Accepting request 234250 from home:heinemannj66:rsyslog First try for rsyslog v8-stable Revied and maintained by Andreas Stieger OBS-URL: https://build.opensuse.org/request/show/234250 OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=183 --- rsyslog-7.6.3.tar.gz | 3 -- rsyslog-8.2.1.tar.gz | 3 ++ rsyslog.changes | 67 ++++++++++++++++++++++++++++++++++++++++++++ rsyslog.spec | 46 +++++------------------------- 4 files changed, 77 insertions(+), 42 deletions(-) delete mode 100644 rsyslog-7.6.3.tar.gz create mode 100644 rsyslog-8.2.1.tar.gz diff --git a/rsyslog-7.6.3.tar.gz b/rsyslog-7.6.3.tar.gz deleted file mode 100644 index e666703..0000000 --- a/rsyslog-7.6.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:013359035f8b6e5a4328edaffbda1120974accaba36ddc5de66a582fa588f5ec -size 3052448 diff --git a/rsyslog-8.2.1.tar.gz b/rsyslog-8.2.1.tar.gz new file mode 100644 index 0000000..9ad398c --- /dev/null +++ b/rsyslog-8.2.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:193901c359b8228a85dca7a6a2e715ab2b52c18a66ca9f805d4028bedff98196 +size 1944225 diff --git a/rsyslog.changes b/rsyslog.changes index 626541c..754606a 100644 --- a/rsyslog.changes +++ b/rsyslog.changes @@ -1,3 +1,70 @@ +------------------------------------------------------------------- +Wed May 14 06:37:40 UTC 2014 - heinemannj66@gmail.com + +- rsyslog 8.2.1 [v8-stable] + * permits to build against json-c 0.12 + Unfortunately, json-c had an ABI breakage, so this is necessary. Note + that versions prior to 0.12 had security issues (CVE-2013-6370, + CVE-2013-6371) and so it is desirable to link against the new version. + Thanks to Thomas D. for the patch. Note that at least some distros + have fixed the security issue in older versions of json-c, so this + seems to apply mostly when building from sources. + * doc is no longer shipped as part of the rsyslog tarball + Instead, the rsyslog-doc project creates its own tarball. This is the + result of a mailing list discussion after the 8.2.0 release with a + tarball-in-tarball approach, which was disliked by almost all distro + maintainers. This move also has the advantage of de-coupling the + release cycles of both projects a bit (which turned out to be a bit + problematic in practice). + * bugfix: mmutf8fix did not detect two invalid sequences + +------------------------------------------------------------------- +Wed May 14 06:31:47 UTC 2014 - heinemannj66@gmail.com + +- rsyslog 8.2.0 [v8-stable] + This starts a new stable branch based on 8.1.6 plus the following changes: + * we now use doc from the rsyslog-doc project + As such, the ./doc subtree has been removed. Instead, a cache of the + rsyslog-doc project's files has been included in ./rsyslog-doc.tar.gz. + Note that the exact distribution mode for the doc is still under + discussion and may change in future releases. + This was agreed upon on the rsyslog mailing list. For doc issues + and corrections, be sure to work with the rsyslog-doc project. It is + currently hosted at https://github.com/rsyslog/rsyslog-doc + * add support for specifying the liblogging-stdlog channel spec + new global parameter "stdlog.channelspec" + * add "defaultnetstreamdrivercertfile" global variable to set a default + for the certfile. + * omelasticsearch: add new "usehttps" parameter for secured connections + * "action resumed" message now also specifies module type + which makes troubleshooting a bit easier. Note that we cannot output all + the config details (like destination etc) as this would require much more + elaborate code changes, which we at least do not like to do in the + stable version. + * add capability to override GnuTLS path in build process + * better and more consistent action naming, action queues now always + contain the word "queue" after the action name + * bugfix: ompipe did resume itself even when it was still in error + +------------------------------------------------------------------- +Wed May 14 06:27:10 UTC 2014 - heinemannj66@gmail.com + +- rsyslog 7.6.4 [v7-stable] + * removed obsolete --disable-fsstnd configure option + * permits to build against json-c 0.12 + * new omfile default module parameters: + filecreatemode + fileowner + fileownernum + filegroup + filegroupnum + dirowner + dirownernum + dirgroup + dirgroupnum + * bugfix: using UUID property could cause segfault + * bugfix: mmutf8fix did not detect two invalid sequences + ------------------------------------------------------------------- Thu Mar 27 17:53:15 UTC 2014 - andreas.stieger@gmx.de diff --git a/rsyslog.spec b/rsyslog.spec index b886399..460cc64 100644 --- a/rsyslog.spec +++ b/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: 7.6.3 +Version: 8.2.1 Release: 0 %if 0%{?suse_version} >= 1210 %bcond_without systemd @@ -41,7 +41,7 @@ Release: 0 %else %bcond_with journal %endif -%bcond_without gssapi +%bcond_with gssapi %bcond_without gnutls %bcond_without gcrypt %bcond_without guardtime @@ -86,6 +86,8 @@ BuildRequires: pkgconfig(libsystemd-journal) >= 197 Requires(pre): %insserv_prereq %fillup_prereq /etc/init.d/syslog BuildRequires: klogd %endif +BuildRequires: bison +BuildRequires: flex BuildRequires: dos2unix BuildRequires: openssl-devel >= 0.9.7 BuildRequires: pcre-devel @@ -145,13 +147,7 @@ BuildRequires: libnet-devel %endif %if %{with mmnormalize} # mmnormalize support -BuildRequires: pkgconfig(lognorm) >= 0.3.1 -# no support for 1.0.0 in v7.6-stable as per configure -BuildConflicts: pkgconfig(lognorm) >= 1.0.0 -# pull in 0.3.x in Factory -%if 0%{?suse_version} > 1310 -BuildRequires: liblognorm0-devel -%endif +BuildRequires: pkgconfig(lognorm) >= 1.0.0 %if 0%{?suse_version} >= 1210 BuildRequires: pkgconfig(libee) >= 0.4.0 %else @@ -161,14 +157,9 @@ BuildRequires: libee-devel >= 0.4.0 # # mmjsonparse needs liblognorm, # but json check is unconditional -%if 0%{?suse_version} >= 1210 -BuildRequires: pkgconfig(json) >= 0.9 -BuildRequires: pkgconfig(libestr) >= 0.1.9 -%else BuildRequires: libee-devel BuildRequires: libestr-devel >= 0.1.9 BuildRequires: libjson-devel -%endif %if 0%{?suse_version} >= 1220 BuildRequires: pkgconfig(uuid) >= 2.21.0 %else @@ -202,17 +193,6 @@ Its advanced features make it suitable for enterprise-class, encryption protected syslog relay chains while at the same time being very easy to setup for the novice user. -%package doc -Requires: %{name} = %{version} -Summary: Additional documentation for rsyslog -Group: System/Daemons - -%description doc -Rsyslog is an enhanced multi-threaded syslog daemon. See rsyslog -package. - -This package provides additional documentation for rsyslog. - %if %{with diagtools} %package diag-tools @@ -488,7 +468,6 @@ for file in rsyslog-service-prepare; do "%{_sourcedir}/${file}.in" > "${file}" done %endif -dos2unix doc/*.html %build export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -W -Wall -I../grammar -I../../grammar" @@ -587,7 +566,6 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -W -Wall -I../grammar -I../.. --enable-mmsequence \ --enable-mmfields \ --enable-mmpstrucdata \ - --enable-mmrfc5424addhmac \ %if %{with guardtime} --enable-guardtime \ %endif @@ -598,11 +576,7 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -W -Wall -I../grammar -I../.. %endif --enable-usertools \ --disable-static -# -%if ! %{with rst2man} - touch tools/{rscryutil.1,rsgtutil.1} -%endif -# + make %{?_smp_mflags:%{_smp_mflags}} V=1 %install @@ -694,7 +668,7 @@ install -m0600 %{_sourcedir}/rsyslog.sysconfig \ # rm -f doc/Makefile* install -d -m0755 %{buildroot}%{rsyslogdocdir}/ -find ChangeLog README AUTHORS COPYING COPYING.LESSER doc \ +find ChangeLog README AUTHORS COPYING COPYING.LESSER \ \( -type d -exec install -m755 -d %{buildroot}%{rsyslogdocdir}/\{\} \; \) \ -o \( -type f -exec install -m644 \{\} %{buildroot}%{rsyslogdocdir}/\{\} \; \) # @@ -877,7 +851,6 @@ fi %{rsyslog_module_dir_nodeps}/mmcount.so %{rsyslog_module_dir_nodeps}/mmfields.so %{rsyslog_module_dir_nodeps}/mmpstrucdata.so -%{rsyslog_module_dir_nodeps}/mmrfc5424addhmac.so %{rsyslog_module_dir_nodeps}/mmsequence.so %{rsyslog_module_dir_nodeps}/mmutf8fix.so %{rsyslog_module_dir_nodeps}/ommail.so @@ -916,11 +889,6 @@ fi %{_unitdir}/rsyslog.service %endif -%files doc -%defattr(-,root,root) -%dir %{rsyslogdocdir} -%doc %{rsyslogdocdir}/doc - %if %{with diagtools} %files diag-tools From b472c23ce1d09d8cd60f2b3d9acc714d369f28299c86e523b3e4990335f89edd Mon Sep 17 00:00:00 2001 From: Andreas Stieger Date: Sat, 17 May 2014 10:01:46 +0000 Subject: [PATCH 2/5] clean the diff a bit OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=184 --- rsyslog.spec | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/rsyslog.spec b/rsyslog.spec index 460cc64..d578d2f 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -88,7 +88,6 @@ BuildRequires: klogd %endif BuildRequires: bison BuildRequires: flex -BuildRequires: dos2unix BuildRequires: openssl-devel >= 0.9.7 BuildRequires: pcre-devel BuildRequires: pkgconfig @@ -135,11 +134,7 @@ BuildRequires: postgresql-devel %endif %if %{with relp} # RELP support -%if 0%{?suse_version} >= 1210 BuildRequires: pkgconfig(relp) >= 1.2.5 -%else -BuildRequires: librelp-devel >= 1.2.5 -%endif %endif %if %{with udpspoof} # UDP spoof support @@ -147,24 +142,15 @@ BuildRequires: libnet-devel %endif %if %{with mmnormalize} # mmnormalize support -BuildRequires: pkgconfig(lognorm) >= 1.0.0 -%if 0%{?suse_version} >= 1210 BuildRequires: pkgconfig(libee) >= 0.4.0 -%else -BuildRequires: libee-devel >= 0.4.0 -%endif # >= 1210 +BuildRequires: pkgconfig(lognorm) >= 1.0.0 %endif # with mmnormalize # # mmjsonparse needs liblognorm, # but json check is unconditional -BuildRequires: libee-devel -BuildRequires: libestr-devel >= 0.1.9 -BuildRequires: libjson-devel -%if 0%{?suse_version} >= 1220 -BuildRequires: pkgconfig(uuid) >= 2.21.0 -%else -BuildRequires: libuuid-devel -%endif +BuildRequires: pkgconfig(json) >= 0.9 +BuildRequires: pkgconfig(libee) >= 0.4.0 +BuildRequires: pkgconfig(libestr) >= 0.1.9 %if 0%{?suse_version} >= 1200 BuildRequires: python-docutils %bcond_without rst2man From d9687fb3ac6a0e34f581b8b73ca02f4354b9595acc8cc342b84867906976f8b1 Mon Sep 17 00:00:00 2001 From: Andreas Stieger Date: Sat, 17 May 2014 10:01:58 +0000 Subject: [PATCH 3/5] Accepting request 234374 from home:heinemannj66:rsyslog ~ action is deprecated rsyslogd-2307: warning: ~ action is deprecated, consider using the 'stop' statement instead [try http://www.rsyslog.com/e/2307 ] OBS-URL: https://build.opensuse.org/request/show/234374 OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=185 --- rsyslog.conf.in | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/rsyslog.conf.in b/rsyslog.conf.in index 5dddae8..21e037e 100644 --- a/rsyslog.conf.in +++ b/rsyslog.conf.in @@ -75,8 +75,10 @@ if ( \ ($syslogseverity <= 3 /* errors */ ) and not \ ($syslogfacility-text == 'authpriv') \ ) \ -then /dev/tty10 -& |/dev/xconsole +then { + /dev/tty10 + |/dev/xconsole +} # Emergency messages to everyone logged on (wall) @@ -92,8 +94,10 @@ then /dev/tty10 # if ($syslogfacility-text == 'kern') and \ ($msg contains 'IN=' and $msg contains 'OUT=') \ -then -/var/log/firewall -& stop +then { + -/var/log/firewall + stop +} # @@ -106,8 +110,10 @@ then -/var/log/firewall # => up to notice (skip info and debug) if ($programname == 'acpid' or $syslogtag == '[acpid]:') and \ ($syslogseverity <= 5 /* notice */) \ -then -/var/log/acpid -& stop +then { + -/var/log/acpid + stop +} # @@ -115,8 +121,10 @@ then -/var/log/acpid # if ($programname == 'NetworkManager') or \ ($programname startswith 'nm-') \ -then -/var/log/NetworkManager -& stop +then { + -/var/log/NetworkManager + stop +} # From ace43438c6f73ea801d3d0dbeffb8c5f404e53bb469b7a30c23e7be4be7a4e58 Mon Sep 17 00:00:00 2001 From: Andreas Stieger Date: Sat, 17 May 2014 10:03:32 +0000 Subject: [PATCH 4/5] add changelog entry for Joerg's change OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=186 --- rsyslog.changes | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/rsyslog.changes b/rsyslog.changes index 754606a..0670803 100644 --- a/rsyslog.changes +++ b/rsyslog.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat May 17 10:02:12 UTC 2014 - heinemannj66@gmail.com + +- adjust default configuration to address warning: + "rsyslogd-2307: warning: ~ action is deprecated, consider using + the 'stop' statement instead" + ------------------------------------------------------------------- Wed May 14 06:37:40 UTC 2014 - heinemannj66@gmail.com From ba3708efcab6cd9c8991f0837411c1bb5aa5a6fa61eec4eef36f90f511728c34 Mon Sep 17 00:00:00 2001 From: Andreas Stieger Date: Sat, 17 May 2014 10:08:11 +0000 Subject: [PATCH 5/5] add uuid back in OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=187 --- rsyslog.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/rsyslog.spec b/rsyslog.spec index d578d2f..9ddcb94 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -151,6 +151,7 @@ BuildRequires: pkgconfig(lognorm) >= 1.0.0 BuildRequires: pkgconfig(json) >= 0.9 BuildRequires: pkgconfig(libee) >= 0.4.0 BuildRequires: pkgconfig(libestr) >= 0.1.9 +BuildRequires: pkgconfig(uuid) >= 2.21.0 %if 0%{?suse_version} >= 1200 BuildRequires: python-docutils %bcond_without rst2man