Add upstream patch to suppress warnings at startup

Package-Manager: portage-2.2.14/cvs/Linux x86_64

4 files changed, 78 insertions, 5 deletions

diff --git a/app-admin/syslog-ng/ChangeLog b/app-admin/syslog-ng/ChangeLog
index 8461a3864f40..eec2b766a36b 100644
--- a/app-admin/syslog-ng/ChangeLog
+++ b/app-admin/syslog-ng/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/syslog-ng
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.408 2014/12/02 09:14:16 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.409 2014/12/04 21:12:51 mr_bones_ Exp $
+
+  04 Dec 2014; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/3.6/syslog-ng-3.6.1-warnings.patch, syslog-ng-3.6.1.ebuild:
+  Add upstream patch to suppress warnings at startup
 
   02 Dec 2014; Michael Sterrett <mr_bones_@gentoo.org> metadata.xml:
   update metadata (bug #531382)
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index c61bf061e324..1550e11470d2 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -11,6 +11,7 @@ AUX 3.5/syslog-ng.conf.gentoo.hardened 4658 SHA256 4dcd2abc551c2f65fb5ec638ac88f
 AUX 3.5/syslog-ng.confd 1496 SHA256 d28c269c8aa2876a389aefdc76b18bcd30eb6653ea1e54a0eb6fb596568643b6 SHA512 792258acfb78caabc2078f0c7c1fb6c61fe0ad91ca45d4901a0257d687e51edbf81ca67a304ead345579855ae2ba0a7fd8b82f1e80e798d4b6c339c31b687afb WHIRLPOOL 3552c19038489743740acf5e77df83d54bb750547055a6c0711a2d6ec9b97fb1389e33142e2fdbc42a9dc84c69b67329657bf1c519492e2c0a2a71a7a8c78444
 AUX 3.5/syslog-ng.rc6 2044 SHA256 9e5ba6d869b99d835cde702a028dae89935c234a14dad79e00a3b5e6379e1f91 SHA512 d67a80f7bd831de440b9f8ec2228d2b19eeca1e89dfd739e0cc7b188c7b0e640c240b263bf6250985c5153f1d822226a579535e029584cb8baadeceb59978b3a WHIRLPOOL ec635d0a2c7ec1ee10adeac2ab11ccbab139e2ceefc589e66848d9fbefb853d6bf6b66977523543a2e441e03845e2527ca532855ff21fbb3adb8cecead90574c
 AUX 3.6/syslog-ng-3.6.1-link-smtp.patch 480 SHA256 b23fc83a0f473c7ddf8b307ad4f6a2dac065cf276c70a05688dbaa566ecd6bd2 SHA512 b1e598b40f0ba66c12578b41dd234285683a5b06977eba80802793ec149dcd7db0f988de7c4991524d3a4e18c8b7f532e03c3997dcb5d20a20e1b1f21f441daf WHIRLPOOL 164a2a9354e013c5353cd987c312f5056967f58d4e06010cfebb816955c64a381458c0777c3a4bab13839909ff032e308af8fbf6be18e056edfd3db4c89e9fba
+AUX 3.6/syslog-ng-3.6.1-warnings.patch 2742 SHA256 930187e498314ac8b7a3346d0cb255ac3a2fc30a0b0399eb6ab75480726fb75d SHA512 a8e7427b8ba63d8fa1c9f66ffcf5ef9f15b504d341c02fdf9fc231e5959464bb982f6a99ba512369e945078d0f08587655ee42ddacede5baaccb28e3e578df51 WHIRLPOOL 1c8535adb207392e0cb4d815e381a5d832a8492b6f0d93ae5f9b77f6ef13db7cea719fb6deded5d1b211519ff393aab55b413ee1078bc757656a445523cbd46e
 AUX 3.6/syslog-ng.conf.gentoo 1332 SHA256 3e51ccba31ca55d7428e7c01373e3c6700936c115aa165f6a1fc9428500c7f9e SHA512 a39b4baee4a60b252a866e423c4cbeffb7f23d8d6446c40169894d5f45c4ef0e98b14e02e63ce1623e9d08a6e1f4037987bfe9453d3bf65f5315c70583a21d08 WHIRLPOOL 0aba4311cc95303aed2fe51332476bd9cabf3a6f57edfb52e28cf4d76db1a45bcfdb0417a42e30f45ad056a2c4c2675170686817d1d5e985d0c7f5352a6e3d0c
 AUX 3.6/syslog-ng.conf.gentoo.fbsd 727 SHA256 7f33666d6cf0772e1afa8a09658cb7799aa0278c20c1adb33018c1bc5bef4bcc SHA512 a571d28d4d8f49e204601526b70cce0690f4a5dab61a33c1cd46af1e4199bb2427fc5a0f69257a3f439197abf1177ae26826b0a4cc7762a4acbd0978275eb9ae WHIRLPOOL 332a13c2b7cd25a8826d424fc4ed782d36f37211aeef714913d3d50f3f26332e02b819f06842fbdbcc9a8149ff2f44a3a26df7a37408bf4a1b8d7f963e449973
 AUX 3.6/syslog-ng.conf.gentoo.hardened 4658 SHA256 e566c3758b71255bc51bd72fa0a4b7d039c448b3f8fb85ff36b7eff541537e6b SHA512 06988cf6192e498b8f8845de2d192d5495f72bb7ac58276252e77a4593cea04cb6e3d18b9d77f9ea2e3fb18680b2d14799b6bf226f1a1ae1ca6c9f97cf5c1812 WHIRLPOOL f42ef0a3bb28dd066f7cc9b7337e5710b91de6141ee6a94ca81f6c9dd230c6baad9b4cf1e4e4ed4c6c2b7ebcb38be5993fec94c0f907dc35f1a88fa69fbb76a2
@@ -26,6 +27,6 @@ DIST syslog-ng_3.4.8.tar.gz 3169372 SHA256 96c2f970fbba4fdd7659b1fee5e476d2858c9
 DIST syslog-ng_3.6.1.tar.gz 3204906 SHA256 a7823679038117eb63aff7b5cd66fc6a0adcef8e85cfaadc94c3cf2b66d774e8 SHA512 2d321b7b7e330019c9c5111d54ebdce273a054f3c8db2770e141a1119233ec6663e5c10a45a313602c7af6b7d7adaf70fe8f535617492837a4f4807bbc73bb1d WHIRLPOOL 1c7716599f71411ee9666b7d1e40cc73e2b67d6872fdc5df3e785bb7815dfd1ce612db30a9b81dcf8edf15a44b577b9ab330c31ad59bed4aa364ae8cf585434b
 EBUILD syslog-ng-3.4.7.ebuild 3448 SHA256 66362e51bac724761c1d558313bd4b66fba6431a5334fe8e1c7989ccf12c977f SHA512 797279853096b6b51c45e63a57493ddb8f12586bc70f9736a4e1ae2c3659a761a432246c7a185d8663e7261a6158071239cc6cf6320c062245463f9dc50a8a92 WHIRLPOOL 636ab2e781b8af18768e494698c16367c892de018799b1dedb9a1c474e4017839a87b06d1aed3ac09bca1b00bebd7c3dc42eed5bf0d7047db6888c9e6bd9e681
 EBUILD syslog-ng-3.4.8.ebuild 3588 SHA256 2bf7cb39b5486e7a6b95834ad87ec19a0d00e93126fc57dd826b6bebc3e9e844 SHA512 32eadb10f65970756a30d852dcb14bf0296425e5c256182956d3cc42b8571c46df3a293da40a9ff730046252a3e078413e11543176c39586d5dbcea970e41939 WHIRLPOOL ebbb2b786c6061017d0a69878fb6811d7b97495f948e5c46d8dff695281b864e6f8a8d177f71c7a75652905f4f511c479e26868ccebb7838c211a8dda8ecfc9d
-EBUILD syslog-ng-3.6.1.ebuild 3849 SHA256 f355bcc820d032b50f458cccedff9e58284387aed87a36caf098ddd0049d441c SHA512 22de5611fca6fbd973080e425efc759060ff2ae369985517cc0ddc37dec21e6240ebb0c7a1aa3f7cbef391d73e1e9cbe9b2428321286135101cd86520ef8befb WHIRLPOOL da76d881404cd819a2abd5e32754f0b02de236f4fe511f02b3892f71592ebf921cf9a5f250dc93cef3138771d2e5ad46493b55c3de6d37f3452c47bbf213ef20
-MISC ChangeLog 57237 SHA256 4c6cfc6a8d6e3e613b8a419373670362f9ce5cc0eb01df9c1bc478215218e541 SHA512 8bd22d2e1c69782c19c6aa781ea7924be26b59028563b11b42b1731a2ca0cb5b666d02f99c04162be4f6bd4261bc42c5a285ff13c9e9feaf26793a5ee38a8bf4 WHIRLPOOL a7a42d829df1056ca8b80989aff11429a5a4a44aba781ab1837724bbc10265db84c9edb2d25e8120b10232c09cbb10081547a05d2676cd2f0fe7422c92c8af99
+EBUILD syslog-ng-3.6.1.ebuild 3903 SHA256 de840a6f8240ee0ff02c63827ee18765dc0ab76f5d716893bc6bbbf879e87226 SHA512 eb98576ba673d662c2ce040523aae30bc016337afdbae0c66e6ec75af33d34b3a8b28f99e454d9437d2ab966aa0d063c89202b311fb53f49c5f26942f610ce2e WHIRLPOOL f3c8e697967eb4e1aca5f620261d9c02e6a1b9e7674a137f86bf06ea2e5d2f99c898f9e11ae073372bf26c2fe0d2bedb17a560901cb84886ca2026af2806fe88
+MISC ChangeLog 57415 SHA256 40a68585bd3c1d3d6f24570a7d49d97343165349346e805044cb29f5c7ca0539 SHA512 7dc0d6e4e592fbd50f3bcd5d5cb60b8d08ef9bdcb1033af1ed6c167bfa16a3c116f7e599b6750c766a3d7cae34675ea385ffe0fee90fd217bd82e0c644eddcbc WHIRLPOOL e789408b1377cb52bc6e3fc26a3e025c218a9e6d0b08fa2677de5070864685d659b766d0ee7e742d13d7b4b521ab777d26b1afb99a26ef1849df75fcb0ea886d
 MISC metadata.xml 792 SHA256 9116bcafb5bc0f8cb3e27e43b474bb387de0467f47fe81f2a2da462cd1438834 SHA512 d81f3f86da8fa594eca1b2224ffe4e07c467f63aee77273b91df7b91256d54653c70b1a3c6543f1a6ce51594f75fdb4245d4ad6766d687275efe7b1811b317a4 WHIRLPOOL efc50cd99fe30a65e83b180794e3d9f58e09f6680c14ea038e09746f414b83c5ba3380d0c6796cca254a4ab81ce676f9dbdefb577abc5a39a26281a8ef9010d2
diff --git a/app-admin/syslog-ng/files/3.6/syslog-ng-3.6.1-warnings.patch b/app-admin/syslog-ng/files/3.6/syslog-ng-3.6.1-warnings.patch
new file mode 100644
index 000000000000..f92e6f289991
--- /dev/null
+++ b/app-admin/syslog-ng/files/3.6/syslog-ng-3.6.1-warnings.patch
@@ -0,0 +1,66 @@
+From 15af882cff915eada828114bdbcf2b7d19595b67 Mon Sep 17 00:00:00 2001
+From: Gergely Nagy <algernon@madhouse-project.org>
+Date: Thu, 4 Dec 2014 10:29:36 +0100
+Subject: [PATCH] hostname: Demote the FQDN warning to a verbose message
+
+On a lot of desktop machines (and in private networks), the hostname
+will not be fully qualified, so the warning is just noise. Demote it to
+a message only displayed in verbose mode.
+
+This fixes the other half of #329.
+
+Reported-by: Peter Czanik <czanik@balabit.hu>
+Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
+---
+ lib/hostname.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/hostname.c b/lib/hostname.c
+index b65d8a1..5af34ec 100644
+--- a/lib/hostname.c
++++ b/lib/hostname.c
+@@ -135,8 +135,8 @@ detect_local_fqdn_hostname(void)
+       hostname = get_local_fqdn_hostname_from_dns();
+       if (!hostname)
+         {
+-          msg_warning("Unable to detect fully qualified hostname for localhost, use_fqdn() will use the short hostname",
+-                     NULL);
++          msg_verbose("Unable to detect fully qualified hostname for localhost, use_fqdn() will use the short hostname",
++                      NULL);
+           hostname = get_local_hostname_from_system();
+         }
+     }
+From 1ddfe7878f1089b20e854f30a6bdb9acb5c6f423 Mon Sep 17 00:00:00 2001
+From: Gergely Nagy <algernon@madhouse-project.org>
+Date: Thu, 4 Dec 2014 10:27:28 +0100
+Subject: [PATCH] system-source: Demote the json-parser() warning to a debug
+ message
+
+Not having the json module installed by default is fairly common, @cim
+messages on the other hand, are not. To make startup less annoying for a
+large number of users, demote the warning about json-parser() missing to
+a debug message.
+
+This addresses one part of #329.
+
+Reported-by: Peter Czanik <czanik@balabit.hu>
+Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
+---
+ modules/system-source/system-source.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/modules/system-source/system-source.c b/modules/system-source/system-source.c
+index b9580e4..7228dd4 100644
+--- a/modules/system-source/system-source.c
++++ b/modules/system-source/system-source.c
+@@ -323,8 +323,8 @@ system_generate_cim_parser(GlobalConfig *cfg, GString *sysblock)
+ 
+   if (!_is_json_parser_available(cfg))
+     {
+-      msg_warning_once("system(): json-parser() is missing, skipping the automatic JSON parsing of messages submitted via syslog(3), Please install the json module",
+-                       NULL);
++      msg_debug("system(): json-parser() is missing, skipping the automatic JSON parsing of messages submitted via syslog(3), Please install the json module",
++                NULL);
+       return;
+     }
+ 
diff --git a/app-admin/syslog-ng/syslog-ng-3.6.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.6.1.ebuild
index 8dd68850b93c..30a83f3b21cb 100644
--- a/app-admin/syslog-ng/syslog-ng-3.6.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.6.1.ebuild,v 1.2 2014/11/10 16:06:09 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.6.1.ebuild,v 1.3 2014/12/04 21:12:51 mr_bones_ Exp $
 
 EAPI=5
 inherit autotools eutils multilib systemd versionator
@@ -38,7 +38,9 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${PN}-${MY_PV}
 
 src_prepare() {
-	epatch "${FILESDIR}/${MY_PV_MM}"/${P}-link-smtp.patch
+	epatch \
+		"${FILESDIR}/${MY_PV_MM}"/${P}-link-smtp.patch \
+		"${FILESDIR}/${MY_PV_MM}"/${P}-warnings.patch
 	eautoreconf
 	cp "${FILESDIR}"/*logrotate*.in "${TMPDIR}" || die
 	cd "${TMPDIR}" || die