From 2b5028458e720a6f31ba0944764aa47b753814db Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 25 Jun 2020 14:18:35 -0700 Subject: [PATCH] miniupnpd: update to 2.1.20200510 Use the newly introduced configure script. Use PKG_INSTALL for consistency between packages. Use PKG_BUILD_PARALLEL for faster compilation. Signed-off-by: Rosen Penev --- net/miniupnpd/Makefile | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/net/miniupnpd/Makefile b/net/miniupnpd/Makefile index 86d494402..21631384e 100644 --- a/net/miniupnpd/Makefile +++ b/net/miniupnpd/Makefile @@ -8,17 +8,20 @@ include $(TOPDIR)/rules.mk PKG_NAME:=miniupnpd -PKG_VERSION:=2.1.20191006 -PKG_RELEASE:=6 +PKG_VERSION:=2.1.20200510 +PKG_RELEASE:=1 PKG_SOURCE_URL:=https://miniupnp.tuxfamily.org/files PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_HASH:=218fad7af31f3c22fb4c9db28a55a2a8b5067d41f5b38f52008a057a00d2206d +PKG_HASH:=821e708f369cc1fb851506441fbc3a1f4a1b5a8bf8e84a9e71758a32f5127e8b PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=LICENSE PKG_CPE_ID:=cpe:/a:miniupnp_project:miniupnpd +PKG_INSTALL:=1 +PKG_BUILD_PARALLEL:=1 + include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/version.mk @@ -40,17 +43,16 @@ define Build/Prepare echo "$(VERSION_NUMBER)" | tr '() ' '_' >$(PKG_BUILD_DIR)/os.openwrt endef +CONFIGURE_ARGS = \ + $(if $(CONFIG_IPV6),--ipv6) \ + --igd2 \ + --leasefile \ + --portinuse \ + --firewall=iptables + TARGET_CFLAGS += $(FPIC) -flto TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed -MAKE_FLAGS += \ - TARGET_OPENWRT=1 TEST=0 LIBS="" \ - CC="$(TARGET_CC) -DIPTABLES_143 -lip4tc -luuid \ - $(if $(CONFIG_IPV6),-lip6tc)" \ - CONFIG_OPTIONS="--portinuse --leasefile --igd2 \ - $(if $(CONFIG_IPV6),--ipv6)" \ - -f Makefile.linux miniupnpd - define Package/miniupnpd/install $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_DIR) $(1)/etc/init.d @@ -59,7 +61,7 @@ define Package/miniupnpd/install $(INSTALL_DIR) $(1)/etc/uci-defaults $(INSTALL_DIR) $(1)/usr/share/miniupnpd - $(INSTALL_BIN) $(PKG_BUILD_DIR)/miniupnpd $(1)/usr/sbin/miniupnpd + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/miniupnpd $(1)/usr/sbin/miniupnpd $(INSTALL_BIN) ./files/miniupnpd.init $(1)/etc/init.d/miniupnpd $(INSTALL_CONF) ./files/upnpd.config $(1)/etc/config/upnpd $(INSTALL_DATA) ./files/miniupnpd.hotplug $(1)/etc/hotplug.d/iface/50-miniupnpd