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 (file)
index 28c03a5..0000000
--- 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);