X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fminiupnpd;h=a314624882dae6d5fb830a0dabe82dc7a6812540;hp=96531db71611e528768ab02005964496fc47624a;hb=ad5338015f68bca7bb5987c7e44218fe21377dad;hpb=e9581f09df723395dc0c56bd88c35faa7f43d311

diff --git a/lfs/miniupnpd b/lfs/miniupnpd
index 96531db71..a31462488 100644
--- a/lfs/miniupnpd
+++ b/lfs/miniupnpd
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,13 +24,15 @@
 
 include Config
 
-VER        = 1.4
+VER        = 1.8
 
 THISAPP    = miniupnpd-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = miniupnpd
+PAK_VER    = 1
 
 ###############################################################################
 # Top-level Rules
@@ -40,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = ffa33d4ed8732c662bdb7d511e86db76
+$(DL_FILE)_MD5 = 0d8a8e936d5a0012cb260a3b972acbf3
 
 install : $(TARGET)
 
@@ -50,6 +52,9 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
+dist:
+	@$(PAK)
+
 ###############################################################################
 # Downloading, checking, md5sum
 ###############################################################################
@@ -70,10 +75,11 @@ $(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"
-
+		CFLAGS="$(CFLAGS) -DIPTABLES_143" LIBS="-lip4tc -lnfnetlink"
 	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
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)