From 2a544ec3467b57be472624bfefc1fb9419e23935 Mon Sep 17 00:00:00 2001 From: Radovan Sroka Date: Tue, 18 Apr 2017 14:23:52 +0200 Subject: [PATCH] Added patch for rhbz#1436113 "rsyslog documentation manual page horribly out-of-date" --- rsyslog-8.26.0-doc-update.patch | 27 +++++++++++++++++++++++++++ rsyslog.spec | 3 +++ 2 files changed, 30 insertions(+) create mode 100644 rsyslog-8.26.0-doc-update.patch diff --git a/rsyslog-8.26.0-doc-update.patch b/rsyslog-8.26.0-doc-update.patch new file mode 100644 index 0000000..b0a6dbf --- /dev/null +++ b/rsyslog-8.26.0-doc-update.patch @@ -0,0 +1,27 @@ +From d03793d30c6120fae645daad813b61b4037ba5dd Mon Sep 17 00:00:00 2001 +From: Jiri Vymazal +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 + + diff --git a/rsyslog.spec b/rsyslog.spec index 22d68b8..b8bbb1a 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -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 - 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