From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sat, 30 Jul 2011 00:28:58 +0000 (+0000)
Subject: merge r27798, r27799
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=e7bf858cd93464cd4cd24f6f8dc0fa6d7782f72c;p=openwrt%2Fsvn-archive%2Fpackages.git

merge r27798, r27799

SVN-Revision: 27836
---

diff --git a/net/znc/Makefile b/net/znc/Makefile
index 1de624317..e6488db2a 100644
--- a/net/znc/Makefile
+++ b/net/znc/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=znc
 PKG_VERSION:=0.098
-PKG_RELEASE:=2
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://znc.in/releases
@@ -170,10 +170,6 @@ $(eval $(call module,disconkick,This module will kick your client from all \
 
 $(eval $(call module,fail2ban,Block IPs for some time after a failed login.))
 
-$(eval $(call module,fixfreenode,This module blocks some freenode-specific \
-	feature which results in plus (+) and minus (-) signs being displayed in \
-	front of every message from a client.))
-
 $(eval $(call module,keepnick,Tries to get you your primary nick.))
 
 $(eval $(call module,kickrejoin,Implements auto-rejoin-on-kick.))
diff --git a/net/znc/patches/004-fix_memleak.patch b/net/znc/patches/004-fix_memleak.patch
new file mode 100644
index 000000000..51394c041
--- /dev/null
+++ b/net/znc/patches/004-fix_memleak.patch
@@ -0,0 +1,14 @@
+--- a/Chan.cpp
++++ b/Chan.cpp
+@@ -417,9 +417,10 @@ bool CChan::AddNick(const CString& sNick
+ 	// Get the nick
+ 	sTmp   = sTmp.Token(0, false, "!");
+ 
++	CNick tmpNick(sTmp);
+ 	CNick* pNick = FindNick(sTmp);
+ 	if (!pNick) {
+-		pNick = new CNick(sTmp);
++		pNick = &tmpNick;
+ 		pNick->SetUser(m_pUser);
+ 	}
+