diff options
| author | Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> | 2020-06-28 15:52:41 +0100 |
|---|---|---|
| committer | Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> | 2020-07-01 10:16:43 +0100 |
| commit | 0189c45253f063aace88599599b161c669fe8a30 (patch) | |
| tree | d184789594ff2febb1442bb825587f2db8b5dc12 | |
| parent | dba502a2125e2dc6521bf62e54897586e3f0bf11 (diff) | |
miniupnpd: macosx compat and refresh patches
Tidy up some minor patch fuzz with a refresh.
Also tweak the linux makefile to make it run on macosx and linux:
install only understand -m for filemode, not that the openwrt staging
dir understands file modes. Also glibc>2.17 so patch out the check that
otherwise barfs a number of errors from a missing 'ldd' command under
macos.
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
| -rw-r--r-- | net/miniupnpd/patches/100-no-daemon.patch | 2 | ||||
| -rw-r--r-- | net/miniupnpd/patches/300-macos-compat.patch | 36 |
2 files changed, 37 insertions, 1 deletions
diff --git a/net/miniupnpd/patches/100-no-daemon.patch b/net/miniupnpd/patches/100-no-daemon.patch index 3d51fcaa7..9b9c26daa 100644 --- a/net/miniupnpd/patches/100-no-daemon.patch +++ b/net/miniupnpd/patches/100-no-daemon.patch @@ -1,6 +1,6 @@ --- a/miniupnpd.c +++ b/miniupnpd.c -@@ -1727,21 +1727,7 @@ init(int argc, char * * argv, struct runtime_vars * v) +@@ -1769,21 +1769,7 @@ init(int argc, char * * argv, struct run } } diff --git a/net/miniupnpd/patches/300-macos-compat.patch b/net/miniupnpd/patches/300-macos-compat.patch new file mode 100644 index 000000000..ccd5de993 --- /dev/null +++ b/net/miniupnpd/patches/300-macos-compat.patch @@ -0,0 +1,36 @@ +--- a/Makefile.linux ++++ b/Makefile.linux +@@ -94,13 +94,13 @@ $(info please install uuid-dev package / + endif # ($(TEST),1) + endif # ($(TARGET_OPENWRT,) + +-GLIBC_VERSION := $(shell ldd --version | head -n 1 | sed 's/^.* //') +-GLIBC_VERSION_MAJOR = $(shell echo $(GLIBC_VERSION) | cut -f 1 -d . ) +-GLIBC_VERSION_MINOR = $(shell echo $(GLIBC_VERSION) | cut -f 2 -d . ) ++#GLIBC_VERSION := $(shell ldd --version | head -n 1 | sed 's/^.* //') ++#GLIBC_VERSION_MAJOR = $(shell echo $(GLIBC_VERSION) | cut -f 1 -d . ) ++#GLIBC_VERSION_MINOR = $(shell echo $(GLIBC_VERSION) | cut -f 2 -d . ) + # clock_gettime() needs -lrt when glibc version < 2.17 +-LDLIBS += $(shell if [ $(GLIBC_VERSION_MAJOR) -lt 2 ] \ +- || [ \( $(GLIBC_VERSION_MAJOR) -eq 2 \) -a \( $(GLIBC_VERSION_MINOR) -lt 17 \) ] ; \ +- then echo "-lrt" ; fi ) ++#LDLIBS += $(shell if [ $(GLIBC_VERSION_MAJOR) -lt 2 ] \ ++# || [ \( $(GLIBC_VERSION_MAJOR) -eq 2 \) -a \( $(GLIBC_VERSION_MINOR) -lt 17 \) ] ; \ ++# then echo "-lrt" ; fi ) + + TESTUPNPDESCGENOBJS = testupnpdescgen.o upnpdescgen.o + +@@ -140,11 +140,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 |