diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2012-03-22 15:13:04 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2012-03-22 15:13:04 +0000 |
| commit | d29e9e3487b60f21b4fa2614651d6bc606a90e55 (patch) | |
| tree | 11fc6ff2a0cb6a949fb0cce8ec64fa64a7d7bb00 | |
| parent | Bump branding to fix typo in sofficerc. Thanks to livibetter for the report a... (diff) | |
| download | gentoo-2-d29e9e3487b60f21b4fa2614651d6bc606a90e55.tar.gz gentoo-2-d29e9e3487b60f21b4fa2614651d6bc606a90e55.tar.bz2 gentoo-2-d29e9e3487b60f21b4fa2614651d6bc606a90e55.zip | |
add upstream patch for memory leak caused by messages that couldn't be flushed right away.
(Portage version: 2.1.10.49/cvs/Linux x86_64)
| -rw-r--r-- | app-admin/syslog-ng/ChangeLog | 7 | ||||
| -rw-r--r-- | app-admin/syslog-ng/files/syslog-ng-3.3.4-memleak.patch | 13 | ||||
| -rw-r--r-- | app-admin/syslog-ng/syslog-ng-3.3.4.ebuild | 6 |
3 files changed, 23 insertions, 3 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/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 } |