[depends] expat 2.2.5, ccache 3.4.1, miniupnpc 2.0.20180203 by fanquake · Pull Request #12402 · bitcoin/bitcoin

fanquake · 2018-02-10T02:11:38Z

miniupnpc changelog: http://miniupnp.free.fr/files/changelog.php?file=miniupnpc-2.0.20180203.tar.gz
2.0.20180203 includes fixes for the recent buffer overflow and segfault issues, see miniupnp/miniupnp#268.

expat changelog: https://github.com/libexpat/libexpat/blob/R_2_2_5/expat/Changes
2.2.2 & 2.2.3 included security fixes.

ccache changelog: https://ccache.samba.org/releasenotes.html#_ccache_3_4_1

Also includes latest config.guess and config.sub.

fanquake · 2018-02-10T05:14:17Z

miniupnpc build error on osx:

minissdpc.c:632:35: error: use of undeclared identifier 'IP_MULTICAST_TTL'
                if(setsockopt(sudp, IPPROTO_IP, IP_MULTICAST_TTL, &ttl, ...
                                                ^
minissdpc.c:660:23: error: use of undeclared identifier 'INADDR_NONE'
                        if(mc_if.s_addr != INADDR_NONE)
                                           ^
minissdpc.c:663:37: error: use of undeclared identifier 'IP_MULTICAST_IF'
                                if(setsockopt(sudp, IPPROTO_IP, IP_MULTI...
                                                                ^
minissdpc.c:678:18: error: variable has incomplete type 'struct ifreq'
                                struct ifreq ifr;
                                             ^
minissdpc.c:678:12: note: forward declaration of 'struct ifreq'
                                struct ifreq ifr;
                                       ^
minissdpc.c:680:40: error: use of undeclared identifier 'IFNAMSIZ'
                                strncpy(ifr.ifr_name, multicastif, IFNAMSIZ);
                                                                   ^
/home/travis/build/bitcoin/bitcoin/depends/SDKs/MacOSX10.11.sdk/usr/include/secure/_string.h:119:39: note: 
      expanded from macro 'strncpy'
  __builtin___strncpy_chk (dest, src, len, __darwin_obsz (dest))
                                      ^
minissdpc.c:681:18: error: use of undeclared identifier 'IFNAMSIZ'
                                ifr.ifr_name[IFNAMSIZ-1] = '\0';
                                             ^
minissdpc.c:682:20: error: invalid application of 'sizeof' to an incomplete type
      'struct ifreq'
                                if(ioctl(sudp, SIOCGIFADDR, &ifr, &ifrlen) < 0)
                                               ^~~~~~~~~~~
/home/travis/build/bitcoin/bitcoin/depends/SDKs/MacOSX10.11.sdk/usr/include/sys/sockio.h:94:21: note: 
      expanded from macro 'SIOCGIFADDR'
#define SIOCGIFADDR     _IOWR('i', 33, struct ifreq)    /* get ifnet address */
                        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
/home/travis/build/bitcoin/bitcoin/depends/SDKs/MacOSX10.11.sdk/usr/include/sys/ioccom.h:97:48: note: 
      expanded from macro '_IOWR'
#define _IOWR(g,n,t)    _IOC(IOC_INOUT, (g), (n), sizeof(t))
                        ~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~
/home/travis/build/bitcoin/bitcoin/depends/SDKs/MacOSX10.11.sdk/usr/include/sys/ioccom.h:92:13: note: 
      expanded from macro '_IOC'
        (inout | ((len & IOCPARM_MASK) << 16) | ((group) << 8) | (num))
                   ^
minissdpc.c:678:12: note: forward declaration of 'struct ifreq'
                                struct ifreq ifr;
                                       ^
minissdpc.c:687:37: error: use of undeclared identifier 'IP_MULTICAST_IF'
                                if(setsockopt(sudp, IPPROTO_IP, IP_MULTI...

fanquake · 2018-02-10T05:16:20Z

Similar (now solved) issue when building on FreeBSD here: miniupnp/miniupnp#151

practicalswift · 2018-02-10T15:17:25Z

Thanks @fanquake for addressing this!

Linking in #12395 for reference.

jonasschnelli · 2018-02-10T21:31:27Z

Gitian depends complication seems to fail (we compile the dependency but don't use it AFAIK):
https://bitcoin.jonasschnelli.ch/build/494

maflcko · 2018-02-10T21:34:06Z

gitian fails due to #12386

laanwj · 2018-02-15T08:49:37Z

gitian fails due to #12386

That should be solved, but still travis errors, apparently in the macos build.

minissdpc.c:632:35: error: use of undeclared identifier 'IP_MULTICAST_TTL'
                if(setsockopt(sudp, IPPROTO_IP, IP_MULTICAST_TTL, &ttl, ...
                                                ^

fanquake · 2018-02-15T11:18:40Z

Added a commit that should fix the miniupnpc build issues. I might also pull #11995 in here, so it can be reviewed and merged.

laanwj · 2018-02-15T16:00:21Z

utACK 25409b1

…0203 25409b1 fixme: depends: Add D_DARWIN_C_SOURCE to miniupnpc CFLAGS (fanquake) 3335d45 [depends] latest config.guess and config.sub (fanquake) 41550d6 [depends] miniupnpc 2.0.20180203 (fanquake) 61647a4 [depends] ccache 3.4.1 (fanquake) 5a10859 [depends] expat 2.2.5 (fanquake) Pull request description: miniupnpc changelog: http://miniupnp.free.fr/files/changelog.php?file=miniupnpc-2.0.20180203.tar.gz 2.0.20180203 includes fixes for the recent buffer overflow and segfault issues, see miniupnp/miniupnp#268. expat changelog: https://github.com/libexpat/libexpat/blob/R_2_2_5/expat/Changes 2.2.2 & 2.2.3 included security fixes. ccache changelog: https://ccache.samba.org/releasenotes.html#_ccache_3_4_1 Also includes latest config.guess and config.sub. Tree-SHA512: 5115b6ccf2bc50c62fd16ab2350bdc752eef7db8b1e4fbe35998fe1aac3702baa6c7f5e471ec48f7c614278df20a68ee6a254dde7c3e2d5c6ce2d10257a5aa21

theuni · 2018-02-16T19:02:26Z

The miniupnpc patch here isn't quite right. The _DARWIN_C_SOURCE needs to be defined for darwin only, not universally as it is now.

achow101 · 2018-02-25T04:58:48Z

It looks like ccache's bundled zlib is failing to build with mingw which is causing #12515. This was also reported in IRC as causing an issue with a new gitian setup.

fanquake · 2018-02-25T09:56:12Z

This should be addressed in ccache 3.4.2: ccache/ccache@418c419

maflcko · 2018-02-25T15:24:32Z

doc/dependencies.md

 | Berkeley DB | [4.8.30](http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/downloads/index.html) | 4.8.x | No |  |  |
 | Boost | [1.64.0](http://www.boost.org/users/download/) | [1.47.0](https://github.com/bitcoin/bitcoin/pull/8920) | No |  |  |
-| ccache | [3.3.4](https://ccache.samba.org/download.html) |  | No |  |  |
+| ccache | [3.3.6](https://ccache.samba.org/download.html) |  | No |  |  |


Should say 3.4.1?

droark · 2018-03-03T00:40:40Z

Any chance this can get ported over to the 0.16 branch? I'm trying to do Gitian builds right now. Maybe it's a coincidence but Sourceforge chokes whenever Gitian attempts to download expat.

fanquake · 2018-03-03T04:04:26Z

@droark See #12585

@droark

25afebc depends: Switch expat download to GitHub (fanquake) Pull request description: @droark [mentioned](#12402 (comment)) the expat download was failing when trying to gitian build 0.16. I tried locally and also saw issues: ``` make download Checksum missing or mismatched for expat source. Forcing re-download. Fetching expat-2.2.1.tar.bz2 from https://downloads.sourceforge.net/project/expat/expat/2.2.1 % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed 0 0 0 0 0 0 0 0 --:--:-- 0:00:01 --:--:-- 0 100 652 100 652 0 0 361 0 0:00:01 0:00:01 --:--:-- 0 /Users/xxx/Github/bitcoin/depends/work/download/expat-2.2.1/expat-2.2.1.tar.bz2.temp: FAILED shasum: WARNING: 1 computed checksum did NOT match Fetching expat-2.2.1.tar.bz2 from https://bitcoincore.org/depends-sources % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed 0 0 0 0 0 0 0 0 --:--:-- 0:00:01 --:--:-- 0 curl: (22) The requested URL returned error: 404 Not Found make[1]: *** [/Users/xxx/Github/bitcoin/depends/sources/download-stamps/.stamp_fetched-expat-expat-2.2.1.tar.bz2.hash] Error 22 make: *** [download-linux] Error 2 ``` This switches to downloading from GitHub, as we are doing in master. Tree-SHA512: 0e3072ce4d8fee3e2bc434afc7469968c21e01ca35aa2ccbffc25f8e9b00af2e4a5f3f9e4cd5c0cd8e72a10b16205236eb0536380849109a739c09358dbc1394

@droark

25afebc2ba depends: Switch expat download to GitHub (fanquake) Pull request description: @droark [mentioned](bitcoin/bitcoin#12402 (comment)) the expat download was failing when trying to gitian build 0.16. I tried locally and also saw issues: ``` make download Checksum missing or mismatched for expat source. Forcing re-download. Fetching expat-2.2.1.tar.bz2 from https://downloads.sourceforge.net/project/expat/expat/2.2.1 % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed 0 0 0 0 0 0 0 0 --:--:-- 0:00:01 --:--:-- 0 100 652 100 652 0 0 361 0 0:00:01 0:00:01 --:--:-- 0 /Users/xxx/Github/bitcoin/depends/work/download/expat-2.2.1/expat-2.2.1.tar.bz2.temp: FAILED shasum: WARNING: 1 computed checksum did NOT match Fetching expat-2.2.1.tar.bz2 from https://bitcoincore.org/depends-sources % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed 0 0 0 0 0 0 0 0 --:--:-- 0:00:01 --:--:-- 0 curl: (22) The requested URL returned error: 404 Not Found make[1]: *** [/Users/xxx/Github/bitcoin/depends/sources/download-stamps/.stamp_fetched-expat-expat-2.2.1.tar.bz2.hash] Error 22 make: *** [download-linux] Error 2 ``` This switches to downloading from GitHub, as we are doing in master. Tree-SHA512: 0e3072ce4d8fee3e2bc434afc7469968c21e01ca35aa2ccbffc25f8e9b00af2e4a5f3f9e4cd5c0cd8e72a10b16205236eb0536380849109a739c09358dbc1394

Summary: This removes `ccache` from the depends. Host `ccache` will be used instead if installed. Backport of core [[bitcoin/bitcoin#12607 | PR12607]]. This will fix a future issue when porting [[bitcoin/bitcoin#12402 | PR12402]], so these PR are ported in reverse order. Test Plan: Run the Gitian builds twice and ensure the build is still deterministic. Reviewers: #bitcoin_abc, jasonbcox Reviewed By: #bitcoin_abc, jasonbcox Differential Revision: https://reviews.bitcoinabc.org/D5503

Summary: ``` miniupnpc changelog: http://miniupnp.free.fr/files/changelog.php?file=miniupnpc-2.0.20180203.tar.gz 2.0.20180203 includes fixes for the recent buffer overflow and segfault issues, see miniupnp/miniupnp#268. expat changelog: https://github.com/libexpat/libexpat/blob/R_2_2_5/expat/Changes 2.2.2 & 2.2.3 included security fixes. Also includes latest config.guess and config.sub. ``` This updates our depends version for expat, miniupnpc, config.guess and config.sub. The ccache version is **NOT** updated (see D5503). It also includes a fix for miniupnpc. Backport of core [[bitcoin/bitcoin#12402 | PR12402]] and [[bitcoin/bitcoin#12466 | PR12466]]. Depends on D5502 and D5503. *Note to reviewers:* the diff ends up fairly large due to the pull of config.guess and config.sub. However this is mostly formatting changes (`${FOO}` vs `$FOO` in particular), and there was no merge conflict during the cherry-pick. Test Plan: Run the Gitian builds twice, ensure the build is still deterministic. Reviewers: #bitcoin_abc, deadalnix Reviewed By: #bitcoin_abc, deadalnix Subscribers: deadalnix Differential Revision: https://reviews.bitcoinabc.org/D5504

….0.20180203 25409b1 fixme: depends: Add D_DARWIN_C_SOURCE to miniupnpc CFLAGS (fanquake) 3335d45 [depends] latest config.guess and config.sub (fanquake) 41550d6 [depends] miniupnpc 2.0.20180203 (fanquake) 61647a4 [depends] ccache 3.4.1 (fanquake) 5a10859 [depends] expat 2.2.5 (fanquake) Pull request description: miniupnpc changelog: http://miniupnp.free.fr/files/changelog.php?file=miniupnpc-2.0.20180203.tar.gz 2.0.20180203 includes fixes for the recent buffer overflow and segfault issues, see miniupnp/miniupnp#268. expat changelog: https://github.com/libexpat/libexpat/blob/R_2_2_5/expat/Changes 2.2.2 & 2.2.3 included security fixes. ccache changelog: https://ccache.samba.org/releasenotes.html#_ccache_3_4_1 Also includes latest config.guess and config.sub. Tree-SHA512: 5115b6ccf2bc50c62fd16ab2350bdc752eef7db8b1e4fbe35998fe1aac3702baa6c7f5e471ec48f7c614278df20a68ee6a254dde7c3e2d5c6ce2d10257a5aa21 (cherry picked from commit 59e032b) # Conflicts: # depends/packages/miniupnpc.mk # depends/packages/native_ccache.mk # doc/dependencies.md

Summary: This removes `ccache` from the depends. Host `ccache` will be used instead if installed. Backport of core [[bitcoin/bitcoin#12607 | PR12607]]. This will fix a future issue when porting [[bitcoin/bitcoin#12402 | PR12402]], so these PR are ported in reverse order. Test Plan: Run the Gitian builds twice and ensure the build is still deterministic. Reviewers: #bitcoin_abc, jasonbcox Reviewed By: #bitcoin_abc, jasonbcox Differential Revision: https://reviews.bitcoinabc.org/D5503

Summary: ``` miniupnpc changelog: http://miniupnp.free.fr/files/changelog.php?file=miniupnpc-2.0.20180203.tar.gz 2.0.20180203 includes fixes for the recent buffer overflow and segfault issues, see miniupnp/miniupnp#268. expat changelog: https://github.com/libexpat/libexpat/blob/R_2_2_5/expat/Changes 2.2.2 & 2.2.3 included security fixes. Also includes latest config.guess and config.sub. ``` This updates our depends version for expat, miniupnpc, config.guess and config.sub. The ccache version is **NOT** updated (see D5503). It also includes a fix for miniupnpc. Backport of core [[bitcoin/bitcoin#12402 | PR12402]] and [[bitcoin/bitcoin#12466 | PR12466]]. Depends on D5502 and D5503. *Note to reviewers:* the diff ends up fairly large due to the pull of config.guess and config.sub. However this is mostly formatting changes (`${FOO}` vs `$FOO` in particular), and there was no merge conflict during the cherry-pick. Test Plan: Run the Gitian builds twice, ensure the build is still deterministic. Reviewers: #bitcoin_abc, deadalnix Reviewed By: #bitcoin_abc, deadalnix Subscribers: deadalnix Differential Revision: https://reviews.bitcoinabc.org/D5504

….0.20180203 25409b1 fixme: depends: Add D_DARWIN_C_SOURCE to miniupnpc CFLAGS (fanquake) 3335d45 [depends] latest config.guess and config.sub (fanquake) 41550d6 [depends] miniupnpc 2.0.20180203 (fanquake) 61647a4 [depends] ccache 3.4.1 (fanquake) 5a10859 [depends] expat 2.2.5 (fanquake) Pull request description: miniupnpc changelog: http://miniupnp.free.fr/files/changelog.php?file=miniupnpc-2.0.20180203.tar.gz 2.0.20180203 includes fixes for the recent buffer overflow and segfault issues, see miniupnp/miniupnp#268. expat changelog: https://github.com/libexpat/libexpat/blob/R_2_2_5/expat/Changes 2.2.2 & 2.2.3 included security fixes. ccache changelog: https://ccache.samba.org/releasenotes.html#_ccache_3_4_1 Also includes latest config.guess and config.sub. Tree-SHA512: 5115b6ccf2bc50c62fd16ab2350bdc752eef7db8b1e4fbe35998fe1aac3702baa6c7f5e471ec48f7c614278df20a68ee6a254dde7c3e2d5c6ce2d10257a5aa21 (cherry picked from commit 59e032b) # Conflicts: # depends/packages/miniupnpc.mk # depends/packages/native_ccache.mk # doc/dependencies.md

fanquake added the Build system label Feb 10, 2018

fanquake requested a review from theuni February 10, 2018 02:11

fanquake force-pushed the depends-02-2018 branch 2 times, most recently from d13fc24 to 1d10d7a Compare February 10, 2018 03:40

fanquake force-pushed the depends-02-2018 branch 2 times, most recently from 0ee2f75 to ba9cb95 Compare February 13, 2018 23:28

fanquake changed the title ~~[depends] expat 2.2.5, ccache 3.3.6, miniupnpc 2.0.20180203~~ [depends] expat 2.2.5, ccache 3.4.1, miniupnpc 2.0.20180203 Feb 13, 2018

fanquake added 5 commits February 15, 2018 18:44

[depends] expat 2.2.5

5a10859

[depends] ccache 3.4.1

61647a4

[depends] miniupnpc 2.0.20180203

41550d6

[depends] latest config.guess and config.sub

3335d45

fixme: depends: Add D_DARWIN_C_SOURCE to miniupnpc CFLAGS

25409b1

fanquake force-pushed the depends-02-2018 branch from ba9cb95 to 25409b1 Compare February 15, 2018 11:17

laanwj merged commit 25409b1 into bitcoin:master Feb 16, 2018

practicalswift mentioned this pull request Feb 16, 2018

CVE-2017-1000494: miniupnp vulnerabilities #12395

Closed

fanquake deleted the depends-02-2018 branch February 17, 2018 02:36

maflcko reviewed Feb 25, 2018

View reviewed changes

fanquake mentioned this pull request Mar 3, 2018

[0.16] depends: Switch to downloading expat from GitHub #12585

Merged

maflcko mentioned this pull request Mar 5, 2018

[depends] Revert "ccache 3.4.1" #12606

Closed

sickpig mentioned this pull request Jun 5, 2018

[PORT] Depends cherries BitcoinUnlimited/BitcoinUnlimited#1120

Merged

10xcryptodev mentioned this pull request May 16, 2020

depends: add backports 11986 12402 13543 dashpay/dash#3486

Merged

bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021

Conversation

fanquake commented Feb 10, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

fanquake commented Feb 10, 2018

Uh oh!

fanquake commented Feb 10, 2018

Uh oh!

practicalswift commented Feb 10, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jonasschnelli commented Feb 10, 2018

Uh oh!

maflcko commented Feb 10, 2018

Uh oh!

laanwj commented Feb 15, 2018

Uh oh!

fanquake commented Feb 15, 2018

Uh oh!

laanwj commented Feb 15, 2018

Uh oh!

theuni commented Feb 16, 2018

Uh oh!

achow101 commented Feb 25, 2018

Uh oh!

fanquake commented Feb 25, 2018

Uh oh!

maflcko Feb 25, 2018

Choose a reason for hiding this comment

Uh oh!

droark commented Mar 3, 2018

Uh oh!

fanquake commented Mar 3, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

fanquake commented Feb 10, 2018 •

edited

Loading

practicalswift commented Feb 10, 2018 •

edited

Loading