Add upstream patch to avoid memory leak with USE=redis

(Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)

8 files changed, 39 insertions, 280 deletions

diff --git a/app-admin/syslog-ng/ChangeLog b/app-admin/syslog-ng/ChangeLog
index 169f0e515ef9..9c526c216015 100644
--- a/app-admin/syslog-ng/ChangeLog
+++ b/app-admin/syslog-ng/ChangeLog
@@ -1,6 +1,13 @@
 # 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.412 2014/12/18 23:05:40 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.413 2014/12/19 02:57:42 mr_bones_ Exp $
+
+  19 Dec 2014; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/3.6/syslog-ng-3.6.2-redis.patch, -files/3.5/syslog-ng.conf.gentoo,
+  -files/3.5/syslog-ng.conf.gentoo.fbsd,
+  -files/3.5/syslog-ng.conf.gentoo.hardened, -files/3.5/syslog-ng.confd,
+  -files/3.5/syslog-ng.rc6, syslog-ng-3.6.2.ebuild:
+  Add upstream patch to avoid memory leak with USE=redis
 
   18 Dec 2014; Michael Sterrett <mr_bones_@gentoo.org>
   -files/3.6/syslog-ng-3.6.1-link-smtp.patch,
diff --git a/app-admin/syslog-ng/files/3.5/syslog-ng.conf.gentoo b/app-admin/syslog-ng/files/3.5/syslog-ng.conf.gentoo
deleted file mode 100644
index 69a07f17fe27..000000000000
--- a/app-admin/syslog-ng/files/3.5/syslog-ng.conf.gentoo
+++ /dev/null
@@ -1,37 +0,0 @@
-@version: 3.5
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.5/syslog-ng.conf.gentoo,v 1.1 2014/01/22 04:25:36 mr_bones_ Exp $
-#
-# Syslog-ng default configuration file for Gentoo Linux
-
-# https://bugs.gentoo.org/show_bug.cgi?id=426814
-@include "scl.conf"
-
-options { 
-	threaded(yes);
-	chain_hostnames(no); 
-
-	# The default action of syslog-ng is to log a STATS line
-	# to the file every 10 minutes.  That's pretty ugly after a while.
-	# Change it to every 12 hours so you get a nice daily update of
-	# how many messages syslog-ng missed (0).
-	stats_freq(43200); 
-	# The default action of syslog-ng is to log a MARK line
-	# to the file every 20 minutes.  That's seems high for most
-	# people so turn it down to once an hour.  Set it to zero
-	# if you don't want the functionality at all.
-	mark_freq(3600); 
-};
-
-source src { system(); internal(); };
-
-destination messages { file("/var/log/messages"); };
-
-# By default messages are logged to tty12...
-destination console_all { file("/dev/tty12"); };
-# ...if you intend to use /dev/console for programs like xconsole
-# you can comment out the destination line above that references /dev/tty12
-# and uncomment the line below.
-#destination console_all { file("/dev/console"); };
-
-log { source(src); destination(messages); };
-log { source(src); destination(console_all); };
diff --git a/app-admin/syslog-ng/files/3.5/syslog-ng.conf.gentoo.fbsd b/app-admin/syslog-ng/files/3.5/syslog-ng.conf.gentoo.fbsd
deleted file mode 100644
index 2e42aa4e4a7e..000000000000
--- a/app-admin/syslog-ng/files/3.5/syslog-ng.conf.gentoo.fbsd
+++ /dev/null
@@ -1,25 +0,0 @@
-@version: 3.5
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.5/syslog-ng.conf.gentoo.fbsd,v 1.1 2014/01/22 04:25:36 mr_bones_ Exp $
-#
-# Syslog-ng default configuration file for Gentoo FreeBSD
-#
-
-# https://bugs.gentoo.org/show_bug.cgi?id=426814
-@include "scl.conf"
-
-options {
-	threaded(yes);
-	chain_hostnames(no);
-
-	# The default action of syslog-ng is to log a STATS line
-	# to the file every 10 minutes.  That's pretty ugly after a while.
-	# Change it to every 12 hours so you get a nice daily update of
-	# how many messages syslog-ng missed (0).
-	stats_freq(43200); 
-};
-
-source src { system(); internal(); };
-
-destination messages { file("/var/log/messages"); };
-
-log { source(src); destination(messages); };
diff --git a/app-admin/syslog-ng/files/3.5/syslog-ng.conf.gentoo.hardened b/app-admin/syslog-ng/files/3.5/syslog-ng.conf.gentoo.hardened
deleted file mode 100644
index 282ff91e4470..000000000000
--- a/app-admin/syslog-ng/files/3.5/syslog-ng.conf.gentoo.hardened
+++ /dev/null
@@ -1,115 +0,0 @@
-@version: 3.5
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.5/syslog-ng.conf.gentoo.hardened,v 1.1 2014/01/22 04:25:36 mr_bones_ Exp $
-
-# https://bugs.gentoo.org/show_bug.cgi?id=426814
-@include "scl.conf"
-
-#
-# Syslog-ng configuration file, compatible with default hardened installations.
-#
-
-options {
-	threaded(yes);
-	chain_hostnames(no);
-	stats_freq(43200);
-};
-
-source src {
-    unix-dgram("/dev/log");
-    internal();
-};
-source kernsrc {
-    file("/proc/kmsg");
-};
-
-#source net { udp(); };
-#log { source(net); destination(net_logs); };
-#destination net_logs { file("/var/log/HOSTS/$HOST/$YEAR$MONTH$DAY.log"); };
-
-destination authlog { file("/var/log/auth.log"); };
-destination _syslog { file("/var/log/syslog"); };
-destination cron { file("/var/log/cron.log"); };
-destination daemon { file("/var/log/daemon.log"); };
-destination kern { file("/var/log/kern.log"); file("/dev/tty12"); };
-destination lpr { file("/var/log/lpr.log"); };
-destination user { file("/var/log/user.log"); };
-destination uucp { file("/var/log/uucp.log"); };
-#destination ppp { file("/var/log/ppp.log"); };
-destination mail { file("/var/log/mail.log"); };
-
-destination avc { file("/var/log/avc.log"); };
-destination audit { file("/var/log/audit.log"); };
-destination pax { file("/var/log/pax.log"); };
-destination grsec { file("/var/log/grsec.log"); };
-
-destination mailinfo { file("/var/log/mail.info"); };
-destination mailwarn { file("/var/log/mail.warn"); };
-destination mailerr { file("/var/log/mail.err"); };
-
-destination newscrit { file("/var/log/news/news.crit"); };
-destination newserr { file("/var/log/news/news.err"); };
-destination newsnotice { file("/var/log/news/news.notice"); };
-
-destination debug { file("/var/log/debug"); };
-destination messages { file("/var/log/messages"); };
-destination console { usertty("root"); };
-destination console_all { file("/dev/tty12"); };
-#destination loghost { udp("loghost" port(999)); };
-
-destination xconsole { pipe("/dev/xconsole"); };
-
-filter f_auth { facility(auth); };
-filter f_authpriv { facility(auth, authpriv); };
-filter f_syslog { not facility(authpriv, mail); };
-filter f_cron { facility(cron); };
-filter f_daemon { facility(daemon); };
-filter f_kern { facility(kern); };
-filter f_lpr { facility(lpr); };
-filter f_mail { facility(mail); };
-filter f_user { facility(user); };
-filter f_uucp { facility(uucp); };
-#filter f_ppp { facility(ppp); };
-filter f_news { facility(news); };
-filter f_debug { not facility(auth, authpriv, news, mail); };
-filter f_messages { level(info..warn)
-	and not facility(auth, authpriv, mail, news); };
-filter f_emergency { level(emerg); };
-
-filter f_info { level(info); };
-
-filter f_notice { level(notice); };
-filter f_warn { level(warn); };
-filter f_crit { level(crit); };
-filter f_err { level(err); };
-
-filter f_avc { message(".*avc: .*"); };
-filter f_audit { message("^(\\[.*\..*\] |)audit.*") and not message(".*avc: .*"); };
-filter f_pax { message("^(\\[.*\..*\] |)PAX:.*"); };
-filter f_grsec { message("^(\\[.*\..*\] |)grsec:.*"); };
-
-log { source(src); filter(f_authpriv); destination(authlog); };
-log { source(src); filter(f_syslog); destination(_syslog); };
-log { source(src); filter(f_cron); destination(cron); };
-log { source(src); filter(f_daemon); destination(daemon); };
-log { source(kernsrc); filter(f_kern); destination(kern); };
-log { source(src); filter(f_lpr); destination(lpr); };
-log { source(src); filter(f_mail); destination(mail); };
-log { source(src); filter(f_user); destination(user); };
-log { source(src); filter(f_uucp); destination(uucp); };
-log { source(kernsrc); filter(f_pax); destination(pax); };
-log { source(kernsrc); filter(f_grsec); destination(grsec); };
-log { source(kernsrc); filter(f_audit); destination(audit); };
-log { source(kernsrc); filter(f_avc); destination(avc); };
-log { source(src); filter(f_mail); filter(f_info); destination(mailinfo); };
-log { source(src); filter(f_mail); filter(f_warn); destination(mailwarn); };
-log { source(src); filter(f_mail); filter(f_err); destination(mailerr); };
-log { source(src); filter(f_news); filter(f_crit); destination(newscrit); };
-log { source(src); filter(f_news); filter(f_err); destination(newserr); };
-log { source(src); filter(f_news); filter(f_notice); destination(newsnotice); };
-log { source(src); filter(f_debug); destination(debug); };
-log { source(src); filter(f_messages); destination(messages); };
-log { source(src); filter(f_emergency); destination(console); };
-#log { source(src); filter(f_ppp); destination(ppp); };
-log { source(src); destination(console_all); };
diff --git a/app-admin/syslog-ng/files/3.5/syslog-ng.confd b/app-admin/syslog-ng/files/3.5/syslog-ng.confd
deleted file mode 100644
index 6a437d1bf36f..000000000000
--- a/app-admin/syslog-ng/files/3.5/syslog-ng.confd
+++ /dev/null
@@ -1,42 +0,0 @@
-# Config file for /etc/init.d/syslog-ng
-
-# If you are not using network logging, this entire section should be
-# commented out. Otherwise, choose one of the settings below based on
-# how you are configuring your network.
-#
-# If you are using the net.* scripts to configure your network, you should
-# set rc_need to match the interface through which your logging server
-# can be reached.
-#rc_need="net.eth0"
-#
-# If you are using an interface manager like wicd, dhcpcd in standalone
-# mode, networkmanager, etc to control your interfaces, set rc_need to
-# the name of that service.
-# rc_need="dhcpcd"
-#rc_need="networkmanager"
-#
-# If you are using newnet and configuring your interface statically with
-# the network script, you should use this setting.
-#rc_need="network"
-#
-# You can use this setting, but I do not recommend relying on it.
-#rc_need="net"
-#
-# You may also want to uncomment the following if you are using network
-# logging.
-#rc_use="stunnel"
-
-# For very customized setups these variables can be adjusted as needed
-# but for most situations they should remain commented:
-# SYSLOG_NG_CONFIGFILE=/etc/syslog-ng/syslog-ng.conf
-# SYSLOG_NG_STATEFILE_DIR=/var/lib/syslog-ng
-# SYSLOG_NG_STATEFILE=${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist
-# SYSLOG_NG_PIDFILE_DIR=/var/run
-# SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE_DIR}/syslog-ng.pid
-# SYSLOG_NG_GROUP=root
-# SYSLOG_NG_USER=root
-
-# Put any additional options for syslog-ng here.
-# See syslog-ng(8) for more information.
-
-SYSLOG_NG_OPTS=""
diff --git a/app-admin/syslog-ng/files/3.5/syslog-ng.rc6 b/app-admin/syslog-ng/files/3.5/syslog-ng.rc6
deleted file mode 100644
index 99c7e0450ad2..000000000000
--- a/app-admin/syslog-ng/files/3.5/syslog-ng.rc6
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/sbin/runscript
-# 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/files/3.5/syslog-ng.rc6,v 1.1 2014/01/22 04:25:36 mr_bones_ Exp $
-
-SYSLOG_NG_CONFIGFILE=${SYSLOG_NG_CONFIGFILE:-/etc/syslog-ng/${RC_SVCNAME}.conf}
-SYSLOG_NG_STATEFILE_DIR=${SYSLOG_NG_STATEFILE_DIR:-/var/lib/syslog-ng}
-SYSLOG_NG_STATEFILE=${SYSLOG_NG_STATEFILE:-${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist}
-SYSLOG_NG_PIDFILE_DIR=${SYSLOG_NG_PIDFILE_DIR:-/var/run}
-SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE:-${SYSLOG_NG_PIDFILE_DIR}/${RC_SVCNAME}.pid}
-
-SYSLOG_NG_GROUP=${SYSLOG_NG_GROUP:-root}
-SYSLOG_NG_USER=${SYSLOG_NG_USER:-root}
-
-command="/usr/sbin/syslog-ng"
-command_args="--persist-file \"${SYSLOG_NG_STATEFILE}\" --cfgfile \"${SYSLOG_NG_CONFIGFILE}\" --pidfile \"${SYSLOG_NG_PIDFILE}\" ${SYSLOG_NG_OPTS}"
-extra_commands="checkconfig"
-extra_started_commands="reload"
-pidfile="${SYSLOG_NG_PIDFILE}"
-start_stop_daemon_args="--user \"${SYSLOG_NG_USER}\":\"${SYSLOG_NG_GROUP}\""
-description="Syslog-ng is a syslog replacement with advanced filtering features."
-description_checkconfig="Check the configuration file that will be used by \"start\""
-description_reload="Reload the configuration without exiting"
-required_files="${SYSLOG_NG_CONFIGFILE}"
-required_dirs="${SYSLOG_NG_PIDFILE_DIR}"
-
-depend() {
-	use clock
-	need hostname localmount
-	after bootmisc
-	provide logger
-}
-
-checkconfig() {
-	ebegin "Checking your configfile (${SYSLOG_NG_CONFIGFILE})"
-	syslog-ng -s -f "${SYSLOG_NG_CONFIGFILE}"
-	eend $? "Configuration error. Please fix your configfile (${SYSLOG_NG_CONFIGFILE})"
-}
-
-start_pre() {
-	checkconfig || return 1
-	checkpath \
-		-d \
-		--mode 0700 \
-		--owner "${SYSLOG_NG_OWNER}:${SYSLOG_NG_GROUP}" \
-		"${SYSLOG_NG_STATEFILE_DIR}"
-}
-
-stop_pre() {
-	[ "$RC_CMD" = restart ] && sleep 1
-	return 0
-}
-
-reload() {
-	checkconfig || return 1
-	ebegin "Reloading configuration and re-opening log files"
-	start-stop-daemon --signal HUP --pidfile "${pidfile}"
-	eend $?
-}
diff --git a/app-admin/syslog-ng/files/3.6/syslog-ng-3.6.2-redis.patch b/app-admin/syslog-ng/files/3.6/syslog-ng-3.6.2-redis.patch
new file mode 100644
index 000000000000..aa00c3b9d0e4
--- /dev/null
+++ b/app-admin/syslog-ng/files/3.6/syslog-ng-3.6.2-redis.patch
@@ -0,0 +1,29 @@
+From 0e51c69056a93bd2b95341f005b8b1fdceec2b10 Mon Sep 17 00:00:00 2001
+From: Tibor Benke <ihrwein@gmail.com>
+Date: Wed, 17 Dec 2014 23:52:41 +0100
+Subject: [PATCH] redis: free reply object after a succesful ping
+
+---
+ modules/redis/redis.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/modules/redis/redis.c b/modules/redis/redis.c
+index 46a5b6b..9114324 100644
+--- a/modules/redis/redis.c
++++ b/modules/redis/redis.c
+@@ -132,9 +132,14 @@ redis_dd_format_persist_name(LogThrDestDriver *d)
+ static gboolean
+ redis_dd_connect(RedisDriver *self, gboolean reconnect)
+ {
++  redisReply *reply;
++  
+   if (reconnect && (self->c != NULL))
+     {
+-      redisCommand(self->c, "ping");
++      reply = redisCommand(self->c, "ping");
++
++      if (reply)
++        freeReplyObject(reply);
+ 
+       if (!self->c->err)
+         return TRUE;
diff --git a/app-admin/syslog-ng/syslog-ng-3.6.2.ebuild b/app-admin/syslog-ng/syslog-ng-3.6.2.ebuild
index 651d38294452..dbee42c95179 100644
--- a/app-admin/syslog-ng/syslog-ng-3.6.2.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.6.2.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.2.ebuild,v 1.1 2014/12/18 19:37:32 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.6.2.ebuild,v 1.2 2014/12/19 02:57:42 mr_bones_ Exp $
 
 EAPI=5
 inherit eutils multilib systemd versionator
@@ -38,6 +38,7 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${PN}-${MY_PV}
 
 src_prepare() {
+	epatch "${FILESDIR}"/${MY_PV_MM}/${P}-redis.patch
 	cp "${FILESDIR}"/*logrotate*.in "${TMPDIR}" || die
 	cd "${TMPDIR}" || die