Accepting request 132232 from home:AndreasStieger:rsyslog:v6-stable

- 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 - add support for mmnormalize (via liblognorm) and template modules OBS-URL: https://build.opensuse.org/request/show/132232 OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=90
2012-09-04 07:32:45 +00:00
parent 38702a68ef
commit be70551bfc
6 changed files with 81 additions and 22 deletions
--- a/rsyslog-6.2.2-link-libestr.patch
+++ b/rsyslog-6.2.2-link-libestr.patch
@@ -1,13 +0,0 @@
-Index: tools/Makefile.in
-===================================================================
--- tools/Makefile.in.orig	2012-06-13 14:58:20.000000000 +0100
-+++ tools/Makefile.in	2012-07-03 20:51:33.000000000 +0100
-@@ -339,7 +339,7 @@ rsyslogd_SOURCES = \
- 	../dirty.h
- 
- rsyslogd_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
-rsyslogd_LDADD = $(ZLIB_LIBS) $(PTHREADS_LIBS) $(RSRT_LIBS) $(SOL_LIBS) $(LIBEE_LIBS) $(LIBLOGNORM_LIBS)
-+rsyslogd_LDADD = $(ZLIB_LIBS) $(PTHREADS_LIBS) $(RSRT_LIBS) $(SOL_LIBS) $(LIBESTR_LIBS) $(LIBEE_LIBS) $(LIBLOGNORM_LIBS)
- rsyslogd_LDFLAGS = -export-dynamic
- @ENABLE_DIAGTOOLS_TRUE@rsyslog_diag_hostname_SOURCES = gethostn.c
- @ENABLE_DIAGTOOLS_TRUE@zpipe_SOURCES = zpipe.c
--- a/rsyslog-6.2.2.tar.gz
+++ b/rsyslog-6.2.2.tar.gz
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c54b51f9f26d16e623d664c765268f3696721ceddfbee4e76b0dd89f04a6f471
-size 2432745
--- a/rsyslog-6.3.11-glblCheckCnf-no-return-in-nonvoid-function.patch
+++ b/rsyslog-6.3.11-glblCheckCnf-no-return-in-nonvoid-function.patch
@@ -0,0 +1,17 @@
+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(&paramblk, cnfparamvals);
+ }
+ 
+/*
+ rsRetVal
+ glblCheckCnf()
+ {
+ }
+*/
+ 
+ void
+ glblDoneLoadCnf(void)
--- a/rsyslog-6.4.0.tar.gz
+++ b/rsyslog-6.4.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5962bd9a1194e1acda933820ab33fee0b7fb5425904377ed922c90b2fe8027bc
+size 2530470
--- a/rsyslog.changes
+++ b/rsyslog.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Fri Aug 31 23:29:43 UTC 2012 - andreas.stieger@gmx.de
+
+- 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 - andreas.stieger@gmx.de
+
+- add support for mmnormalize (via liblognorm) and template modules
+
 -------------------------------------------------------------------
 Tue Jul  3 19:58:13 UTC 2012 - andreas.stieger@gmx.de

--- a/rsyslog.spec
+++ b/rsyslog.spec
@@ -20,7 +20,7 @@ Name:           rsyslog
 Summary:        The enhanced syslogd for Linux and Unix
 License:        GPL-3.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 @@ Release:        0
 %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 @@ BuildRequires:  libdbi-devel
 # 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,17 @@ BuildRequires:  systemd-devel
 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
+Obsoletes:      %{name}-module-template < %{version}
 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 andreas.stieger@gmx.de -- 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 +267,21 @@ This module provides Reliable Event Logging Protocol support.

 %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 +295,7 @@ This module provides a UDP forwarder that allows changing the sender address.

 %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 +307,7 @@ cp -a /usr/share/doc/packages/systemd/sd-daemon.[ch] runtime/
 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 +343,9 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -W -Wall"
 %if %{with relp}
 	--enable-relp		\
 %endif
+%if %{with mmnormalize}
+	--enable-mmnormalize \
+%endif
 %if %{with snmp}
 	--enable-snmp		\
 %endif
@@ -367,6 +396,9 @@ for mod in  \
 %if %{with relp}
       imrelp.so omrelp.so \
 %endif
+%if %{with mmnormalize}
+       mmnormalize.so  \
+%endif
 %if %{with gnutls}
       lmnsd_gtls.so \
 %endif
@@ -640,6 +672,13 @@ fi
 %{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