Added patch for rhbz#1436113

"rsyslog documentation manual page horribly out-of-date"
This commit is contained in:
Radovan Sroka 2017-04-18 14:23:52 +02:00
parent 1149f8649e
commit 2a544ec346
2 changed files with 30 additions and 0 deletions

View File

@ -0,0 +1,27 @@
From d03793d30c6120fae645daad813b61b4037ba5dd Mon Sep 17 00:00:00 2001
From: Jiri Vymazal <jvymazal@redhat.com>
Date: Thu, 13 Apr 2017 14:33:59 +0200
Subject: [PATCH] updated manpage discard section
---
tools/rsyslog.conf.5 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/rsyslog.conf.5 b/tools/rsyslog.conf.5
index 793562f..2621f24 100644
--- a/tools/rsyslog.conf.5
+++ b/tools/rsyslog.conf.5
@@ -320,11 +320,11 @@ fill your log files. To do that, place the discard actions early in your log fil
This often plays well with property-based filters, giving you great freedom in specifying
what you do not want.
-Discard is just the single tilde character with no further parameters.
+Discard is just the single 'stop' command with no further parameters.
.sp
.B Example:
.RS
-*.* ~ # discards everything.
+*.* stop # discards everything.
.RE

View File

@ -56,6 +56,7 @@ Obsoletes: sysklogd < 1.5-11
# tweak the upstream service file to honour configuration from /etc/sysconfig/rsyslog
Patch0: rsyslog-8.8.0-sd-service.patch
Patch1: rsyslog-8.23.0-msg_c_nonoverwrite_merge.patch
Patch2: rsyslog-8.26.0-doc-update.patch
%package crypto
Summary: Encryption support
@ -276,6 +277,7 @@ mv build doc
%setup -q -D
%patch0 -p1
%patch1 -p1
%patch2 -p1
autoreconf -iv
@ -535,6 +537,7 @@ done
%changelog
* Tue Apr 18 2017 Radovan Sroka <rsroka@redhat.com> - 8.26.0-1
- rebase to 8.26.0
- added doc patch rhbz#1436113
- dropped chdir patch, https://github.com/rsyslog/rsyslog/pull/1420
- moved dependency libgcrypt to rsyslog core