Accepting request 76227 from Base:System

- drop modules imtemplate and omtemplate, the 2 modules are base
  templates for people who want to develop their own modules.

- enabled a few more modules which dont pull extra dependencies:
  impstats, pmcisconames, pmaixforwardedfrom, pmsnare, pmrfc3164sd,
  omruleset, mmsnmptrapd

- guard the file list entry for rsyslog.service with
  if {with systemd}. Please keep the package working on older
  distros.

- upstream asked to change the syntax in the default config files
  to the new syntax:
  old: *.* * # (write to all)
  new: *.* :omusrmsg:*
  old: *.* $channel
  new: *.* :omfile:$channel
  from what i can see we are only affected with:
  old: *.emerg *
  new: *.emerg :omusrmsg:*

- Updated to 5.8.3  [V5-stable] (forwarded request 76171 from darix)

OBS-URL: https://build.opensuse.org/request/show/76227
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rsyslog?expand=0&rev=38

rsyslog-5.8.2.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:566ae1593cfd02afba3d6b456d1b5988e30fed057d42eccb20cc0d537be897d0
-size 1918257

rsyslog-5.8.3.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5f2839d6f75e266247278376697b0e61758e08ac5a4a7c47e8a9e2b647b5e01a
+size 1920450

rsyslog.changes

@@ -1,3 +1,52 @@
+-------------------------------------------------------------------
+Wed Jul 13 11:10:15 UTC 2011 - mrueckert@suse.com
+
+- drop modules imtemplate and omtemplate, the 2 modules are base
+  templates for people who want to develop their own modules.
+
+-------------------------------------------------------------------
+Tue Jul 12 13:35:54 UTC 2011 - mrueckert@suse.com
+
+- enabled a few more modules which dont pull extra dependencies:
+  impstats, pmcisconames, pmaixforwardedfrom, pmsnare, pmrfc3164sd,
+  omruleset, mmsnmptrapd
+
+-------------------------------------------------------------------
+Tue Jul 12 13:11:04 UTC 2011 - mrueckert@suse.com
+
+- guard the file list entry for rsyslog.service with
+  if {with systemd}. Please keep the package working on older
+  distros.
+
+-------------------------------------------------------------------
+Tue Jul 12 12:59:13 UTC 2011 - mrueckert@suse.com
+
+- upstream asked to change the syntax in the default config files
+  to the new syntax:
+  old: *.* * # (write to all)
+  new: *.* :omusrmsg:*
+
+  old: *.* $channel
+  new: *.* :omfile:$channel
+
+  from what i can see we are only affected with:
+  old: *.emerg *
+  new: *.emerg :omusrmsg:*
+
+-------------------------------------------------------------------
+Tue Jul 12 12:52:58 UTC 2011 - mrueckert@suse.com
+
+- Updated to 5.8.3  [V5-stable]
+  - systemd support: set stdout/stderr to null - thx to Lennart for
+    the patch
+  - added support for the ":omusrmsg:" syntax in configuring user
+    messages
+  - added support for the ":omfile:" syntax in configuring user
+    messages Note: previous outchannel syntax will generate a
+    warning message. This may be surprising to some users, but it
+    is quite urgent to alert them of the new syntax as v6 can no
+    longer support the previous one.
+
 -------------------------------------------------------------------
 Tue Jun 21 13:50:42 UTC 2011 - mt@suse.de
 

rsyslog.conf.in

@@ -69,7 +69,7 @@ then	/dev/tty10
 
 
 # Emergency messages to everyone logged on (wall)
-*.emerg					 *
+*.emerg					 :omusrmsg:*
 
 # enable this, if you want that root is informed
 # immediately, e.g. of logins

rsyslog.early.conf.in

@@ -34,7 +34,7 @@ $IncludeConfig ADDITIONAL_SOCKETS
 #
 kern.warning;*.err;authpriv.none	 /dev/tty10;RSYSLOG_TraditionalFileFormat
 kern.warning;*.err;authpriv.none	|/dev/xconsole;RSYSLOG_TraditionalFileFormat
-*.emerg					 *
+*.emerg					 :omusrmsg:*
 
 # enable this, if you want that root is informed
 # immediately, e.g. of logins

rsyslog.spec

@@ -20,7 +20,7 @@
 
 Name:           rsyslog
 Summary:        The enhanced syslogd for Linux and Unix
-Version:        5.8.2
+Version:        5.8.3
 Release:        1
 # for setting those bcond_with* configs see
 # http://lizards.opensuse.org/2008/09/12/conditional-features-aka-use-flags/
@@ -318,14 +318,19 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -W -Wall"
 	--enable-mail		\
 	--enable-imfile		\
 	--enable-imptcp		\
-	--enable-imtemplate	\
+	--enable-impstats	\
 	--enable-omprog		\
 	--enable-omuxsock	\
-	--enable-omtemplate	\
 	--enable-omudpspoof	\
 	--enable-omstdout	\
 	--enable-pmlastmsg	\
 	--enable-diagtools	\
+	--enable-pmcisconames	\
+	--enable-pmaixforwardedfrom	\
+	--enable-pmsnare	\
+	--enable-pmrfc3164sd	\
+	--enable-omruleset	\
+	--enable-mmsnmptrapd	\
 	--disable-static
 
 make %{?_smp_mflags:%{_smp_mflags}} V=1
@@ -515,13 +520,14 @@ fi
 %config(noreplace) %attr(600,root,root) %{_sysconfdir}/rsyslog.early.conf
 %config(noreplace) %attr(600,root,root) %{_sysconfdir}/rsyslog.d/remote.conf
 %{_sbindir}/rsyslogd
+%if %{with systemd}
 /lib/systemd/system/rsyslog.service
+%endif
 %dir %{rsyslog_module_dir_nodeps}
 %{rsyslog_module_dir_nodeps}/imfile.so
 %{rsyslog_module_dir_nodeps}/imklog.so
 %{rsyslog_module_dir_nodeps}/immark.so
 %{rsyslog_module_dir_nodeps}/imtcp.so
-%{rsyslog_module_dir_nodeps}/imtemplate.so
 %{rsyslog_module_dir_nodeps}/imudp.so
 %{rsyslog_module_dir_nodeps}/imuxsock.so
 %{rsyslog_module_dir_nodeps}/lmnet.so
@@ -537,10 +543,15 @@ fi
 %{rsyslog_module_dir_nodeps}/omprog.so
 %{rsyslog_module_dir_nodeps}/omruleset.so
 %{rsyslog_module_dir_nodeps}/omstdout.so
-%{rsyslog_module_dir_nodeps}/omtemplate.so
 %{rsyslog_module_dir_nodeps}/omtesting.so
 %{rsyslog_module_dir_nodeps}/omuxsock.so
 %{rsyslog_module_dir_nodeps}/pmlastmsg.so
+%{rsyslog_module_dir_nodeps}/impstats.so
+%{rsyslog_module_dir_nodeps}/mmsnmptrapd.so
+%{rsyslog_module_dir_nodeps}/pmaixforwardedfrom.so
+%{rsyslog_module_dir_nodeps}/pmcisconames.so
+%{rsyslog_module_dir_nodeps}/pmrfc3164sd.so
+%{rsyslog_module_dir_nodeps}/pmsnare.so
 %dir %{rsyslog_module_dir_withdeps}
 %{_mandir}/man5/rsyslog.conf.5*
 %{_mandir}/man8/rsyslogd.8*