From 1faebf9b28236c7c77244f70c10a67b84e492a2e Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Wed, 4 Jun 2014 07:01:48 +0200
Subject: [PATCH] Add miniupnpc

---
 net/miniupnpc/Makefile                        | 73 +++++++++++++++++++
 .../patches/100-no_minixml_test.patch         | 13 ++++
 .../patches/200-miniupnpc_desc.patch          | 11 +++
 3 files changed, 97 insertions(+)
 create mode 100644 net/miniupnpc/Makefile
 create mode 100644 net/miniupnpc/patches/100-no_minixml_test.patch
 create mode 100644 net/miniupnpc/patches/200-miniupnpc_desc.patch

diff --git a/net/miniupnpc/Makefile b/net/miniupnpc/Makefile
new file mode 100644
index 0000000000..fbf6222100
--- /dev/null
+++ b/net/miniupnpc/Makefile
@@ -0,0 +1,73 @@
+#
+# Copyright (C) 2010-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=miniupnpc
+PKG_VERSION:=1.9
+PKG_RELEASE:=1
+
+PKG_SOURCE_URL:=http://miniupnp.free.fr/files
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_MD5SUM:=5ef3ba321e6df72d6519b728b292073e
+PKG_MAINTAINER:=Steven Barth <cyrus@openwrt.org>
+
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/miniupnpc/Default
+  TITLE:=Lightweight UPnP
+  URL:=http://miniupnp.tuxfamily.org/
+endef
+
+define Package/miniupnpc
+  $(call Package/miniupnpc/Default)
+  SECTION:=net
+  CATEGORY:=Network
+  SUBMENU:=Firewall
+  TITLE+= client
+  DEPENDS:=+libminiupnpc
+endef
+
+define Package/libminiupnpc
+  $(call Package/miniupnpc/Default)
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE+= library
+endef
+
+TARGET_CFLAGS += $(FPIC)
+
+MAKE_FLAGS += \
+	OS="Linux" \
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include/miniupnpc
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/include/miniupnpc/*.h \
+		$(1)/usr/include/miniupnpc/
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/lib/*.{so*,a} \
+		$(1)/usr/lib/
+endef
+
+define Package/miniupnpc/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/upnpc $(1)/usr/bin/
+endef
+
+define Package/libminiupnpc/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_BIN) \
+		$(PKG_INSTALL_DIR)/usr/lib/libminiupnpc.so.* \
+		$(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,miniupnpc))
+$(eval $(call BuildPackage,libminiupnpc))
diff --git a/net/miniupnpc/patches/100-no_minixml_test.patch b/net/miniupnpc/patches/100-no_minixml_test.patch
new file mode 100644
index 0000000000..93f6772c72
--- /dev/null
+++ b/net/miniupnpc/patches/100-no_minixml_test.patch
@@ -0,0 +1,13 @@
+--- a/Makefile
++++ b/Makefile
+@@ -151,8 +151,8 @@ installpythonmodule3:	pythonmodule3
+ 	python3 setup.py install
+ 
+ validateminixml:	minixmlvalid
+-	@echo "minixml validation test"
+-	./minixmlvalid
++	@echo "(skipping) minixml validation test"
++#	./minixmlvalid
+ 	touch $@
+ 
+ validateminiwget:	testminiwget minihttptestserver testminiwget.sh
diff --git a/net/miniupnpc/patches/200-miniupnpc_desc.patch b/net/miniupnpc/patches/200-miniupnpc_desc.patch
new file mode 100644
index 0000000000..320707ef27
--- /dev/null
+++ b/net/miniupnpc/patches/200-miniupnpc_desc.patch
@@ -0,0 +1,11 @@
+--- a/upnpcommands.c
++++ b/upnpcommands.c
+@@ -367,7 +367,7 @@ UPNP_AddPortMapping(const char * control
+ 	AddPortMappingArgs[5].elt = "NewEnabled";
+ 	AddPortMappingArgs[5].val = "1";
+ 	AddPortMappingArgs[6].elt = "NewPortMappingDescription";
+-	AddPortMappingArgs[6].val = desc?desc:"libminiupnpc";
++	AddPortMappingArgs[6].val = desc?desc:"miniupnpc";
+ 	AddPortMappingArgs[7].elt = "NewLeaseDuration";
+ 	AddPortMappingArgs[7].val = leaseDuration?leaseDuration:"0";
+ 	if(!(buffer = simpleUPnPcommand(-1, controlURL, servicetype,