diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2015-07-13 00:45:07 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2015-07-13 00:45:07 +0200 |
| commit | 6a9095a39a72926e622285ba21d93dd48d580f0a (patch) | |
| tree | 5bc6c521bddbdb3bea638636d02af4f5b8d88b03 /package/rsyslog | |
| parent | c60766a3727a21e90e12d4c86a17d7565302de6e (diff) | |
Revert "rsyslog: fix config file comment style"
This reverts commit d42f0f96aa13bc160bdfeb40ca75f53adb7af64e, which
breaks the build since the patch being added by this commit is in fact
already part of the 8.9.0 rsyslog release we are using.
Indeed, in the rsyslog repository:
$ git tag --contains fe01c9ec4979c78b6a7caf045cab17ba52d4ad08
[...]
v8.10.0
v8.10.0.ad1
v8.11.0
v8.7.0
v8.8.0
v8.8.0.ad1
v8.9.0
v8.9.0.ad1
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/rsyslog')
| -rw-r--r-- | package/rsyslog/0001-fix-config-file-comments.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/package/rsyslog/0001-fix-config-file-comments.patch b/package/rsyslog/0001-fix-config-file-comments.patch deleted file mode 100644 index bc5448dbf..000000000 --- a/package/rsyslog/0001-fix-config-file-comments.patch +++ /dev/null @@ -1,37 +0,0 @@ -From fe01c9ec4979c78b6a7caf045cab17ba52d4ad08 Mon Sep 17 00:00:00 2001 -From: Brad Barden <brad+github@mifflinet.net> -Date: Sun, 11 Jan 2015 17:52:11 -0600 -Subject: [PATCH] bugfix header in platform/redhat/rsyslog.conf - -the "For more information" doc path includes the string "*/", breaking c-style comment format. fixes #202. ---- - platform/redhat/rsyslog.conf | 19 +++++++++---------- - 1 file changed, 9 insertions(+), 10 deletions(-) - -diff --git a/platform/redhat/rsyslog.conf b/platform/redhat/rsyslog.conf -index 340874d..3df6c7e 100644 ---- a/platform/redhat/rsyslog.conf -+++ b/platform/redhat/rsyslog.conf -@@ -1,13 +1,12 @@ --/* rsyslog configuration file (for Red Hat-based systems) -- * note that most of this config file uses old-style format, -- * because it is well-known AND quite suitable for simple cases -- * like we have with the default config. For more advanced -- * things, RainerScript configuration is suggested. -- * -- * For more information see /usr/share/doc/rsyslog-*/rsyslog_conf.html -- * or latest version online at http://www.rsyslog.com/doc/rsyslog_conf.html -- * If you experience problems, see http://www.rsyslog.com/doc/troubleshoot.html -- */ -+# rsyslog configuration file (for Red Hat-based systems) -+# note that most of this config file uses old-style format, -+# because it is well-known AND quite suitable for simple cases -+# like we have with the default config. For more advanced -+# things, RainerScript configuration is suggested. -+# -+# For more information see /usr/share/doc/rsyslog-*/rsyslog_conf.html -+# or latest version online at http://www.rsyslog.com/doc/rsyslog_conf.html -+# If you experience problems, see http://www.rsyslog.com/doc/troubleshoot.html - - #### MODULES #### - |