build: use newer source for libnatpmp #21209

fanquake · 2021-02-17T07:20:38Z

The source we are currently using is from 2015. The upstream repo has
received a small number of bug fixes and improvements since then.
Including one that fixes an issue for Windows users: miniupnp/libnatpmp#13.

The source we are currently using is the most recent "official" release,
however I don't think it's worth waiting for a new one. The maintainer
was prompted to do so in Oct 2020, then again in Jan of this year, and
no release has eventuated. Given libnatpmp is a new inclusion into our
repository, I think we should be using this newer source.

This also cleans up a few warnings we currently see in Windows depends builds:

Extracting libnatpmp...
/home/ubuntu/bitcoin/depends/sources/libnatpmp-20150609.tar.gz: OK
Preprocessing libnatpmp...
Configuring libnatpmp...
Building libnatpmp...
make[1]: Entering directory '/home/ubuntu/bitcoin/depends/work/build/x86_64-w64-mingw32/libnatpmp/20150609-13efa1beb87'
x86_64-w64-mingw32-gcc -Os -fPIC -Wall -DENABLE_STRNATPMPERR   -c -o natpmp.o natpmp.c
x86_64-w64-mingw32-gcc -Os -fPIC -Wall -DENABLE_STRNATPMPERR   -c -o getgateway.o getgateway.c
natpmp.c:42: warning: "EWOULDBLOCK" redefined
   42 | #define EWOULDBLOCK WSAEWOULDBLOCK
      |
In file included from natpmp.c:38:
/usr/share/mingw-w64/include/errno.h:166: note: this is the location of the previous definition
  166 | #define EWOULDBLOCK 140
      |
natpmp.c:43: warning: "ECONNREFUSED" redefined
   43 | #define ECONNREFUSED WSAECONNREFUSED
      |
In file included from natpmp.c:38:
/usr/share/mingw-w64/include/errno.h:110: note: this is the location of the previous definition
  110 | #define ECONNREFUSED 107
      |
natpmp.c:271:5: warning: ‘readnatpmpresponseorretry’ redeclared without dllimport attribute: previous dllimport ignored [-Wattributes]
  271 | int readnatpmpresponseorretry(natpmp_t * p, natpmpresp_t * response)
      |     ^~~~~~~~~~~~~~~~~~~~~~~~~
ar crs libnatpmp.a natpmp.o getgateway.o
make[1]: Leaving directory '/home/ubuntu/bitcoin/depends/work/build/x86_64-w64-mingw32/libnatpmp/20150609-13efa1beb87'
Staging libnatpmp...
Postprocessing libnatpmp...
Caching libnatpmp...

hebasto · 2021-02-17T07:31:55Z

Concept ACK.

Are there steps to reproduce the bug, that was fixed in miniupnp/libnatpmp#13, on a Windows 10 machine?

hebasto · 2021-02-17T08:36:27Z

On macOS

bitcoin/depends/packages/libnatpmp.mk

Line 12 in 6d3d7ac

$(MAKE) libnatpmp.a $($(package)_build_opts)

becomes (https://cirrus-ci.com/task/4969862553403392?command=ci#L1115)

static -o libnatpmp.a natpmp.o getgateway.o

Does it related to some recent changes in the build system?

fanquake · 2021-02-17T09:02:58Z

Does it related to some recent changes in the build system?

Oops. Thanks. We just now have to tell it how to find libtool. The macOS cross build should be ok now.

hebasto · 2021-02-17T12:57:25Z

@fanquake

We just now have to tell it how to find libtool.

Out of curiosity, what does cause this need now?

fanquake · 2021-02-17T13:28:13Z

Out of curiosity, what does cause this need now?

Looks like it's the changes: miniupnp/libnatpmp@73968c9.

Prior to this commit, ar crs was being used unconditionally for building the static library. After this change, the Makefile uses libtool for macOS builds, with libtool being set via LIBTOOL ?= $(shell which libtool). However, in our macOS depends environment, which libtool wont return anything, which is why you saw static -o libnatpmp.a natpmp.o getgateway.o in the build logs, and why we now need to set LIBTOOL explicitly (note we do the same for miniupnpc).

Thus you would normally end up with:

libtool static -o libnatpmp.a natpmp.o getgateway.o

or for the case of our depends build, it's currently:

depends/x86_64-apple-darwin18/native/bin/x86_64-apple-darwin18-libtool -static -o libnatpmp.a natpmp.o getgateway.o

hebasto · 2021-02-17T13:31:42Z

Out of curiosity, what does cause this need now?

Looks like it's the changes: miniupnp/libnatpmp@73968c9.

Many thanks for explanation.

Sorry for re-iterating:

Are there steps to reproduce the bug, that was fixed in miniupnp/libnatpmp#13, on a Windows 10 machine?

fanquake · 2021-02-17T14:16:04Z

Sorry for re-iterating:

No worries. I don't currently have any steps to reproduce the issue.

hebasto · 2021-02-17T19:03:49Z

The patch is correct, but I'm a bit reluctant to ACK update to a branch that:

is not a proved bugfix
has no long history of wide testing

laanwj · 2021-02-26T10:03:50Z

The patch is correct, but I'm a bit reluctant to ACK update to a branch that:

You have a point, though if the maintainer has stopped tagging releases but otherwise the project is still making fixes, we have to switch to tracking commits at some point. Still it is good to be careful and see if the gain outweighs the risk.

hebasto · 2021-02-26T19:24:40Z

Just for the reference, Homebrew suggests the 20150609 version (which is our current version).

Currently, our cross-compile of libnatpmp for macOS doesn't work at all. The wrong archiver is used, which produces an archive the linker doesn't like. This becomes clear when configuring: ```bash configure:25722: checking for initnatpmp in -lnatpmp configure:25747: env -u C_INCLUDE_PATH -u CPLUS_INCLUDE_PATH -u OBJC_INCLUDE_PATH -u OBJCPLUS_INCLUDE_PATH -u CPATH -u LIBRARY_PATH /home/ubuntu/bitcoin/depends/x86_64-apple-darwin18/native/bin/clang++ --target=x86_64-apple-darwin18 <trim> -Wl,-headerpad_max_install_names -Wl,-dead_strip -Wl,-dead_strip_dylibs conftest.cpp -lnatpmp >&5 ld: archive has no table of contents for architecture x86_64 clang: error: linker command failed with exit code 1 (use -v to see invocation) ``` Fix this by using the right `ar` (we do the same for upnp). While we're at it, we fixe the build so that we are using our c/ppflags. This means building with `-O2` rather than `-Os`. Note that this fixes an issue that is also fixed by bitcoin#21209. However, given there are reservations about updating to use a newer libnatpmp source, we should just fix this for now.

DrahtBot · 2021-03-01T13:29:56Z

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Conflicts

No conflicts as of last run.

bd49ac4 build: fix libnatpmp macos cross compile (fanquake) Pull request description: Currently, our cross-compile of libnatpmp for macOS doesn't work at all. The wrong archiver is used, which produces an archive the linker doesn't like. This becomes clear when configuring: ```bash configure:25722: checking for initnatpmp in -lnatpmp configure:25747: env -u C_INCLUDE_PATH -u CPLUS_INCLUDE_PATH -u OBJC_INCLUDE_PATH -u OBJCPLUS_INCLUDE_PATH -u CPATH -u LIBRARY_PATH /home/ubuntu/bitcoin/depends/x86_64-apple-darwin18/native/bin/clang++ --target=x86_64-apple-darwin18 <trim> -Wl,-headerpad_max_install_names -Wl,-dead_strip -Wl,-dead_strip_dylibs conftest.cpp -lnatpmp >&5 ld: archive has no table of contents for architecture x86_64 clang: error: linker command failed with exit code 1 (use -v to see invocation) ``` Fix this by using the right `ar` (we do the same for upnp). While we're at it, fix the build so that we are using our c/ppflags. In practice this basically means building with `-O2` rather than `-Os`. Note that this fixes an issue that is also fixed by #21209. However, given there are reservations about updating to use a newer libnatpmp source, we should just fix this for now. ACKs for top commit: hebasto: ACK bd49ac4, tested: Tree-SHA512: 2efc2c788ef3ebebfbf564ef07b6cf63a72d8a0bccc22b0ba36537216aa575436b7e87088477e85f6d9191ad34f0b13f1c22cf88c90e1cb81641bfee5dc3058a

bd49ac4 build: fix libnatpmp macos cross compile (fanquake) Pull request description: Currently, our cross-compile of libnatpmp for macOS doesn't work at all. The wrong archiver is used, which produces an archive the linker doesn't like. This becomes clear when configuring: ```bash configure:25722: checking for initnatpmp in -lnatpmp configure:25747: env -u C_INCLUDE_PATH -u CPLUS_INCLUDE_PATH -u OBJC_INCLUDE_PATH -u OBJCPLUS_INCLUDE_PATH -u CPATH -u LIBRARY_PATH /home/ubuntu/bitcoin/depends/x86_64-apple-darwin18/native/bin/clang++ --target=x86_64-apple-darwin18 <trim> -Wl,-headerpad_max_install_names -Wl,-dead_strip -Wl,-dead_strip_dylibs conftest.cpp -lnatpmp >&5 ld: archive has no table of contents for architecture x86_64 clang: error: linker command failed with exit code 1 (use -v to see invocation) ``` Fix this by using the right `ar` (we do the same for upnp). While we're at it, fix the build so that we are using our c/ppflags. In practice this basically means building with `-O2` rather than `-Os`. Note that this fixes an issue that is also fixed by bitcoin#21209. However, given there are reservations about updating to use a newer libnatpmp source, we should just fix this for now. ACKs for top commit: hebasto: ACK bd49ac4, tested: Tree-SHA512: 2efc2c788ef3ebebfbf564ef07b6cf63a72d8a0bccc22b0ba36537216aa575436b7e87088477e85f6d9191ad34f0b13f1c22cf88c90e1cb81641bfee5dc3058a

The source we are currently using is from 2015. The upstream repo has received a small number of bug fixes and improvements since then. Including one that fixes an issue for Windows users: miniupnp/libnatpmp#13. The source we are currently using is the most recent "official" release, however I don't think it's worth waiting for a new one. The maintainer was prompted to do so in Oct 2020, then again in Jan of this year, and no release has eventuated. Given libnatpmp is a new inclusion into our repository, I think we should be using this newer source. This also cleans up a few warnings we currently see in depends builds: ```bash Extracting libnatpmp... /home/ubuntu/bitcoin/depends/sources/libnatpmp-20150609.tar.gz: OK Preprocessing libnatpmp... Configuring libnatpmp... Building libnatpmp... make[1]: Entering directory '/home/ubuntu/bitcoin/depends/work/build/x86_64-w64-mingw32/libnatpmp/20150609-13efa1beb87' x86_64-w64-mingw32-gcc -Os -fPIC -Wall -DENABLE_STRNATPMPERR -c -o natpmp.o natpmp.c x86_64-w64-mingw32-gcc -Os -fPIC -Wall -DENABLE_STRNATPMPERR -c -o getgateway.o getgateway.c natpmp.c:42: warning: "EWOULDBLOCK" redefined 42 | #define EWOULDBLOCK WSAEWOULDBLOCK | In file included from natpmp.c:38: /usr/share/mingw-w64/include/errno.h:166: note: this is the location of the previous definition 166 | #define EWOULDBLOCK 140 | natpmp.c:43: warning: "ECONNREFUSED" redefined 43 | #define ECONNREFUSED WSAECONNREFUSED | In file included from natpmp.c:38: /usr/share/mingw-w64/include/errno.h:110: note: this is the location of the previous definition 110 | #define ECONNREFUSED 107 | natpmp.c:271:5: warning: ‘readnatpmpresponseorretry’ redeclared without dllimport attribute: previous dllimport ignored [-Wattributes] 271 | int readnatpmpresponseorretry(natpmp_t * p, natpmpresp_t * response) | ^~~~~~~~~~~~~~~~~~~~~~~~~ ar crs libnatpmp.a natpmp.o getgateway.o make[1]: Leaving directory '/home/ubuntu/bitcoin/depends/work/build/x86_64-w64-mingw32/libnatpmp/20150609-13efa1beb87' Staging libnatpmp... Postprocessing libnatpmp... Caching libnatpmp... ```

This fixes linking issues and mirrors what we do with miniupnpc.

fanquake · 2021-03-04T04:45:02Z

I've updated this PR to also fix the issue described in #21350. We define and use NATPMP_STATICLIB, similar to how we use MINIUPNP_STATICLIB. STATICLIB is also included, because both of these defines used to be STATICLIB, so if someone wass using an older source (actually the commit after what is in our current tarball, miniupnp/libnatpmp@d5d2d6d) , they would need that defined instead.

A couple additional points:

Even though our current source tarball is named 20150609, that is misleading, as the source inside is actually this commit: miniupnp/libnatpmp@f376ab7, from April 2014..

This means the source is missing even more fixes than first though, including a some related to the windows cross compile, i.e: miniupnp/libnatpmp@cf7f452.

I think this is even more argument to move to the latest source. Otherwise we are just going to have to start applying patches to our build anyway. I'm planning on upstreaming some changes to https://github.com/miniupnp/libnatpmp/. Maybe that will spur the author into tagging a new release at some point soon.

fanquake · 2021-03-04T06:34:47Z

Guix builds at 7af2502:

bash-5.1# find output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
1ff0a38e72aba62097e0dc1232104542a9d363e577c25b710b250db78cd876a2  output/bitcoin-7af25024e956-aarch64-linux-gnu-debug.tar.gz
c53e3b36343053fd99794232147a01c4b6742a8fd62005804e6b47c8b6b05933  output/bitcoin-7af25024e956-aarch64-linux-gnu.tar.gz
a8343f9ba8a48787f9a752591bb34e216ce81807efcfcaecd649bfc36976e1af  output/bitcoin-7af25024e956-arm-linux-gnueabihf-debug.tar.gz
50b92e5a3835fe3d5169baa4e0d300700e0cc9c665eb23c2fc1d94e8fa2ad3b7  output/bitcoin-7af25024e956-arm-linux-gnueabihf.tar.gz
5bff7037bd2354a232fa49870c4445a260b47e565118ad690808f6d4e86bab3e  output/bitcoin-7af25024e956-osx-unsigned.dmg
ad390dcef15db2e27d2a9ff645201a71defc3a468bc28bd8c633ccdbfdddc927  output/bitcoin-7af25024e956-osx-unsigned.tar.gz
7cfd3d90b32da70858f7e5bbd01fcc1bd11043e0f553e5fa51c3e7be500b9876  output/bitcoin-7af25024e956-osx64.tar.gz
ff641a1efac1ef3135926c1256b79a1a1836b2642517eefd87f1b98aeaca6f4b  output/bitcoin-7af25024e956-powerpc64-linux-gnu-debug.tar.gz
5ca45d13dea11d248c46196b07a98854716a108d9fb9039d168c7a4442ef5881  output/bitcoin-7af25024e956-powerpc64-linux-gnu.tar.gz
452659a9981b784fb3613278a20c5773945b87f9f2b3a0d588fc00762ffc3f35  output/bitcoin-7af25024e956-powerpc64le-linux-gnu-debug.tar.gz
3ef3a063dfe0af25b32c35d86e2ee986b8c866d3cd6baad4213bc636aea09c0d  output/bitcoin-7af25024e956-powerpc64le-linux-gnu.tar.gz
c16b092ac98e419c49ca80cefb9faa743ee8d55161ffce30672bbaf280c047d8  output/bitcoin-7af25024e956-riscv64-linux-gnu-debug.tar.gz
9afdf1d981d0ee7494e86633fe563c092ea4ef8e314665c3a3319dadbdb70832  output/bitcoin-7af25024e956-riscv64-linux-gnu.tar.gz
08edaef880ae35257140fc53a8752e7c0619b2d2890d7ee867548f3da61c36d4  output/bitcoin-7af25024e956-win-unsigned.tar.gz
22c5990c60511f794a222d821c51bddcd06ccc8f1c280c91779bdc4e72729bd8  output/bitcoin-7af25024e956-win64-debug.zip
486347fc37cf51a2c68154d16febda59563d6f85def81a49604c10d6e70cf888  output/bitcoin-7af25024e956-win64-setup-unsigned.exe
92e6591faf775b772a764b0ade11ad43e7be10efbfcc21193417abec9c626585  output/bitcoin-7af25024e956-win64.zip
b87bb8aa05b47ba976fd007d899c14aacc23cd5315340d52231885e5963fe5fa  output/bitcoin-7af25024e956-x86_64-linux-gnu-debug.tar.gz
87bb163a401386e34a649945534fbab44d396ed876afa318abd9418f7404972b  output/bitcoin-7af25024e956-x86_64-linux-gnu.tar.gz
d05f6c0a4255e2255f3a9e1d808b511dee5783c422c2ea262a6a5df7135177e0  output/src/bitcoin-7af25024e956.tar.gz

hebasto

Approach ACK 7af2502

Even though our current source tarball is named 20150609, that is misleading, as the source inside is actually this commit: miniupnp/libnatpmp@f376ab7, from April 2014..

Agree.

hebasto · 2021-03-04T07:16:47Z

configure.ac

@@ -1669,6 +1669,9 @@ else
    fi
    AC_MSG_RESULT($use_natpmp_default)
    AC_DEFINE_UNQUOTED([USE_NATPMP], [$natpmp_setting], [NAT-PMP support not compiled if undefined, otherwise value (0 or 1) determines default state])
+    if test x$TARGET_OS = xwindows; then
+      NATPMP_CPPFLAGS="-DSTATICLIB -DNATPMP_STATICLIB"


STATICLIB is also included, because both of these defines used to be STATICLIB, so if someone wass using an older source (actually the commit after what is in our current tarball, miniupnp/libnatpmp@d5d2d6d) , they would need that defined instead.

~~I'm not follow why do we need -DSTATICLIB now?~~

laanwj · 2021-03-04T09:56:21Z

Concept/Approach ACK, agree with @fanquake's reasoning

hebasto

ACK 7af2502

Guix build:

$ find output -type f -name *$(git rev-parse --short HEAD)*.* -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
1ff0a38e72aba62097e0dc1232104542a9d363e577c25b710b250db78cd876a2  output/bitcoin-7af25024e956-aarch64-linux-gnu-debug.tar.gz
c53e3b36343053fd99794232147a01c4b6742a8fd62005804e6b47c8b6b05933  output/bitcoin-7af25024e956-aarch64-linux-gnu.tar.gz
a8343f9ba8a48787f9a752591bb34e216ce81807efcfcaecd649bfc36976e1af  output/bitcoin-7af25024e956-arm-linux-gnueabihf-debug.tar.gz
50b92e5a3835fe3d5169baa4e0d300700e0cc9c665eb23c2fc1d94e8fa2ad3b7  output/bitcoin-7af25024e956-arm-linux-gnueabihf.tar.gz
5bff7037bd2354a232fa49870c4445a260b47e565118ad690808f6d4e86bab3e  output/bitcoin-7af25024e956-osx-unsigned.dmg
ad390dcef15db2e27d2a9ff645201a71defc3a468bc28bd8c633ccdbfdddc927  output/bitcoin-7af25024e956-osx-unsigned.tar.gz
7cfd3d90b32da70858f7e5bbd01fcc1bd11043e0f553e5fa51c3e7be500b9876  output/bitcoin-7af25024e956-osx64.tar.gz
ff641a1efac1ef3135926c1256b79a1a1836b2642517eefd87f1b98aeaca6f4b  output/bitcoin-7af25024e956-powerpc64-linux-gnu-debug.tar.gz
5ca45d13dea11d248c46196b07a98854716a108d9fb9039d168c7a4442ef5881  output/bitcoin-7af25024e956-powerpc64-linux-gnu.tar.gz
452659a9981b784fb3613278a20c5773945b87f9f2b3a0d588fc00762ffc3f35  output/bitcoin-7af25024e956-powerpc64le-linux-gnu-debug.tar.gz
3ef3a063dfe0af25b32c35d86e2ee986b8c866d3cd6baad4213bc636aea09c0d  output/bitcoin-7af25024e956-powerpc64le-linux-gnu.tar.gz
c16b092ac98e419c49ca80cefb9faa743ee8d55161ffce30672bbaf280c047d8  output/bitcoin-7af25024e956-riscv64-linux-gnu-debug.tar.gz
9afdf1d981d0ee7494e86633fe563c092ea4ef8e314665c3a3319dadbdb70832  output/bitcoin-7af25024e956-riscv64-linux-gnu.tar.gz
08edaef880ae35257140fc53a8752e7c0619b2d2890d7ee867548f3da61c36d4  output/bitcoin-7af25024e956-win-unsigned.tar.gz
22c5990c60511f794a222d821c51bddcd06ccc8f1c280c91779bdc4e72729bd8  output/bitcoin-7af25024e956-win64-debug.zip
486347fc37cf51a2c68154d16febda59563d6f85def81a49604c10d6e70cf888  output/bitcoin-7af25024e956-win64-setup-unsigned.exe
92e6591faf775b772a764b0ade11ad43e7be10efbfcc21193417abec9c626585  output/bitcoin-7af25024e956-win64.zip
b87bb8aa05b47ba976fd007d899c14aacc23cd5315340d52231885e5963fe5fa  output/bitcoin-7af25024e956-x86_64-linux-gnu-debug.tar.gz
87bb163a401386e34a649945534fbab44d396ed876afa318abd9418f7404972b  output/bitcoin-7af25024e956-x86_64-linux-gnu.tar.gz
d05f6c0a4255e2255f3a9e1d808b511dee5783c422c2ea262a6a5df7135177e0  output/src/bitcoin-7af25024e956.tar.gz

laanwj · 2021-03-05T15:24:47Z

I get the same Guix output as @hebasto.

DrahtBot · 2021-03-07T04:03:15Z

Guix builds

File	commit `b4d2265` (master)	commit `765be8d` (master and this pull)
*-aarch64-linux-gnu-debug.tar.gz	`6a823a1f747b82d7...`	`f1d3a283d0442c59...`
*-aarch64-linux-gnu.tar.gz	`854ba7d7fbe90d6d...`	`a0bc041d99ca7462...`
*-arm-linux-gnueabihf-debug.tar.gz	`0e2c46d1d20c94aa...`	`ec916fcc5f86cb0d...`
*-arm-linux-gnueabihf.tar.gz	`b110fa9b673a555f...`	`f05f7c20a5c8fc4c...`
*-osx-unsigned.dmg	`51f57af29f3b65dd...`	`5b1c220728a860a3...`
*-osx-unsigned.tar.gz	`21d22cb49f9067cd...`	`81f2ba2452d1cfb6...`
*-osx64.tar.gz	`22ceafcd3f1e1227...`	`e51f493674749ffc...`
*-powerpc64-linux-gnu-debug.tar.gz	`c377e33096fb8f32...`	`9d6b19bd55c7afcc...`
*-powerpc64-linux-gnu.tar.gz	`ef46ae658557c13e...`	`40edeadc018ccea2...`
*-powerpc64le-linux-gnu-debug.tar.gz	`ae896cd55f89a354...`	`bd4c25241f9a994d...`
*-powerpc64le-linux-gnu.tar.gz	`24153b562f2e75a2...`	`732f185f7536dddb...`
*-riscv64-linux-gnu-debug.tar.gz	`93701e039ba98f44...`	`8ff0dfdbe3743ad1...`
*-riscv64-linux-gnu.tar.gz	`9b0730144529e23c...`	`56952a02b6b9935d...`
*-win-unsigned.tar.gz	`5b68e0ff68de904c...`	`12b00663b3405d8f...`
*-win64-debug.zip	`67386013c6cf3b31...`	`9845a487ff232b16...`
*-win64-setup-unsigned.exe	`16aa436df456790c...`	`6df8b327b3d7eca7...`
*-win64.zip	`f4e6938fd0cfbf94...`	`413140738fe80dac...`
*-x86_64-linux-gnu-debug.tar.gz	`2be7496341e0cd11...`	`545ffefc2d4e11c4...`
*-x86_64-linux-gnu.tar.gz	`d51283654f44df76...`	`306d960bdcd10872...`
*.tar.gz	`09b983d63bc7a32a...`	`2b1ccfd0ebc0ccf3...`
guix_build.log	`c7da8d1daae8c5bb...`	`84dcb0e74fa3e608...`
guix_build.log.diff		`b93956f75d5753a3...`

bb3f79f doc: Update libnatpmp info in dependencies.md (Hennadii Stepanov) 1a01a5d doc: Update zlib info in dependencies.md (Hennadii Stepanov) Pull request description: Update docs according to the recent changes in the code: - #21209 (zlib) - #21376 (libnatpmp) ACKs for top commit: fanquake: ACK bb3f79f - thanks for keeping this updated. Tree-SHA512: 48350ad07700aa071ad6c34e4c161aaadc050488fc068cf478e9781d632828187962a4384c1b67c2344145a2c00c3e16cddd09259130af8e9e86cd76cd32900d

bb3f79f doc: Update libnatpmp info in dependencies.md (Hennadii Stepanov) 1a01a5d doc: Update zlib info in dependencies.md (Hennadii Stepanov) Pull request description: Update docs according to the recent changes in the code: - bitcoin#21209 (zlib) - bitcoin#21376 (libnatpmp) ACKs for top commit: fanquake: ACK bb3f79f - thanks for keeping this updated. Tree-SHA512: 48350ad07700aa071ad6c34e4c161aaadc050488fc068cf478e9781d632828187962a4384c1b67c2344145a2c00c3e16cddd09259130af8e9e86cd76cd32900d

c198797 build: compile libnatpmp with -DNATPMP_STATICLIB on Windows (Fuzzbawls) f2b62a3 build: use newer source for libnatpmp (fanquake) 8143139 GUI: Re-work port mapping saving (Fuzzbawls) c4300c0 Clang-Tidy up mapport.cpp (Fuzzbawls) f1951b5 Add libnatpmp to nightly snapcraft builds (Fuzzbawls) d48ef00 doc: Add release notes (Fuzzbawls) 7886374 doc: Add libnatpmp stuff (Fuzzbawls) cf992d0 ci: Add libnatpmp-dev package to some builds (Fuzzbawls) 5a5e3cf gui: Add NAT-PMP network option (Fuzzbawls) 9a4ba48 net: Add -natpmp command line option (Fuzzbawls) 9927296 net: Add NAT-PMP to port mapping loop (Hennadii Stepanov) 84cd118 net: Add initial libnatpmp support (Fuzzbawls) faed148 gui: Apply port mapping changes on save (Fuzzbawls) 266d322 scripted-diff: Rename UPnP stuff (Fuzzbawls) 06dc0dd net: Add flags for port mapping protocols (Fuzzbawls) 2abea67 net: Keep trying to use UPnP when -upnp=1 (Hennadii Stepanov) d2fa5c4 Make ThreadMapPort static (Fuzzbawls) 7532090 refactor: Replace magic number with named constant (Hennadii Stepanov) c481f62 refactor: Move port mapping code to its own module (Fuzzbawls) Pull request description: Built on top of #2330, this backports bitcoin#18077 and bitcoin#21209 to add NAT-PMP port forwarding support, which can function along side of or instead of UPnP. Similar to how UPnP is treated, NAT-PMP support will be compiled in if the library is found, but the functionality is disabled by default unless passing `--enable-natpmp-default` to `configure`, or by using the `-natpmp` command line option at startup. A checkbox has also been added to the settings area of the GUI that allows for on-the-fly enabling/disabling of the port mapping features when saving the settings. - [x] #2330 to be merged first. ACKs for top commit: furszy: upnp and code check ACK c198797. random-zebra: utACK c198797 after rebase, and merging... Tree-SHA512: e4b47dcd9589a1fd7a1bf3254c319d80af92c878e1657a17a169e49aa888aea33921a9428da3e8d6ee023d971143cf4a495e5a32957370174cff57e6cc6f2cc0

fanquake added Build system Needs gitian build DrahtBot Guix build requested labels Feb 17, 2021

fanquake requested a review from hebasto February 17, 2021 07:20

fanquake force-pushed the newer_libnatpmp branch from 6d3d7ac to bc0e862 Compare February 17, 2021 09:00

DrahtBot removed Needs gitian build DrahtBot Guix build requested labels Feb 18, 2021

bitcoin deleted a comment from DrahtBot Feb 20, 2021

fanquake mentioned this pull request Mar 1, 2021

build: fix libnatpmp macos cross compile #21320

Merged

fanquake mentioned this pull request Mar 3, 2021

build: configure fails to process libnatpmp from depends for HOST=x86_64-w64-mingw32 #21350

Closed

bitcoin deleted a comment from DrahtBot Mar 3, 2021

maflcko added Needs gitian build DrahtBot Guix build requested labels Mar 3, 2021

fanquake force-pushed the newer_libnatpmp branch from bc0e862 to a164c02 Compare March 3, 2021 12:05

fanquake added 2 commits March 4, 2021 10:34

build: compile libnatpmp with -DNATPMP_STATICLIB on Windows

7af2502

This fixes linking issues and mirrors what we do with miniupnpc.

fanquake force-pushed the newer_libnatpmp branch from a164c02 to 7af2502 Compare March 4, 2021 04:41

hebasto reviewed Mar 4, 2021

View reviewed changes

hebasto approved these changes Mar 4, 2021

View reviewed changes

fanquake merged commit 48725e6 into bitcoin:master Mar 6, 2021

fanquake deleted the newer_libnatpmp branch March 6, 2021 01:26

sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Mar 6, 2021

Merge bitcoin#21209: build: use newer source for libnatpmp

d430fa1

maflcko removed DrahtBot Guix build requested Needs gitian build labels Mar 6, 2021

hebasto mentioned this pull request Mar 14, 2021

doc: Update dependencies.md #21435

Merged

Fuzzbawls mentioned this pull request Jun 16, 2021

[Net] Add NAT-PMP port forwarding support PIVX-Project/PIVX#2338

Merged

1 task

fanquake mentioned this pull request Aug 6, 2021

build: deprecate UPnP support #22644

Closed

kwvg added a commit to kwvg/dash that referenced this pull request Feb 26, 2022

merge bitcoin#21209: use newer source for libnatpmp

c382730

bitcoin locked as resolved and limited conversation to collaborators Aug 16, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

build: use newer source for libnatpmp #21209

build: use newer source for libnatpmp #21209

fanquake commented Feb 17, 2021

hebasto commented Feb 17, 2021

hebasto commented Feb 17, 2021

fanquake commented Feb 17, 2021

hebasto commented Feb 17, 2021

fanquake commented Feb 17, 2021

hebasto commented Feb 17, 2021

fanquake commented Feb 17, 2021

hebasto commented Feb 17, 2021

laanwj commented Feb 26, 2021

hebasto commented Feb 26, 2021

DrahtBot commented Mar 1, 2021 •

edited

Loading

fanquake commented Mar 4, 2021

fanquake commented Mar 4, 2021

hebasto left a comment

hebasto Mar 4, 2021 •

edited

Loading

laanwj commented Mar 4, 2021

hebasto left a comment

laanwj commented Mar 5, 2021

DrahtBot commented Mar 7, 2021

build: use newer source for libnatpmp #21209

build: use newer source for libnatpmp #21209

Conversation

fanquake commented Feb 17, 2021

hebasto commented Feb 17, 2021

hebasto commented Feb 17, 2021

fanquake commented Feb 17, 2021

hebasto commented Feb 17, 2021

fanquake commented Feb 17, 2021

hebasto commented Feb 17, 2021

fanquake commented Feb 17, 2021

hebasto commented Feb 17, 2021

laanwj commented Feb 26, 2021

hebasto commented Feb 26, 2021

DrahtBot commented Mar 1, 2021 • edited Loading

Conflicts

fanquake commented Mar 4, 2021

fanquake commented Mar 4, 2021

hebasto left a comment

Choose a reason for hiding this comment

hebasto Mar 4, 2021 • edited Loading

Choose a reason for hiding this comment

laanwj commented Mar 4, 2021

hebasto left a comment

Choose a reason for hiding this comment

laanwj commented Mar 5, 2021

DrahtBot commented Mar 7, 2021

Guix builds

DrahtBot commented Mar 1, 2021 •

edited

Loading

hebasto Mar 4, 2021 •

edited

Loading