From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sun, 6 Dec 2009 03:07:29 +0000 (+0000)
Subject: merge r18667
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=7b8bfb57fc9c80170c6bb04e2182fae320e661cc;p=openwrt%2Fsvn-archive%2Fpackages.git

merge r18667

SVN-Revision: 18668
---

diff --git a/net/miniupnpd/patches/001-iptcrdr_memleaks.patch b/net/miniupnpd/patches/001-iptcrdr_memleaks.patch
deleted file mode 100644
index 28c03a5ee..000000000
--- a/net/miniupnpd/patches/001-iptcrdr_memleaks.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/netfilter/iptcrdr.c
-+++ b/netfilter/iptcrdr.c
-@@ -424,10 +424,20 @@ delete_redirect_and_filter_rules(unsigne
- 		if(h)
- 		{
- 			r = delete_rule_and_commit(index, h, miniupnpd_nat_chain, "delete_redirect_rule");
-+#ifdef IPTABLES_143
-+			iptc_free(h);
-+#else
-+			iptc_free(&h);
-+#endif
- 		}
- 		if((r == 0) && (h = iptc_init("filter")))
- 		{
- 			r = delete_rule_and_commit(index, h, miniupnpd_forward_chain, "delete_filter_rule");
-+#ifdef IPTABLES_143
-+			iptc_free(h);
-+#else
-+			iptc_free(&h);
-+#endif
- 		}
- 	}
- 	del_redirect_desc(eport, proto);