mirror of https://github.com/bitcoin/bitcoin
Antoine Poinsot
2 weeks ago
parent
953533d021
commit
1b6dec98da
@ -1,36 +0,0 @@
|
||||
package=miniupnpc
|
||||
$(package)_version=2.2.7
|
||||
$(package)_download_path=https://miniupnp.tuxfamily.org/files/
|
||||
$(package)_file_name=$(package)-$($(package)_version).tar.gz
|
||||
$(package)_sha256_hash=b0c3a27056840fd0ec9328a5a9bac3dc5e0ec6d2e8733349cf577b0aa1e70ac1
|
||||
$(package)_patches=dont_leak_info.patch cmake_get_src_addr.patch fix_windows_snprintf.patch
|
||||
$(package)_build_subdir=build
|
||||
|
||||
define $(package)_set_vars
|
||||
$(package)_config_opts = -DUPNPC_BUILD_SAMPLE=OFF -DUPNPC_BUILD_SHARED=OFF
|
||||
$(package)_config_opts += -DUPNPC_BUILD_STATIC=ON -DUPNPC_BUILD_TESTS=OFF
|
||||
$(package)_config_opts_mingw32 += -DMINIUPNPC_TARGET_WINDOWS_VERSION=0x0601
|
||||
endef
|
||||
|
||||
define $(package)_preprocess_cmds
|
||||
patch -p1 < $($(package)_patch_dir)/dont_leak_info.patch && \
|
||||
patch -p1 < $($(package)_patch_dir)/cmake_get_src_addr.patch && \
|
||||
patch -p1 < $($(package)_patch_dir)/fix_windows_snprintf.patch
|
||||
endef
|
||||
|
||||
define $(package)_config_cmds
|
||||
$($(package)_cmake) -S .. -B .
|
||||
endef
|
||||
|
||||
define $(package)_build_cmds
|
||||
$(MAKE)
|
||||
endef
|
||||
|
||||
define $(package)_stage_cmds
|
||||
cmake --install . --prefix $($(package)_staging_prefix_dir)
|
||||
endef
|
||||
|
||||
define $(package)_postprocess_cmds
|
||||
rm -rf bin && \
|
||||
rm -rf share
|
||||
endef
|
||||
@ -1,22 +0,0 @@
|
||||
commit cb2026239c2a3aff393952ccb0ee1c448189402d
|
||||
Author: fanquake <fanquake@gmail.com>
|
||||
Date: Fri Mar 22 14:03:54 2024 +0000
|
||||
|
||||
build: add MINIUPNPC_GET_SRC_ADDR to CMake build
|
||||
|
||||
This mirrors the autotools build.
|
||||
|
||||
See https://github.com/miniupnp/miniupnp/pull/721.
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 1aa95a8..0cacf3e 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -31,6 +31,7 @@ endif ()
|
||||
if (NOT WIN32)
|
||||
target_compile_definitions(miniupnpc-private INTERFACE
|
||||
MINIUPNPC_SET_SOCKET_TIMEOUT
|
||||
+ MINIUPNPC_GET_SRC_ADDR
|
||||
_BSD_SOURCE _DEFAULT_SOURCE)
|
||||
if (NOT APPLE AND NOT CMAKE_SYSTEM_NAME MATCHES ".*BSD" AND NOT CMAKE_SYSTEM_NAME STREQUAL "SunOS")
|
||||
# add_definitions (-D_POSIX_C_SOURCE=200112L)
|
||||
@ -1,32 +0,0 @@
|
||||
commit 51f6dd991c29af66fb4f64c6feb2787cce23a1a7
|
||||
Author: fanquake <fanquake@gmail.com>
|
||||
Date: Mon Jan 8 11:21:40 2024 +0000
|
||||
|
||||
Don't leak OS and miniupnpc version info in User-Agent
|
||||
|
||||
diff --git a/src/minisoap.c b/src/minisoap.c
|
||||
index 903ac5f..046e0ea 100644
|
||||
--- a/src/minisoap.c
|
||||
+++ b/src/minisoap.c
|
||||
@@ -90,7 +90,7 @@ int soapPostSubmit(SOCKET fd,
|
||||
headerssize = snprintf(headerbuf, sizeof(headerbuf),
|
||||
"POST %s HTTP/%s\r\n"
|
||||
"Host: %s%s\r\n"
|
||||
- "User-Agent: " OS_STRING " " UPNP_VERSION_STRING " MiniUPnPc/" MINIUPNPC_VERSION_STRING "\r\n"
|
||||
+ "User-Agent: " UPNP_VERSION_STRING "\r\n"
|
||||
"Content-Length: %d\r\n"
|
||||
#if (UPNP_VERSION_MAJOR == 1) && (UPNP_VERSION_MINOR == 0)
|
||||
"Content-Type: text/xml\r\n"
|
||||
diff --git a/src/miniwget.c b/src/miniwget.c
|
||||
index e76a5e5..0cc36fe 100644
|
||||
--- a/src/miniwget.c
|
||||
+++ b/src/miniwget.c
|
||||
@@ -444,7 +444,7 @@ miniwget3(const char * host,
|
||||
"GET %s HTTP/%s\r\n"
|
||||
"Host: %s:%d\r\n"
|
||||
"Connection: Close\r\n"
|
||||
- "User-Agent: " OS_STRING " " UPNP_VERSION_STRING " MiniUPnPc/" MINIUPNPC_VERSION_STRING "\r\n"
|
||||
+ "User-Agent: " UPNP_VERSION_STRING "\r\n"
|
||||
|
||||
"\r\n",
|
||||
path, httpversion, host, port);
|
||||
@ -1,25 +0,0 @@
|
||||
commit a1e9de80ab99b4c956a6a4e21d3e0de6f7a1014d
|
||||
Author: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
|
||||
Date: Sat Apr 20 15:14:47 2024 +0100
|
||||
|
||||
Fix macro expression that guards `snprintf` for Windows
|
||||
|
||||
Otherwise, the `snprintf` is still wrongly emulated for the following
|
||||
cases:
|
||||
- mingw-w64 6.0.0 or new with ucrt
|
||||
- mingw-w64 8.0.0 or new with iso c ext
|
||||
|
||||
--- a/src/win32_snprintf.h
|
||||
+++ b/src/win32_snprintf.h
|
||||
@@ -23,9 +23,9 @@
|
||||
(defined(_MSC_VER) && _MSC_VER < 1900) /* Visual Studio older than 2015 */ || \
|
||||
(defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR) && defined(__NO_ISOCEXT)) /* mingw32 without iso c ext */ || \
|
||||
(defined(__MINGW64_VERSION_MAJOR) && /* mingw-w64 not ... */ !( \
|
||||
- (defined (__USE_MINGW_ANSI_STDIO) && __USE_MINGW_ANSI_STDIO != 0)) /* ... with ansi stdio */ || \
|
||||
+ (defined (__USE_MINGW_ANSI_STDIO) && __USE_MINGW_ANSI_STDIO != 0) /* ... with ansi stdio */ || \
|
||||
(__MINGW64_VERSION_MAJOR >= 6 && defined(_UCRT)) /* ... at least 6.0.0 with ucrt */ || \
|
||||
- (__MINGW64_VERSION_MAJOR >= 8 && !defined(__NO_ISOCEXT)) /* ... at least 8.0.0 with iso c ext */ || \
|
||||
+ (__MINGW64_VERSION_MAJOR >= 8 && !defined(__NO_ISOCEXT))) /* ... at least 8.0.0 with iso c ext */ || \
|
||||
0) || \
|
||||
0)
|
||||
|
||||
Loading…
Reference in new issue