add upstream patch for memory leak caused by messages that couldn't be flushed right away.

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

4 files changed, 26 insertions, 5 deletions

diff --git a/app-admin/syslog-ng/ChangeLog b/app-admin/syslog-ng/ChangeLog
index 52c3848f6790..0ffaf4aa3535 100644
--- a/app-admin/syslog-ng/ChangeLog
+++ b/app-admin/syslog-ng/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/syslog-ng
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.322 2012/03/21 20:54:04 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.323 2012/03/22 15:13:04 mr_bones_ Exp $
+
+  22 Mar 2012; Michael Sterrett <mr_bones_@gentoo.org> syslog-ng-3.3.4.ebuild,
+  +files/syslog-ng-3.3.4-memleak.patch:
+  add upstream patch for memory leak caused by messages that couldn't be
+  flushed right away.
 
   21 Mar 2012; Michael Sterrett <mr_bones_@gentoo.org> syslog-ng-3.3.4.ebuild:
   adjust for newer glib static lib building (bug #409217)
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index 52262b4ca179..8094963aad0f 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -1,4 +1,5 @@
 AUX syslog-ng-3.3.4-compile.patch 250 RMD160 15a3e35ff6dc57df6315a4a96d4b399244c2cbdb SHA1 3e1036742ee63d3066cd4381dfc354a6d1b040b3 SHA256 831476d524a2fb32fe944a960f5adb4f97fde6ded8d84eb1ad9ef00b5f1a9354
+AUX syslog-ng-3.3.4-memleak.patch 396 RMD160 3c791d9471467ed95861d5789f824205a9fd7652 SHA1 2d6978b065dd5980a586801b0c168ec9ae81230c SHA256 3f686fcea0187bda3a76ca437e65e9c96b19174de7187de5ef1f82cfa4471ae5
 AUX syslog-ng.conf.gentoo.3.2 1314 RMD160 d8d12cbc02877baf4449590586798133d9914911 SHA1 af084e744864dcc292741df2cc701d1f8a982e00 SHA256 91221fe7aeb6dff126dd878f541366d00918a278f46348f6f763ad2cbc01ea19
 AUX syslog-ng.conf.gentoo.3.3 1330 RMD160 0b55e8910274e898e7244fc6594bee74ef559943 SHA1 b36b047d73d9a0084019fcddac7fb7a354b01bdc SHA256 e0ff88d28e0fa9b5b2b96b13df2f14f1957996959a95f7ec6135b51b242a98cd
 AUX syslog-ng.conf.gentoo.fbsd.3.2 689 RMD160 001482d7e90b44896d374f4a1049ece9541a8f2e SHA1 4be46d2f9461c45e743e10e69a4252ce599deee5 SHA256 7249cb13fff50e2695a427fe4dc1285dad6838f576304cb6ddde0c53ff9814ad
@@ -15,6 +16,6 @@ DIST syslog-ng_3.2.5.tar.gz 1448844 RMD160 dcaf5bc623d163f36a8b7d76cfbaa09142a5a
 DIST syslog-ng_3.3.4.tar.gz 2475254 RMD160 234a94e89a47f0520236c8a9a3d586d609a50476 SHA1 3437a50af027f281747087ab47a45aa5fbabbf14 SHA256 a7045694cd079a8efcfd73ca45cb7576f005ba26e6c83ccdfaf3cf81fa4e58aa
 EBUILD syslog-ng-3.2.4.ebuild 3293 RMD160 6968178b4bc2d3d80e4e322a466bc3875cd04fc3 SHA1 e667079278b7a643518736171939b486b9c4e680 SHA256 0071029876f2a2a7029a7e356ad2f7f28de805dfe127d22f855a0a04feb7b985
 EBUILD syslog-ng-3.2.5.ebuild 2853 RMD160 d9966e53d279238a6a9375b4776d927d465578d4 SHA1 1b7abe82fbb27ef65118d025f07c2c4564378a0c SHA256 befb301abeadd1fc9aec194bb58a02fb9dab3e47f1e29054cb735c400451c501
-EBUILD syslog-ng-3.3.4.ebuild 3691 RMD160 9c324777e72a6efad9c3becff23d94a759838234 SHA1 4e609458f704b0971c04485769c9e17d07a7d227 SHA256 4b90b350a3abb7328cb1ed52bcb2dc586dd15e9e62dbc31ff88c9ebb54a6a9ff
-MISC ChangeLog 44158 RMD160 c9c8ce1f29abaad26b984f7bc2d075599d41c3f2 SHA1 eab7cfe8f01879d35f6487557e6f0cec027afc8d SHA256 6ee5eaf5bd03eef27932ff089999c49c06d2ed4a38bc5c8eee753c66362ee211
+EBUILD syslog-ng-3.3.4.ebuild 3732 RMD160 075c02cd6cb99c8e1b5406249f7f36ef8c957760 SHA1 7a126da56f4ffc533cd01ee0484cd7dd5e3510eb SHA256 1c875ebb7262951c3aea4f1019e9e65647645e587481db8ae2799d680dd3983f
+MISC ChangeLog 44373 RMD160 63226362a58dd15930866931ab77f751df5f1c4c SHA1 3a95005ed716e63865441ad6bf433b8957a4a11a SHA256 9de1877690853fa2a72e9bdeaa4c749dc69ff68cae7a4fff49bd9d0922691067
 MISC metadata.xml 559 RMD160 ea078d9f0296f07dc3ffa3f0f8ae69f979ba4d3b SHA1 0ec5700dd8e3ae0ae458086778908b818349061a SHA256 b0a3c093ff517898bb36172559a8778e0290a5a95255df64e1fe223232837cd7
diff --git a/app-admin/syslog-ng/files/syslog-ng-3.3.4-memleak.patch b/app-admin/syslog-ng/files/syslog-ng-3.3.4-memleak.patch
new file mode 100644
index 000000000000..e0aee5cffd78
--- /dev/null
+++ b/app-admin/syslog-ng/files/syslog-ng-3.3.4-memleak.patch
@@ -0,0 +1,13 @@
+diff --git a/lib/logwriter.c b/lib/logwriter.c
+index 1c4f1c7..4411826 100644
+--- a/lib/logwriter.c
++++ b/lib/logwriter.c
+@@ -1016,7 +1016,7 @@ struct _LogWriter
+         {
+           /* push back to the queue */
+           log_queue_push_head(self->queue, lm, &path_options);
+-
++          log_msg_unref(lm);
+           msg_set_context(NULL);
+           log_msg_refcache_stop();
+           break;
diff --git a/app-admin/syslog-ng/syslog-ng-3.3.4.ebuild b/app-admin/syslog-ng/syslog-ng-3.3.4.ebuild
index 456af73adfca..b56e50944c05 100644
--- a/app-admin/syslog-ng/syslog-ng-3.3.4.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.3.4.ebuild,v 1.3 2012/03/21 20:54:04 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.3.4.ebuild,v 1.4 2012/03/22 15:13:04 mr_bones_ Exp $
 
 EAPI=2
 inherit autotools eutils multilib
@@ -42,7 +42,9 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${PN}-${MY_PV}
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-compile.patch
+	epatch \
+		"${FILESDIR}"/${P}-compile.patch \
+		"${FILESDIR}"/${P}-memleak.patch
 	sed -i -e '/libsyslog_ng_crypto_la_LIBADD/s/$/ -lssl -lcrypto/' lib/Makefile.am || die
 	eautoreconf
 }