From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 15 Aug 2011 19:37:20 +0000 (+0200)
Subject: miniupnpd: Update to 1.6.20110730.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=43276f2a4b0391a2ced1c8ccaa7c7834c7e4d443;p=people%2Fms%2Fipfire-2.x.git

miniupnpd: Update to 1.6.20110730.
---

diff --git a/lfs/miniupnpd b/lfs/miniupnpd
index 470fc28cbe..777c81a90e 100644
--- a/lfs/miniupnpd
+++ b/lfs/miniupnpd
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.4
+VER        = 1.6.20110730
 
 THISAPP    = miniupnpd-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = miniupnpd
-PAK_VER    = 0
+PAK_VER    = 1
 
 ###############################################################################
 # Top-level Rules
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = ffa33d4ed8732c662bdb7d511e86db76
+$(DL_FILE)_MD5 = 8bd5c0447b6dc1101b96e958ee67d3ea
 
 install : $(TARGET)
 
@@ -75,7 +75,6 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/miniupnpd-iptcrdr.patch
 	cd $(DIR_APP) && make -f Makefile.linux \
 		CFLAGS="$(CFLAGS) -DIPTABLES_143 -I/usr/src/linux/include"
 
diff --git a/src/patches/miniupnpd-iptcrdr.patch b/src/patches/miniupnpd-iptcrdr.patch
deleted file mode 100644
index 677043bdc3..0000000000
--- a/src/patches/miniupnpd-iptcrdr.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- netfilter/iptcrdr.c.old	2010-02-24 14:22:23.000000000 +0100
-+++ netfilter/iptcrdr.c	2010-02-24 14:48:00.000000000 +0100
-@@ -20,6 +20,13 @@
- 
- #if IPTABLES_143
- /* IPTABLES API version >= 1.4.3 */
-+
-+#define BUILD_BUG_ON_ZERO(e) (sizeof(struct { int:-!!(e); }))
-+#define __must_be_array(a) \
-+	BUILD_BUG_ON_ZERO(__builtin_types_compatible_p(typeof(a), typeof(&a[0])))
-+#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
-+#define LIST_POISON2  ((void *) 0x00200200 )
-+
- #include <net/netfilter/nf_nat.h>
- #define ip_nat_multi_range	nf_nat_multi_range
- #define ip_nat_range		nf_nat_range