add upstream patch for to fix memory leak

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64

4 files changed, 29 insertions, 14 deletions

diff --git a/app-admin/syslog-ng/ChangeLog b/app-admin/syslog-ng/ChangeLog
index ff98590fd582..216324e3a9a0 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.377 2014/03/26 21:50:26 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.378 2014/03/28 02:00:44 mr_bones_ Exp $
+
+  28 Mar 2014; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/3.5/syslog-ng-3.5.4.1-memleak.patch, syslog-ng-3.5.4.1.ebuild:
+  add upstream patch for to fix memory leak
 
   26 Mar 2014; Markus Meier <maekke@gentoo.org> syslog-ng-3.4.7.ebuild:
   arm stable, bug #504348
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index bd5cc0fffb85..8e67144eba6e 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX 3.4/syslog-ng-3.4.2-autotools.patch 1313 SHA256 20b6fc12f119d548536435ad7c5e166488443eeebe8ee08e30adefa6038aafa3 SHA512 c5b84bc32c9b019452b8b3f369dc4689e40b59dc392e448412e14730679d452d4323d70ae73cc6fd126a44df6331c18d2168f05675a399e2ba868115944880ed WHIRLPOOL f7bc249b6ea28db74661b6682ff3c377b80ffeaa28412bfa378686f435a617d972a81d8dfc9382f2f8c44062ee35fc9e3217ef40a04d55f1bcf6578fb88e2c63
 AUX 3.4/syslog-ng-3.4.2-compile.patch 239 SHA256 1400220d00e35261afdb93e9f199e5527ad8f6cd14f0b1fc7f89e6668b09979a SHA512 f8ec051d4fecb88f26279bb510ff892e93b9a211b5bd9312f734846a3108a6645d1de355c5d3aadb6fddd8e01bba40fd6489a6bf8f6a2f73466016b24bcbe930 WHIRLPOOL e7550d9def8c94e81eb9b7501d79b79acaa6fe6aeada4cf0840b72e65520a529010c8aa36df6221639226f2a53ee78f28993219364b2d500a49daa0261b78f55
 AUX 3.4/syslog-ng.conf.gentoo 1332 SHA256 949c0f2a9f4351be23249ba1b7763b5d4ff9ab4907c1211cc3e92b6bc9705c8e SHA512 bdbcfa27368ed75daac153d91c50555bea892f492639a2448e47a6f38a9b84808eedd35db09347a385c70725ab8349798f624aa5e2f730fb99b2986d05afb1a4 WHIRLPOOL d639db780aa07438e1a33b85cf3f388782f84fe884b95303605ccd58bf95232e5e013c5d491b44034e7d90121064b9c749d91c2fa6352ccb44db90d12d792d82
@@ -8,6 +5,7 @@ AUX 3.4/syslog-ng.conf.gentoo.fbsd 727 SHA256 d45f4befbf3f098a4a3e7bff80a6536931
 AUX 3.4/syslog-ng.conf.gentoo.hardened 4658 SHA256 5efb3976249fd44d01af2c287f35e9c3a61e74909b4f7d9f63dabc32eb4e3f74 SHA512 d326832592b016b3fec1119ff90c4898fc4351bbeccff32295712229e955b72ea80a282cbcb527862371c5899446ee4747f95fe898e36338c47683121598140e WHIRLPOOL e1eb845712cbff8a3a3f656689b1c8a1573882cc9850211bba22eb5cf46adc2337799fa4992d17e5e32a67ea7ae4f7ff65034dcb1606a6ccb82f565d1ef80098
 AUX 3.4/syslog-ng.confd 1496 SHA256 d28c269c8aa2876a389aefdc76b18bcd30eb6653ea1e54a0eb6fb596568643b6 SHA512 792258acfb78caabc2078f0c7c1fb6c61fe0ad91ca45d4901a0257d687e51edbf81ca67a304ead345579855ae2ba0a7fd8b82f1e80e798d4b6c339c31b687afb WHIRLPOOL 3552c19038489743740acf5e77df83d54bb750547055a6c0711a2d6ec9b97fb1389e33142e2fdbc42a9dc84c69b67329657bf1c519492e2c0a2a71a7a8c78444
 AUX 3.4/syslog-ng.rc6 2052 SHA256 f2a180881e061963b1cb85aef0b06e54141158009ca8770d6e7a4832a451052f SHA512 f90e205391c716dc19ceae02b410e134a3763426dc7df22058d2624f43f474139e7771f7e38fb1aa3072de7da5e2cac91fc8270c8ae2967c392d56a9bd3bec96 WHIRLPOOL 2d448a7dfea10f25e82954adfe4b77c80a1017a89a3f701384074d5daced1ff44e81d877e71063ee20a230565b64b199b03541bb0d10065634f3130a05122331
+AUX 3.5/syslog-ng-3.5.4.1-memleak.patch 677 SHA256 9b27041b62a2cbc108da801359fd1e1c699ba9dc5fe9842632b9267d9fcdf250 SHA512 1284a73e6625f872b5b8e447612f1ac43787139ba3b202bfac344bc9d1df7ddf8508bef421d8bb3cb891248bc57f927647deb6c42af19ce9760262029176771f WHIRLPOOL 708c5fce3a7d6fc36fac137b973930c7ee71ac68500279a2972ef8df56aa1bf128066395ddf3655904ef9bd62de78ae04c16599db022221c3a017cc83c3b8297
 AUX 3.5/syslog-ng.conf.gentoo 1332 SHA256 2e1467150cf65fcf1c7a92736a3ec89562f5ab3168b540e157ffca07951b7c10 SHA512 8b81920a0565d9b5cba3e51090865f8e7515429408c561e7d9999dc9268ebeafaff8dd0aa76f86022f3aac8bf257136a1c31ae392ed67630b8a8112919df7a14 WHIRLPOOL 9d3dddbc82843606c480c82de1661c2a837bff344a1425e4acac2056a5e96485ad2c0eac6ea6c5ccd9ccacf7a5cda726b4af7b1ecf8ee4c9cea00dc1c0c11dec
 AUX 3.5/syslog-ng.conf.gentoo.fbsd 727 SHA256 ac6c88f93137de23416dc2b418a1c06a95ba34c5c313bc722ded923737e5cc69 SHA512 61fe1ef88c0347a13d79efd3ee269bcd5a2f8c78eeda24ed5f4a2e4e1795b50099b950b3776e9742c8f17855895cae572f2152aeffde41907f877a4114dc1a8f WHIRLPOOL 9690056468ed0a1ce14c619a219c745abefcb9e3e6e950e84a52ad9d01f31c96afe5f0808dd5cc50b5e9a477fb20dade816960a72b9dca95f7f9acb4164c7d0f
 AUX 3.5/syslog-ng.conf.gentoo.hardened 4658 SHA256 4dcd2abc551c2f65fb5ec638ac88fefd56ced339b855c0ba49b38e3ed86b8a94 SHA512 630bb802836caf3b83065ddcbcf8848904e3c2c792a58e02fee740adabbb462bff399c6c7c96451ead0bcc0c5ae1f8e65afeb364e6d267d25281bb51922bbcfc WHIRLPOOL 968c155b857249523c84649078264fd74a58b7916b05171ce8db3807c928bd64d32c54d11629c4189318349e3d7d349d40fe55d0eb0307af559418d1a4cfc5c1
@@ -24,14 +22,7 @@ DIST syslog-ng_3.5.4.1.tar.gz 3034040 SHA256 92c6969e4172b4fd32390f80043b4de7b11
 DIST syslog-ng_3.5.4.tar.gz 3035106 SHA256 7228dab0e5e74ee74a7ac66e21a75dcb2510917e7e4a5500b9d3b42dc5033211 SHA512 320b6bf4476e32b9f1af8297c1dbdc785963bfa691af4b76cdc61b6c0ae9cd2d9d5a3d8589ee9ed35dedad411e863a1e4ac9a96a79c7fd28d567a83c7781a44e WHIRLPOOL 6d969e557eefff459caaf98e32b5a0771a50ce6404af789a68119b39898f35b37fb3bc6bee297387a318f3486931d175f9883486bc1916a7b8df10c0bbad3ed6
 EBUILD syslog-ng-3.4.2.ebuild 3199 SHA256 930c19172b7b4c0f7de06045d0aadbce62ac1a9e7fc8a124fdf5d9d13c4eac24 SHA512 e6995739545e474ccaa5e35f3de0acd999d4afa9dc4b0b3e766df7e32010433da17e6ecf92b99752b0a16c53ca7623709836e556b64331503ccc39e23cbd3521 WHIRLPOOL 0ebf2d8beeb3d78a95dec457a9a9bcd24f929d4257ae6a30e8b1bb560cba96c62dc71392f83df4cbf7b077cd58adbbd235e7c93ade1472e190908698a3477ee2
 EBUILD syslog-ng-3.4.7.ebuild 3450 SHA256 00db7548e4ec777459532123688885d41b21eb6b653895b537660820995fb57b SHA512 c556bf27ed687babe5573813397d608ea7a4729344a8e3b05b4dc87f8fe65b05caca1b7632b579891a98cddf6a085a92b1d8747bb685154e71a1eab175fdff88 WHIRLPOOL 37f301d15c9de4a534f4379fdc2c8075bfebe71736bcbfe00b3534d241ffbded903e344f4caa2f03ac2bc0e12c443954cb3978800f9f969f37240d8bfaeca541
-EBUILD syslog-ng-3.5.4.1.ebuild 3528 SHA256 acc5f014a66f3b761019b4a10e52a89eff09340845cd210ac2b03c1bab4cfdbc SHA512 c524150bb84b94d76fff1eb7b2320ec33f9940a26dd59d1785944cb1a21b90b7421f4f6bea820796c09c265b48889319800e4ff5f6bb5ccc8f0dc24c04baa95d WHIRLPOOL 3017eb77cf97f6e5a66bc022fea8085ff243e8587f136c684f1400f333e6d12aa45becbdbac7b993160d3ce9f8e692c795360eaef8f9a4e4faea16f58e790214
+EBUILD syslog-ng-3.5.4.1.ebuild 3581 SHA256 56c58029376f6e9de02e308bd3b8509c9d62ba3a95a2dc5bc685b55d04a046ad SHA512 105ed15389fda40fcfb99fd89ec5d37b9b983a5ad08dad23b43d578cd8d8bdebf020b322dcca50154f9188ea16932d6156adcf4e88de0fd54c8aab1620cc3118 WHIRLPOOL 56feed10f98c726d69d9abf0de4469f1736831ab2ecf137c8409c84580e7dc13ba0db951768992925c110acbf5eada3b3281da577750fba898ed5b5a4c574caa
 EBUILD syslog-ng-3.5.4.ebuild 3455 SHA256 e9314c80d75428df369884570446a7dd38298053aa5a1c500ea1e37c9e3b3df7 SHA512 6882bb7495ff3118f1aaddbfd0b0f2ca2ee9d7f28b023194ab7d8704f9d37ddf075536cd051a9b80a2a392b266c5e1e0419f2daa06d250040fc1966f32f1b5d7 WHIRLPOOL 88db996eba3da900869acdf55af9600a12f3b6a53414254032d78ed5b43e30042b5bb7a4387d2e4af9c8cee6cd181fefd95372c26fe5e9cb8d53ab1bf52ba9e4
-MISC ChangeLog 53229 SHA256 70a5cb3e94afe868f360028ffcad71512788a1e99a7001773f039ab203f3b379 SHA512 a04d57f45f62b4b30ad0fc82f06ccbdb2beb47a36851d24d38c1dd1e5db592574ce3de45f6b74e5942b2592fa7ae81216762b3179a9b30e27e0b9ef5cdf9306d WHIRLPOOL 46377d046d5871c5e22fe3e29c00c8bdf20939ed28b192a8a9e6995d890d4f298915fc618d42afc08ddcf211a770bcbc3d43932d24f9689023a839aa619e0ee5
+MISC ChangeLog 53404 SHA256 799674fbdeb30ddf9f02384ba0fd29d138b25a1d4466ea4c3edabe92b4610c53 SHA512 c52ca1ab7a0e8cff1fb301d6790ce796672b1672b50c525337bf10ca462ed51832f9618a873e697583a14a9b498ea34b0cb1f6b49514472f54ef912a0bf8ffde WHIRLPOOL 0cb06dca7463454392c23ed31b0d26445f103edde0e2d953c4096eeac1a818d5e270deec0f36db41a7c4579874f24968c86bff33082d75c852bd50d3fbc10aee
 MISC metadata.xml 561 SHA256 cc93ce76904abc1f2a13151577282e3f676b1589574f614b71d9df9bcd005aee SHA512 b043ebae39aff0868be738d94a9e741703337ca0c6bbd57f58a98e559c29b306d6306050090e02959b5681ae51f629103e40378e40b2a301b4fca2d0f799f39e WHIRLPOOL 82bf6f04d2309e64fa581fa2e616cbd2b8d0ab26e511645fee2d8c29753aa2d371a55e803cfea4e0eee048cbf161052bc3dacc6bc03f5e475f5650b5b2318da8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iEYEAREIAAYFAlMzTXMACgkQkKaRLQcq0GLiawCgn+qJF5v3WbJnIa8Y12W9duJK
-o28AoKgQFGFwGDtyuOSCAEMe1xovbR3D
-=jUDk
------END PGP SIGNATURE-----
diff --git a/app-admin/syslog-ng/files/3.5/syslog-ng-3.5.4.1-memleak.patch b/app-admin/syslog-ng/files/3.5/syslog-ng-3.5.4.1-memleak.patch
new file mode 100644
index 000000000000..566df72de7b0
--- /dev/null
+++ b/app-admin/syslog-ng/files/3.5/syslog-ng-3.5.4.1-memleak.patch
@@ -0,0 +1,19 @@
+From 6a6a442585fcdf534cc448706a1be2d460862bdf Mon Sep 17 00:00:00 2001
+From: Viktor Tusa <tusa@balabit.hu>
+Date: Wed, 26 Mar 2014 17:05:08 +0100
+Subject: [PATCH] value-pairs: Fixed a memory leak in value-pairs.
+
+We should free the elements of the GPtrArray too, not just the GPtrArray.
+
+Signed-off-by: Viktor Tusa <tusa@balabit.hu>
+
+--- lib/value-pairs.c.orig	2014-03-27 18:16:45.492827781 -0400
++++ lib/value-pairs.c	2014-03-27 18:16:56.785426734 -0400
+@@ -651,6 +651,7 @@
+      NULL), so treat that normally. */
+   key = g_strdup(g_ptr_array_index(tokens, tokens->len - 1));
+ 
++  g_ptr_array_foreach(tokens, g_free, NULL);
+   g_ptr_array_free(tokens, TRUE);
+ 
+   return key;
diff --git a/app-admin/syslog-ng/syslog-ng-3.5.4.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.5.4.1.ebuild
index 58fe5ea2a8c0..93c41e633446 100644
--- a/app-admin/syslog-ng/syslog-ng-3.5.4.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.5.4.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.5.4.1.ebuild,v 1.1 2014/03/13 23:16:29 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.5.4.1.ebuild,v 1.2 2014/03/28 02:00:44 mr_bones_ Exp $
 
 EAPI=5
 inherit eutils multilib systemd versionator
@@ -37,6 +37,7 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${PN}-${MY_PV}
 
 src_prepare() {
+	epatch "${FILESDIR}/${MY_PV_MM}/${P}-memleak.patch"
 	cp "${FILESDIR}"/*logrotate*.in "${TMPDIR}" || die
 	cd "${TMPDIR}" || die