net/zerotier/patches/0001-fix-miniupnpc-natpmp-include-paths.patch

   1 From f53004bd22365900a1dbb120dae62ce8b614d31d Mon Sep 17 00:00:00 2001
   2 From: Moritz Warning <moritzwarning@web.de>
   3 Date: Mon, 6 May 2024 22:31:57 +0200
   4 Subject: [PATCH 1/5] fix miniupnpc/natpmp include paths
   5
   6 Signed-off-by: Moritz Warning <moritzwarning@web.de>
   7 ---
   8  make-linux.mk | 6 +++---
   9  1 file changed, 3 insertions(+), 3 deletions(-)
  10
  11 --- a/make-linux.mk
  12 +++ b/make-linux.mk
  13 @@ -26,8 +26,8 @@ TIMESTAMP=$(shell date +"%Y%m%d%H%M")
  14  # otherwise build into binary as done on Mac and Windows.
  15  ONE_OBJS+=osdep/PortMapper.o
  16  override DEFS+=-DZT_USE_MINIUPNPC
  17 -MINIUPNPC_IS_NEW_ENOUGH=$(shell grep -sqr '.*define.*MINIUPNPC_VERSION.*"2..*"' /usr/include/miniupnpc/miniupnpc.h && echo 1)
  18 -#MINIUPNPC_IS_NEW_ENOUGH=$(shell grep -sqr '.*define.*MINIUPNPC_VERSION.*"2.."' /usr/include/miniupnpc/miniupnpc.h && echo 1)
  19 +MINIUPNPC_IS_NEW_ENOUGH=$(shell grep -sqr '.*define.*MINIUPNPC_VERSION.*"2..*"' $(STAGING_DIR)/usr/include/miniupnpc/miniupnpc.h && echo 1)
  20 +#MINIUPNPC_IS_NEW_ENOUGH=$(shell grep -sqr '.*define.*MINIUPNPC_VERSION.*"2.."' $(STAGING_DIR)/usr/include/miniupnpc/miniupnpc.h && echo 1)
  21  ifeq ($(MINIUPNPC_IS_NEW_ENOUGH),1)
  22         override DEFS+=-DZT_USE_SYSTEM_MINIUPNPC
  23         LDLIBS+=-lminiupnpc
  24 @@ -35,7 +35,7 @@ else
  25         override DEFS+=-DMINIUPNP_STATICLIB -DMINIUPNPC_SET_SOCKET_TIMEOUT -DMINIUPNPC_GET_SRC_ADDR -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -DOS_STRING="\"Linux\"" -DMINIUPNPC_VERSION_STRING="\"2.0\"" -DUPNP_VERSION_STRING="\"UPnP/1.1\"" -DENABLE_STRNATPMPERR
  26         ONE_OBJS+=ext/miniupnpc/connecthostport.o ext/miniupnpc/igd_desc_parse.o ext/miniupnpc/minisoap.o ext/miniupnpc/minissdpc.o ext/miniupnpc/miniupnpc.o ext/miniupnpc/miniwget.o ext/miniupnpc/minixml.o ext/miniupnpc/portlistingparse.o ext/miniupnpc/receivedata.o ext/miniupnpc/upnpcommands.o ext/miniupnpc/upnpdev.o ext/miniupnpc/upnperrors.o ext/miniupnpc/upnpreplyparse.o
  27  endif
  28 -ifeq ($(wildcard /usr/include/natpmp.h),)
  29 +ifeq ($(wildcard $(STAGING_DIR)/usr/include/natpmp.h),)
  30         ONE_OBJS+=ext/libnatpmp/natpmp.o ext/libnatpmp/getgateway.o
  31  else
  32         LDLIBS+=-lnatpmp