Changeset 35136


Ignore:
Timestamp:
2013-01-13T19:03:27+01:00 (5 years ago)
Author:
jow
Message:

miniupnpd: update to v1.7.20121005 (#9811, #10694, #10829)

  • enable IPv6 support
  • enable lease file support
  • simplify build recipe
Location:
packages/net/miniupnpd
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • packages/net/miniupnpd/Makefile

    r32056 r35136  
    11# 
    2 # Copyright (C) 2006-2012 OpenWrt.org 
     2# Copyright (C) 2006-2013 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    77 
    88include $(TOPDIR)/rules.mk 
    9 include $(INCLUDE_DIR)/kernel.mk 
    109 
    1110PKG_NAME:=miniupnpd 
    12 PKG_VERSION:=1.6.20110730 
    13 PKG_RELEASE:=6 
     11PKG_VERSION:=1.7.20121005 
     12PKG_RELEASE:=1 
    1413 
    1514PKG_SOURCE_URL:=http://miniupnp.free.fr/files 
    1615PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
    17 PKG_MD5SUM:=8bd5c0447b6dc1101b96e958ee67d3ea 
     16PKG_MD5SUM:=d676ef9516ca3fbdd811aee62f2ca724 
    1817 
    1918include $(INCLUDE_DIR)/package.mk 
     
    2221  SECTION:=net 
    2322  CATEGORY:=Network 
    24   DEPENDS:=+iptables +libip4tc 
     23  DEPENDS:=+iptables +libip4tc +IPV6:libip6tc +libnfnetlink 
    2524  TITLE:=Lightweight UPnP daemon 
    2625  SUBMENU:=Firewall 
     
    3332endef 
    3433 
    35 define Build/Compile 
    36         echo "OpenWRT/$(OPENWRTVERSION)" | tr \(\)\  _ >$(PKG_BUILD_DIR)/os.openwrt 
    37         $(MAKE) -C $(PKG_BUILD_DIR) -f Makefile.linux \ 
    38                 $(TARGET_CONFIGURE_OPTS) \ 
    39                 STAGING_DIR="$(STAGING_DIR)" \ 
    40                 CC="$(TARGET_CC)" \ 
    41                 TARGET_OPENWRT=1 \ 
    42                 CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -I$(firstword $(wildcard $(KERNEL_BUILD_DIR)/iptables-*/include)) -DIPTABLES_143" \ 
    43                 LIBS="$(STAGING_DIR)/usr/lib/libip4tc.so" 
     34define Build/Prepare 
     35        $(call Build/Prepare/Default) 
     36        echo "OpenWrt/$(OPENWRTVERSION)" | tr \(\)\  _ >$(PKG_BUILD_DIR)/os.openwrt 
    4437endef 
     38 
     39MAKE_FLAGS += \ 
     40        LIBS="" \ 
     41        CC="$(TARGET_CC) -DIPTABLES_143 -lnfnetlink -lip4tc $(if $(CONFIG_IPV6),-lip6tc)" \ 
     42        CONFIG_OPTIONS="$(if $(CONFIG_IPV6),--ipv6) --leasefile" \ 
     43        -f Makefile.linux \ 
     44        miniupnpd 
    4545 
    4646define Package/miniupnpd/install 
  • packages/net/miniupnpd/files/upnpd.config

    r26205 r35136  
    99        option internal_iface   lan 
    1010        option port             5000 
     11        option upnp_lease_file  /var/upnp.leases 
    1112         
    1213config perm_rule 
Note: See TracChangeset for help on using the changeset viewer.