Hello community, here is the log from the commit of package rsyslog for openSUSE:Factory checked in at 2012-09-14 12:36:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rsyslog (Old) and /work/SRC/openSUSE:Factory/.rsyslog.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rsyslog", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/rsyslog/rsyslog.changes 2012-07-30 11:45:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rsyslog.new/rsyslog.changes 2012-09-14 12:36:57.000000000 +0200 @@ -1,0 +2,22 @@ +Tue Sep 4 18:32:29 UTC 2012 - [email protected] + +- License is (GPL-3.0+ and Apache-2.0), [bnc#778591] +- The template subpackage was never published, remove obsoletes + +------------------------------------------------------------------- +Fri Aug 31 23:29:43 UTC 2012 - [email protected] + +- update to 6.4.0 [BETA] 2012-08-20 + This is the first version of the 6.4.0 stable branch. + http://www.rsyslog.com/changelog/ +- add rsyslog-6.3.11-glblCheckCnf-no-return-in-nonvoid-function.patch + to fix compiler warning +- rsyslog-6.2.2-link-libestr.patch no longer required +- template functionality was removed upstream + +------------------------------------------------------------------- +Mon Aug 27 20:02:00 UTC 2012 - [email protected] + +- add support for mmnormalize (via liblognorm) and template modules + +------------------------------------------------------------------- Old: ---- rsyslog-6.2.2-link-libestr.patch rsyslog-6.2.2.tar.gz New: ---- rsyslog-6.3.11-glblCheckCnf-no-return-in-nonvoid-function.patch rsyslog-6.4.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rsyslog.spec ++++++ --- /var/tmp/diff_new_pack.k6KWL6/_old 2012-09-14 12:36:58.000000000 +0200 +++ /var/tmp/diff_new_pack.k6KWL6/_new 2012-09-14 12:36:58.000000000 +0200 @@ -18,9 +18,9 @@ Name: rsyslog Summary: The enhanced syslogd for Linux and Unix -License: GPL-3.0+ +License: (GPL-3.0+ and Apache-2.0) Group: System/Daemons -Version: 6.2.2 +Version: 6.4.0 Release: 0 # for setting those bcond_with* configs see # http://lizards.opensuse.org/2008/09/12/conditional-features-aka-use-flags/ @@ -44,6 +44,11 @@ %else %bcond_with relp %endif +%if 0%{?suse_version} >= 1130 +%bcond_without mmnormalize +%else +%bcond_with mmnormalize +%endif %bcond_without gssapi %bcond_without gnutls %bcond_without mysql @@ -94,6 +99,10 @@ # RELP support BuildRequires: librelp-devel %endif +%if %{with mmnormalize} +# mmnormalize support +BuildRequires: liblognorm-devel +%endif # UDP spoof support %if 0%{?suse_version} >= 1140 BuildRequires: libnet-devel @@ -110,15 +119,16 @@ BuildRequires: systemd %endif %endif -BuildRequires: pkgconfig(libee) >= 0.3.1 -BuildRequires: pkgconfig(libestr) >= 0.1.0 +BuildRequires: pkgconfig(libee) >= 0.4.0 +BuildRequires: pkgconfig(libestr) >= 0.1.2 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: http://www.rsyslog.com/files/download/%{name}/%{name}-%{upstream_version}.tar.gz Source1: rsyslog.sysconfig Source2: rsyslog.conf.in Source3: rsyslog.early.conf.in Source4: rsyslog.d.remote.conf.in -Patch0: rsyslog-6.2.2-link-libestr.patch +#PATCH-FIX-OPENSUSE rsyslog-6.3.11-glblCheckCnf-no-return-in-nonvoid-function.patch [email protected] -- fix compiler error +Patch0: rsyslog-6.3.11-glblCheckCnf-no-return-in-nonvoid-function.patch %description Rsyslog is an enhanced multi-threaded syslogd supporting, among others, @@ -256,6 +266,21 @@ %endif +%if %{with mmnormalize} + +%package module-mmnormalize +Requires: %{name} = %{version} +Summary: Contains the mmnormalize support module for syslog +Group: System/Daemons + +%description module-mmnormalize +Rsyslog is an enhanced multi-threaded syslog daemon. See rsyslog +package. + +This module provides log normalizing support. + +%endif + %package module-udpspoof Requires: %{name} = %{version} Summary: UDP spoof support module for syslog @@ -269,7 +294,7 @@ %prep %setup -q -n %{name}-%{upstream_version} -%patch0 -p0 +%patch0 %if %{with systemd} %if 0%{?suse_version} <= 1140 # Bug: https://bugzilla.novell.com/show_bug.cgi?id=656259 @@ -281,7 +306,7 @@ dos2unix doc/*.html %build -export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -W -Wall" +export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -W -Wall -I../grammar -I../../grammar" %if 0%{?suse_version} > 1000 && 0%{?suse_version} < 1030 export CFLAGS="$CFLAGS -fstack-protector" %endif @@ -317,6 +342,9 @@ %if %{with relp} --enable-relp \ %endif +%if %{with mmnormalize} + --enable-mmnormalize \ +%endif %if %{with snmp} --enable-snmp \ %endif @@ -367,6 +395,9 @@ %if %{with relp} imrelp.so omrelp.so \ %endif +%if %{with mmnormalize} + mmnormalize.so \ +%endif %if %{with gnutls} lmnsd_gtls.so \ %endif @@ -640,6 +671,13 @@ %{rsyslog_module_dir_withdeps}/omrelp.so %endif +%if %{with mmnormalize} + +%files module-mmnormalize +%defattr(-,root,root) +%{rsyslog_module_dir_withdeps}/mmnormalize.so +%endif + %files module-udpspoof %defattr(-,root,root) %{rsyslog_module_dir_nodeps}/omudpspoof.so ++++++ rsyslog-6.3.11-glblCheckCnf-no-return-in-nonvoid-function.patch ++++++ Index: runtime/glbl.c =================================================================== --- runtime/glbl.c.orig 2012-06-18 09:13:18.000000000 +0100 +++ runtime/glbl.c 2012-07-01 23:50:00.000000000 +0100 @@ -553,10 +553,12 @@ glblProcessCnf(struct cnfobj *o) cnfparamsPrint(¶mblk, cnfparamvals); } +/* rsRetVal glblCheckCnf() { } +*/ void glblDoneLoadCnf(void) ++++++ rsyslog-6.2.2.tar.gz -> rsyslog-6.4.0.tar.gz ++++++ ++++ 51501 lines of diff (skipped) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
