diff --git a/Makefile b/Makefile index 42cd50a..c8900c7 100644 --- a/Makefile +++ b/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=miniupnpd -PKG_VERSION:=2.3.6 +PKG_VERSION:=2.3.7 PKG_RELEASE:=1 PKG_SOURCE_URL:=https://miniupnp.tuxfamily.org/files PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_HASH:=11ca7bf4d4ba6c6ba12c70c3041807f516f4d9f6b6697bea04e837626b9d679c +PKG_HASH:=fbdd5501039730f04a8420ea2f8f54b7df63f9f04cde2dc67fa7371e80477bbe PKG_MAINTAINER:= PKG_LICENSE:=BSD-3-Clause @@ -79,7 +79,8 @@ CONFIGURE_ARGS = \ --leasefile \ --portinuse \ --firewall=$(BUILD_VARIANT) \ - --disable-fork + --disable-fork \ + --regex TARGET_CFLAGS += $(FPIC) TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed diff --git a/patches/300-macos-compat.patch b/patches/300-macos-compat.patch index 53c0e3c..8a569f3 100644 --- a/patches/300-macos-compat.patch +++ b/patches/300-macos-compat.patch @@ -20,17 +20,3 @@ endif TESTUPNPDESCGENOBJS = testupnpdescgen.o upnpdescgen.o -@@ -143,11 +143,11 @@ install: miniupnpd $(SRCDIR)/miniupnpd.8 - $(INSTALL) $(SRCDIR)/netfilter/ip6tables_init.sh $(DESTDIR)$(ETCINSTALLDIR) - $(INSTALL) $(SRCDIR)/netfilter/ip6tables_removeall.sh $(DESTDIR)$(ETCINSTALLDIR) - $(INSTALL) $(SRCDIR)/netfilter/miniupnpd_functions.sh $(DESTDIR)$(ETCINSTALLDIR) -- $(INSTALL) --mode=0644 -b $(SRCDIR)/miniupnpd.conf $(DESTDIR)$(ETCINSTALLDIR) -+ $(INSTALL) -m 0644 -b $(SRCDIR)/miniupnpd.conf $(DESTDIR)$(ETCINSTALLDIR) - $(INSTALL) -d $(DESTDIR)$(PREFIX)/etc/init.d - $(INSTALL) $(SRCDIR)/linux/miniupnpd.init.d.script $(DESTDIR)$(PREFIX)/etc/init.d/miniupnpd - $(INSTALL) -d $(DESTDIR)$(MANINSTALLDIR) -- $(INSTALL) --mode=0644 $(SRCDIR)/miniupnpd.8 $(DESTDIR)$(MANINSTALLDIR) -+ $(INSTALL) -m 0644 $(SRCDIR)/miniupnpd.8 $(DESTDIR)$(MANINSTALLDIR) - gzip -f $(DESTDIR)$(MANINSTALLDIR)/miniupnpd.8 - - # genuuid is using the uuidgen CLI tool which is part of libuuid