bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade miniupnpd to 1.1, thanks Nanard

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@11219 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
florian 2008-05-20 10:06:16 +00:00
parent 2ab8bb5b38
commit fff24b0be7
4 changed files with 68 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/miniupnpd/Makefile
View File

@ -9,9 +9,9 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=miniupnpd PKG_NAME:=miniupnpd
PKG_VERSION:=1.0-RC8 PKG_VERSION:=1.1
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_MD5SUM:=54536b268f630449e9ecb0e2552a1d52 PKG_MD5SUM:=a0f6651476721db9b554668c8c83b151
PKG_SOURCE_URL:=http://miniupnp.free.fr/files PKG_SOURCE_URL:=http://miniupnp.free.fr/files
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@ -41,7 +41,7 @@ endef
define Package/miniupnpd/install define Package/miniupnpd/install
$(INSTALL_DIR) $(1)/usr/bin $(1)/etc/init.d $(1)/etc/config $(1)/etc/hotplug.d/iface $(INSTALL_DIR) $(1)/usr/bin $(1)/etc/init.d $(1)/etc/config $(1)/etc/hotplug.d/iface
$(INSTALL_BIN) $(PKG_BUILD_DIR)/miniupnpd $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/miniupnpd $(1)/usr/bin/
$(INSTALL_BIN) $(PKG_BUILD_DIR)/linux/*.sh $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/netfilter/*.sh $(1)/usr/bin/
$(INSTALL_BIN) ./files/miniupnpd.init $(1)/etc/init.d/miniupnpd $(INSTALL_BIN) ./files/miniupnpd.init $(1)/etc/init.d/miniupnpd
$(INSTALL_DATA) ./files/upnpd.config $(1)/etc/config/upnpd $(INSTALL_DATA) ./files/upnpd.config $(1)/etc/config/upnpd
$(INSTALL_DATA) ./files/miniupnpd.hotplug $(1)/etc/hotplug.d/iface/20-miniupnpd $(INSTALL_DATA) ./files/miniupnpd.hotplug $(1)/etc/hotplug.d/iface/20-miniupnpd

46
net/miniupnpd/patches/001-makefile-tweaks.patch
View File

@ -1,39 +1,35 @@
Index: miniupnpd-1.0-RC8/Makefile.openwrt Index: Makefile.openwrt
=================================================================== ===================================================================
--- miniupnpd-1.0-RC8.orig/Makefile.openwrt 2007-09-17 17:43:54.000000000 -0500 RCS file: /usr/local/cvsroot/miniupnp/miniupnpd/Makefile.openwrt,v
+++ miniupnpd-1.0-RC8/Makefile.openwrt 2007-09-17 17:43:54.000000000 -0500 retrieving revision 1.11
@@ -2,7 +2,7 @@ diff -u -r1.11 miniupnpd-1.1/Makefile.openwrt
# http://miniupnp.free.fr/ --- miniupnpd-1.1.orig/Makefile.openwrt 29 Jan 2008 12:52:03 -0000 1.11
# Author : Thomas Bernard +++ miniupnpd-1.1/Makefile.openwrt 1 May 2008 22:34:28 -0000
# for use with GNU Make @@ -6,7 +6,7 @@
# your openwrt SDK/etc...
# http://miniupnp.tuxfamily.org/forum/viewtopic.php?p=713
-include $(TOPDIR)/rules.mk -include $(TOPDIR)/rules.mk
+ +#include $(TOPDIR)/rules.mk
#CFLAGS = -Wall -O -D_GNU_SOURCE -g #CFLAGS = -Wall -O -D_GNU_SOURCE -g
#CFLAGS = -Wall -Os -D_GNU_SOURCE #CFLAGS = -Wall -Os -D_GNU_SOURCE
#CC = mipsel-linux-gcc #CC = mipsel-linux-gcc
@@ -11,7 +11,7 @@ @@ -16,7 +16,8 @@
CFLAGS += -D_GNU_SOURCE CP = cp
RM = rm -f RM = rm -f
INSTALL = install INSTALL = install
-IPTABLESINC=$(BUILD_DIR)/iptables-1.3.3/include -IPTABLESINC=$(BUILD_DIR)/iptables-1.3.3/include
+IPTABLESINC=$(STAGING_DIR)/usr/include +IPTABLESINC=$(STAGING_DIR)/usr/include
+#IPTABLESINC=$(BUILD_DIR)/iptables-1.3.3/include
#IPTABLESINC=$(TOPDIR)/../iptables-1.3.3/include
BASEOBJS = miniupnpd.o upnphttp.o upnpdescgen.o upnpsoap.o \ BASEOBJS = miniupnpd.o upnphttp.o upnpdescgen.o upnpsoap.o \
upnpreplyparse.o minixml.o \ @@ -28,7 +29,7 @@
@@ -20,8 +20,6 @@ NETFILTEROBJS = netfilter/iptcrdr.o
ALLOBJS = $(BASEOBJS) $(LNXOBJS) $(NETFILTEROBJS)
LNXOBJS = linux/getifstats.o linux/iptcrdr.o
-LIBS = $(BUILD_DIR)/iptables-1.3.3/libiptc/libiptc.a -LIBS = $(BUILD_DIR)/iptables-1.3.3/libiptc/libiptc.a
- +#LIBS = $(BUILD_DIR)/iptables-1.3.3/libiptc/libiptc.a
#LIBS = $(TOPDIR)/../iptables-1.3.3/libiptc/libiptc.a
TESTUPNPDESCGENOBJS = testupnpdescgen.o upnpdescgen.o 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)

12
net/miniupnpd/patches/100-iptables-wan-device-name.patch
View File

@ -1,7 +1,7 @@
Index: miniupnpd-1.0-RC8/linux/iptables_init.sh Index: miniupnpd-1.1/netfilter/iptables_init.sh
=================================================================== ===================================================================
--- miniupnpd-1.0-RC8.orig/linux/iptables_init.sh 2007-09-17 17:43:54.000000000 -0500 --- miniupnpd-1.1.orig/netfilter/iptables_init.sh 2007-09-17 17:43:54.000000000 -0500
+++ miniupnpd-1.0-RC8/linux/iptables_init.sh 2007-09-17 17:43:54.000000000 -0500 +++ miniupnpd-1.1/netfilter/iptables_init.sh 2007-09-17 17:43:54.000000000 -0500
@@ -1,9 +1,12 @@ @@ -1,9 +1,12 @@
#! /bin/sh #! /bin/sh
# $Id: iptables_init.sh,v 1.3 2006/11/23 12:32:57 nanard Exp $ # $Id: iptables_init.sh,v 1.3 2006/11/23 12:32:57 nanard Exp $
@ -16,10 +16,10 @@ Index: miniupnpd-1.0-RC8/linux/iptables_init.sh
EXTIP="`LC_ALL=C /sbin/ifconfig $EXTIF | grep 'inet addr' | awk '{print $2}' | sed -e 's/.*://'`" EXTIP="`LC_ALL=C /sbin/ifconfig $EXTIF | grep 'inet addr' | awk '{print $2}' | sed -e 's/.*://'`"
echo "External IP = $EXTIP" echo "External IP = $EXTIP"
Index: miniupnpd-1.0-RC8/linux/iptables_removeall.sh Index: miniupnpd-1.1/netfilter/iptables_removeall.sh
=================================================================== ===================================================================
--- miniupnpd-1.0-RC8.orig/linux/iptables_removeall.sh 2007-09-17 17:43:54.000000000 -0500 --- miniupnpd-1.1.orig/netfilter/iptables_removeall.sh 2007-09-17 17:43:54.000000000 -0500
+++ miniupnpd-1.0-RC8/linux/iptables_removeall.sh 2007-09-17 17:43:54.000000000 -0500 +++ miniupnpd-1.1/netfilter/iptables_removeall.sh 2007-09-17 17:43:54.000000000 -0500
@@ -1,9 +1,12 @@ @@ -1,9 +1,12 @@
#! /bin/sh #! /bin/sh
# $Id: iptables_removeall.sh,v 1.3 2006/11/23 12:32:57 nanard Exp $ # $Id: iptables_removeall.sh,v 1.3 2006/11/23 12:32:57 nanard Exp $

38
net/miniupnpd/patches/101-config.h.openwrt.patch Normal file
View File

@ -0,0 +1,38 @@
Index: miniupnpd-1.1/config.h.openwrt
===================================================================
RCS file: /usr/local/cvsroot/miniupnp/miniupnpd/miniupnpd-1.1/config.h.openwrt,v
retrieving revision 1.2
diff -u -r1.2 miniupnpd-1.1/config.h.openwrt
--- miniupnpd-1.1/config.h.openwrt 26 Apr 2007 19:11:09 -0000 1.2
+++ miniupnpd-1.1/config.h.openwrt 1 May 2008 22:47:17 -0000
@@ -1,18 +1,27 @@
/* $Id: miniupnpd-1.1/config.h.openwrt,v 1.2 2007/04/26 19:11:09 nanard Exp $ */
/* MiniUPnP Project
* http:///miniupnp.free.fr
- * (c) 2006 Thomas Bernard
+ * (c) 2006-2008 Thomas Bernard
*/
#ifndef __CONFIG_H__
#define __CONFIG_H__
#define UPNP_VERSION "20070228"
-
+#define USE_NETFILTER 1
#define OS_NAME "OpenWRT"
/* OS/version */
-#define OS_VERSION "OpenWRT/WhiteRussian"
+#define OS_VERSION "OpenWRT/kamikaze"
#define OS_URL "http://openwrt.org/"
#define LOG_MINIUPNPD LOG_DAEMON
+
+/* Comment the following line to disable NAT-PMP operations */
+#define ENABLE_NATPMP
+
+/* Comment the following line to use home made daemonize() func instead
+ * of BSD daemon() */
+#define USE_DAEMON
+
+#define ENABLE_L3F_SERVICE
#endif