From patchwork Fri Jul 10 23:27:57 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Clayton Shotwell X-Patchwork-Id: 493910 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 1493614029D for ; Sat, 11 Jul 2015 09:30:38 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 39F1A32D63; Fri, 10 Jul 2015 23:30:38 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id WoNHUmK2ibJh; Fri, 10 Jul 2015 23:30:28 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id CB6F932D71; Fri, 10 Jul 2015 23:28:29 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 4F6DB1C15E3 for ; Fri, 10 Jul 2015 23:28:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 4C26CA1B34 for ; Fri, 10 Jul 2015 23:28:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9rK2k3Mrn2wO for ; Fri, 10 Jul 2015 23:28:23 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from secvs02.rockwellcollins.com (secvs02.rockwellcollins.com [205.175.225.241]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 26D20A1B1C for ; Fri, 10 Jul 2015 23:28:23 +0000 (UTC) Received: from unknown (HELO crulimr02.rockwellcollins.com) ([131.198.26.125]) by secvs02.rockwellcollins.com with ESMTP; 10 Jul 2015 18:28:23 -0500 X-Received: from thehammer.rockwellcollins.com (unknown [192.168.141.197]) by crulimr02.rockwellcollins.com (Postfix) with ESMTP id 0503A60483; Fri, 10 Jul 2015 18:28:23 -0500 (CDT) From: Clayton Shotwell To: buildroot@buildroot.org Date: Fri, 10 Jul 2015 18:27:57 -0500 Message-Id: <1436570882-56442-12-git-send-email-clayton.shotwell@rockwellcollins.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1436570882-56442-1-git-send-email-clayton.shotwell@rockwellcollins.com> References: <1436570882-56442-1-git-send-email-clayton.shotwell@rockwellcollins.com> Cc: Clayton Shotwell Subject: [Buildroot] [PATCH v8 11/16] rsyslog: fix config file comment style X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Matt Weber The upstream versions of rsyslog (v8 and higher) have this commit to fix the config file comment issue. Carry this patch here until the version is bumped. Signed-off-by: Matthew Weber Signed-off-by: Clayton Shotwell --- Changes v7 -> v8: - Reverted change to make file in favor of using upstream patch (Suggested by Samuel) Changes v6 -> v7: - No changes Changes v5 -> v6: - No changes --- .../rsyslog/0001-fix-config-file-comments.patch | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 package/rsyslog/0001-fix-config-file-comments.patch diff --git a/package/rsyslog/0001-fix-config-file-comments.patch b/package/rsyslog/0001-fix-config-file-comments.patch new file mode 100644 index 0000000..bc5448d --- /dev/null +++ b/package/rsyslog/0001-fix-config-file-comments.patch @@ -0,0 +1,37 @@ +From fe01c9ec4979c78b6a7caf045cab17ba52d4ad08 Mon Sep 17 00:00:00 2001 +From: Brad Barden +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 #### +