Updated miniupnpd to 20081009.

diff --git a/lfs/miniupnpd b/lfs/miniupnpd
index 0340d6eea3ac912b02279eb9fd6fa3eee3306c6f..cc7483f5d76228bbd76d727b7891ac633fb59a14 100644 (file)
--- a/lfs/miniupnpd
+++ b/lfs/miniupnpd
@@ -25,7 +25,7 @@
 include Config
 
 PKG_NAME   = miniupnpd
-VER        = 1.2
+VER        = 20081009
 PKG_VER    = 0
 
 THISAPP    = $(PKG_NAME)-$(VER)
@@ -53,7 +53,8 @@ endef
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE)
+objects = $(DL_FILE) \
+       $(THISAPP)-iptables-source-1.patch
 
 download: $(objects)
 
@@ -72,9 +73,15 @@ $(objects):
 $(OBJECT): $(objects)
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE)
+
+       cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-iptables-source-1.patch
        cd $(DIR_APP) && cp -vf $(DIR_CONFIG)/$(PKG_NAME)/config.h config.h
-       cd $(DIR_APP) && sed -e "s/^CFLAGS=.*/CFLAGS=$(CFLAGS)/g" -i Makefile.linux
+       cd $(DIR_APP) && sed \
+               -e "s@^CFLAGS = .*@CFLAGS = $(CFLAGS) -I$(DIR_SRC)/linux-$(KVER)/include -D_GNU_SOURCE@g" \
+               -i Makefile.linux
+
        cd $(DIR_APP) && make -f Makefile.linux $(PARALLELISMFLAGS)
+
        cd $(DIR_APP) && cp -vf $(PKG_NAME) /usr/sbin/
        cd $(DIR_APP) && $(INSTALL_CONFIG) \
                < $(DIR_CONFIG)/$(PKG_NAME)/$(PKG_NAME).conf > /etc/$(PKG_NAME).conf

diff --git a/make.sh b/make.sh
index eec368248d3f3139a57753407a0ad5cba5d528e5..3d1025a6972923213154835b403c98cdb73a57f6 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -337,7 +337,7 @@ misc_build() {
 
        ipfire_make stage4
 
-       #ipfire_make miniupnpd
+       ipfire_make miniupnpd
 
        ### Console tools
        #