Merge remote-tracking branch 'origin/next' into thirteen

[people/pmueller/ipfire-2.x.git] / lfs / miniupnpd

diff --git a/lfs/miniupnpd b/lfs/miniupnpd
index c7ba937737d5b69b95b314c87e2cd8c8e6f49213..7129ed58a3a6c213578c50dd73ba0a999301d46e 100644 (file)
--- a/lfs/miniupnpd
+++ b/lfs/miniupnpd
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.4
+VER        = 1.7
 
 THISAPP    = miniupnpd-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = ffa33d4ed8732c662bdb7d511e86db76
+$(DL_FILE)_MD5 = 5af9e8332d34a7b490d0d2ed3e674196
 
 install : $(TARGET)
 
@@ -75,11 +75,8 @@ $(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) && patch -Np1 -i $(DIR_SRC)/src/patches/miniupnpd-1.4_use_XT_ALIGN.patch
        cd $(DIR_APP) && make -f Makefile.linux \
                CFLAGS="$(CFLAGS) -DIPTABLES_143 -I/usr/src/linux/include"
-
        cd $(DIR_APP) && install -m 755 miniupnpd /usr/sbin
        -mkdir -pv /etc/miniupnpd
        cp -vf $(DIR_SRC)/config/miniupnpd/miniupnpd.conf /etc/miniupnpd/miniupnpd.conf