upgrade force-upnp-natpmp versions

ygrek · Aug 17, 2024 · bad3aef · bad3aef
1 parent a22b318
commit bad3aef
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/config/configure.in b/config/configure.in
@@ -697,15 +697,19 @@ fi
 if test "$UPNP_NATPMP_FORCE" = "yes"; then
 	UPNP_NATPMP=yes
 	cd $PATCH_DIR
-	MINIUPNPC=miniupnpc-2.1
-	LIBNATPMP=libnatpmp-20150609
+	MINIUPNPC=miniupnpc-2.2.8
+	LIBNATPMP=libnatpmp-20230423
 	$WGET http://miniupnp.tuxfamily.org/files/$MINIUPNPC.tar.gz
 	$WGET http://miniupnp.tuxfamily.org/files/$LIBNATPMP.tar.gz
 	mkdir -p $BUILD_DIR $LOCAL_DIR/usr/bin $LOCAL_DIR/usr/lib $LOCAL_DIR/usr/include/miniupnpc
 	cd $BUILD_DIR
 	rm -rf $LIBNATPMP $MINIUPNPC
 	tar -xzf $PATCH_DIR/$MINIUPNPC.tar.gz
 	tar -xzf $PATCH_DIR/$LIBNATPMP.tar.gz
+	if test -f $PATCH_DIR/$LIBNATPMP.patch; then
+	  echo Patching ...
+	  patch -p0 < $PATCH_DIR/$LIBNATPMP.patch
+	fi
 	cd $BUILD_DIR/$LIBNATPMP
 	$GNU_MAKE all install PREFIX=$LOCAL_DIR
 	cd $BUILD_DIR/$MINIUPNPC

diff --git a/patches/libnatpmp-20230423.patch b/patches/libnatpmp-20230423.patch
@@ -0,0 +1,12 @@
+diff -ur libnatpmp-20230423/Makefile build/libnatpmp-20230423/Makefile
+--- libnatpmp-20230423/Makefile	2013-12-09 15:52:28.000000000 -0500
++++ build/libnatpmp-20230423/Makefile	2024-08-17 01:01:12.098281283 -0400
+@@ -56,7 +56,7 @@
+ endif
+ endif
+
+-HEADERS = natpmp.h
++HEADERS = natpmp.h natpmp_declspec.h
+
+ EXECUTABLES = testgetgateway natpmpc-shared natpmpc-static
+