Changeset 26921


Ignore:
Timestamp:
2011-05-17T13:09:51+02:00 (7 years ago)
Author:
swalker
Message:

[packages] miniupnpc: update to 1.5

  • add libminiupnpc package
  • use PKG_INSTALL & MAKE_FLAGS
  • add copyright info
  • refresh patches
Location:
packages/net/miniupnpc
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • packages/net/miniupnpc/Makefile

    r26055 r26921  
     1# 
     2# Copyright (C) 2010-2011 OpenWrt.org 
     3# 
     4# This is free software, licensed under the GNU General Public License v2. 
     5# See /LICENSE for more information. 
     6# 
     7 
    18include $(TOPDIR)/rules.mk 
    29 
    310PKG_NAME:=miniupnpc 
    4 PKG_VERSION:=1.4 
    5 PKG_RELEASE:=2 
     11PKG_VERSION:=1.5 
     12PKG_RELEASE:=1 
    613 
    714PKG_SOURCE_URL:=http://miniupnp.free.fr/files 
    815PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
    9 PKG_MD5SUM:=e8de10c42d64e77c321e57400d50e7e4 
     16PKG_MD5SUM:=0efa7498d27c82a56a0300b0c05c4f58 
     17 
     18PKG_INSTALL:=1 
    1019 
    1120include $(INCLUDE_DIR)/package.mk 
    1221 
     22define Package/miniupnpc/Default 
     23  TITLE:=Lightweight UPnP 
     24  URL:=http://miniupnp.tuxfamily.org/ 
     25endef 
     26 
    1327define Package/miniupnpc 
     28  $(call Package/miniupnpc/Default) 
    1429  SECTION:=net 
    1530  CATEGORY:=Network 
    1631  SUBMENU:=Firewall 
    17   TITLE:=Lightweight UPnP client 
    18   URL:=http://miniupnp.tuxfamily.org/ 
     32  TITLE+= client 
     33  DEPENDS:=+libminiupnpc 
     34endef 
     35 
     36define Package/libminiupnpc 
     37  $(call Package/miniupnpc/Default) 
     38  SECTION:=libs 
     39  CATEGORY:=Libraries 
     40  TITLE+= library 
    1941endef 
    2042 
    2143TARGET_CFLAGS += $(FPIC) 
    2244 
     45MAKE_FLAGS += \ 
     46        PREFIX="$(PKG_INSTALL_DIR)" 
     47 
     48define Build/InstallDev 
     49        $(INSTALL_DIR) $(1)/usr/include/miniupnpc 
     50        $(CP) \ 
     51                $(PKG_INSTALL_DIR)/usr/include/miniupnpc/*.h \ 
     52                $(1)/usr/include/miniupnpc/ 
     53        $(INSTALL_DIR) $(1)/usr/lib 
     54        $(CP) \ 
     55                $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a} \ 
     56                $(1)/usr/lib/ 
     57endef 
     58 
    2359define Package/miniupnpc/install 
    2460        $(INSTALL_DIR) $(1)/usr/bin 
    25         $(INSTALL_BIN) $(PKG_BUILD_DIR)/upnpc-static $(1)/usr/bin/upnpc 
     61        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/upnpc $(1)/usr/bin/ 
     62endef 
     63 
     64define Package/libminiupnpc/install 
     65        $(INSTALL_DIR) $(1)/usr/lib 
     66        $(INSTALL_BIN) \ 
     67                $(PKG_INSTALL_DIR)/usr/lib/libminiupnpc.so.* \ 
     68                $(1)/usr/lib/ 
    2669endef 
    2770 
    2871$(eval $(call BuildPackage,miniupnpc)) 
     72$(eval $(call BuildPackage,libminiupnpc)) 
  • packages/net/miniupnpc/patches/100-no_minixml_test.patch

    r23077 r26921  
    1 --- miniupnpc-1.4/Makefile      2009-10-10 12:19:40.000000000 -0700 
    2 +++ miniupnpc-1.4/Makefile      2010-03-03 13:31:02.000000000 -0800 
    3 @@ -67,8 +67,8 @@ 
     1--- a/Makefile 
     2+++ b/Makefile 
     3@@ -107,8 +107,8 @@ installpythonmodule:        pythonmodule 
    44        python setup.py install 
    55  
  • packages/net/miniupnpc/patches/200-miniupnpc_desc.patch

    r23077 r26921  
    1 --- miniupnpc-1.4/upnpcommands.c        2009-07-13 01:44:43.000000000 -0700 
    2 +++ miniupnpc-1.4/upnpcommands.c        2010-03-03 13:33:21.000000000 -0800 
    3 @@ -335,7 +335,7 @@ 
     1--- a/upnpcommands.c 
     2+++ b/upnpcommands.c 
     3@@ -351,7 +351,7 @@ UPNP_AddPortMapping(const char * control 
    44        AddPortMappingArgs[5].elt = "NewEnabled"; 
    55        AddPortMappingArgs[5].val = "1"; 
     
    99        AddPortMappingArgs[7].elt = "NewLeaseDuration"; 
    1010        AddPortMappingArgs[7].val = "0"; 
    11         simpleUPnPcommand(-1, controlURL, servicetype, "AddPortMapping", AddPortMappingArgs, buffer, &bufsize); 
     11        if(simpleUPnPcommand(-1, controlURL, servicetype, "AddPortMapping", AddPortMappingArgs, buffer, &bufsize) < 0) { 
Note: See TracChangeset for help on using the changeset viewer.