From ec4515016a5d08018e296d60e1c06bf4ef944db2 Mon Sep 17 00:00:00 2001
From: Tim Yardley <lst@openwrt.org>
Date: Wed, 7 Feb 2007 04:57:08 +0000
Subject: [PATCH] fix miniupnpd.. please be careful merging in changes...

SVN-Revision: 6274
---
 net/miniupnpd/Makefile                        |  3 +-
 .../patches/001-makefile-tweaks.patch         | 35 +++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 net/miniupnpd/patches/001-makefile-tweaks.patch

diff --git a/net/miniupnpd/Makefile b/net/miniupnpd/Makefile
index 8916e7182c..644a1df5f1 100644
--- a/net/miniupnpd/Makefile
+++ b/net/miniupnpd/Makefile
@@ -31,7 +31,8 @@ define Package/miniupnpd
 endef
 
 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) -f Makefile.linux \
+	ln -sf $(PKG_BUILD_DIR)/config.h.openwrt $(PKG_BUILD_DIR)/config.h
+	$(MAKE) -C $(PKG_BUILD_DIR) -f Makefile.openwrt \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS) -I $(STAGING_DIR)/usr/include" \
 		LIBS="$(STAGING_DIR)/usr/lib/libiptc.a"
diff --git a/net/miniupnpd/patches/001-makefile-tweaks.patch b/net/miniupnpd/patches/001-makefile-tweaks.patch
new file mode 100644
index 0000000000..39f3aca178
--- /dev/null
+++ b/net/miniupnpd/patches/001-makefile-tweaks.patch
@@ -0,0 +1,35 @@
+--- miniupnpd-1.0-RC3/Makefile.openwrt.orig	2007-02-06 22:50:56.000000000 -0600
++++ miniupnpd-1.0-RC3/Makefile.openwrt	2007-02-06 22:51:00.000000000 -0600
+@@ -11,17 +11,15 @@
+ CFLAGS += -D_GNU_SOURCE
+ RM = rm -f
+ INSTALL = install
+-IPTABLESINC=$(BUILD_DIR)/iptables-1.3.3/include
++IPTABLESINC=$(STAGING_DIR)/usr/include
+ 
+ BASEOBJS = miniupnpd.o upnphttp.o upnpdescgen.o upnpsoap.o \
+            upnpreplyparse.o minixml.o \
+ 		   upnpredirect.o getifaddr.o daemonize.o upnpglobalvars.o \
+-		   options.o
++		   options.o upnppermissions.o
+ 
+ LNXOBJS = linux/getifstats.o linux/iptcrdr.o
+ 
+-LIBS = $(BUILD_DIR)/iptables-1.3.3/libiptc/libiptc.a
+-
+ TESTUPNPDESCGENOBJS = testupnpdescgen.o upnpdescgen.o
+ 
+ EXECUTABLES = miniupnpd testupnpdescgen
+@@ -38,6 +36,7 @@
+ 	@echo no install for now...
+ 
+ miniupnpd:	$(BASEOBJS) $(LNXOBJS) $(LIBS)
++	$(CC) $(CFLAGS) -o $@ $(BASEOBJS) $(LNXOBJS) $(LIBS)
+ 
+ testupnpdescgen:	$(TESTUPNPDESCGENOBJS)
+ 
+@@ -69,3 +68,4 @@
+ linux/iptcrdr.o: linux/iptcrdr.h
+ testupnpdescgen.o: upnpdescgen.h
+ upnpdescgen.o: upnpdescgen.h miniupnpdpath.h upnpglobalvars.h
++upnppermissions.o: upnppermissions.c
-- 
2.30.2