Revert "miniupnpd: backport portrange-fix"
authorSteven Barth <steven@midlink.org>
Tue, 14 Apr 2015 13:03:10 +0000 (15:03 +0200)
committerSteven Barth <steven@midlink.org>
Tue, 14 Apr 2015 13:03:10 +0000 (15:03 +0200)
This reverts commit 2302e0b0b7a5b1971387e16743b39b34e591958e.

miniupnpd/Makefile
miniupnpd/patches/001-fix-get_portmappings_in_range-in-non-expand-case.patch [deleted file]

index b134ec2..6add41a 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=miniupnpd
 PKG_VERSION:=1.9.20150307
-PKG_RELEASE:=2
+PKG_RELEASE:=1
 
 PKG_SOURCE_URL:=http://miniupnp.free.fr/files
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
diff --git a/miniupnpd/patches/001-fix-get_portmappings_in_range-in-non-expand-case.patch b/miniupnpd/patches/001-fix-get_portmappings_in_range-in-non-expand-case.patch
deleted file mode 100644 (file)
index ff45ee3..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-From 3b472b59e00b2be96cc1ef56fe30b64e7404d9ec Mon Sep 17 00:00:00 2001
-From: Tomofumi Hayashi <s1061123@gmail.com>
-Date: Mon, 9 Mar 2015 17:33:10 +0900
-Subject: [PATCH] Fix get_portmappings_in_range() in non-expand case.
-
-In get_portmappings_in_range(), array[] is not updated when
-realloc() is not called, hence get_portmappings_in_range() is
-always null. This fix changes to fill array[].
----
- netfilter/iptcrdr.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/netfilter/iptcrdr.c b/netfilter/iptcrdr.c
-index 99678e7..c7b8b7b 100644
---- a/netfilter/iptcrdr.c
-+++ b/netfilter/iptcrdr.c
-@@ -1434,9 +1434,9 @@ get_portmappings_in_range(unsigned short startport, unsigned short endport,
-                                                       break;
-                                               }
-                                               array = tmp;
--                                              array[*number] = eport;
--                                              (*number)++;
-                                       }
-+                                      array[*number] = eport;
-+                                      (*number)++;
-                               }
-                       }
-               }
--- 
-2.1.4
-