New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[depends] expat 2.2.5, ccache 3.4.1, miniupnpc 2.0.20180203 #12402

Merged
merged 5 commits into from Feb 16, 2018

Conversation

Projects
None yet
8 participants
@fanquake
Member

fanquake commented Feb 10, 2018

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 fanquake requested a review from theuni Feb 10, 2018

@fanquake

This comment has been minimized.

Member

fanquake commented Feb 10, 2018

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

This comment has been minimized.

Member

fanquake commented Feb 10, 2018

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

@practicalswift

This comment has been minimized.

Member

practicalswift commented Feb 10, 2018

Thanks @fanquake for addressing this!

Linking in #12395 for reference.

@jonasschnelli

This comment has been minimized.

Member

jonasschnelli commented Feb 10, 2018

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

@MarcoFalke

This comment has been minimized.

Member

MarcoFalke commented Feb 10, 2018

gitian fails due to #12386

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

@laanwj

This comment has been minimized.

Member

laanwj commented Feb 15, 2018

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 added some commits Feb 10, 2018

@fanquake

This comment has been minimized.

Member

fanquake commented Feb 15, 2018

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

This comment has been minimized.

Member

laanwj commented Feb 15, 2018

utACK 25409b1

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

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

laanwj added a commit that referenced this pull request Feb 16, 2018

Merge #12402: [depends] expat 2.2.5, ccache 3.4.1, miniupnpc 2.0.2018…
…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

This comment has been minimized.

Member

theuni commented Feb 16, 2018

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.

@fanquake fanquake deleted the fanquake:depends-02-2018 branch Feb 17, 2018

@achow101

This comment has been minimized.

Member

achow101 commented Feb 25, 2018

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

This comment has been minimized.

Member

fanquake commented Feb 25, 2018

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

@@ -7,18 +7,18 @@ These are the dependencies currently used by Bitcoin Core. You can find instruct
| --- | --- | --- | --- | --- | --- |
| 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 | | |

This comment has been minimized.

@MarcoFalke

MarcoFalke Feb 25, 2018

Member

Should say 3.4.1?

@droark

This comment has been minimized.

Contributor

droark commented Mar 3, 2018

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

This comment has been minimized.

Member

fanquake commented Mar 3, 2018

MarcoFalke added a commit that referenced this pull request Mar 5, 2018

Merge #12585: [0.16] depends: Switch to downloading expat from GitHub
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

virtload added a commit to bitcoin-atom/bitcoin-atom that referenced this pull request Apr 4, 2018

Merge #12585: [0.16] depends: Switch to downloading expat from GitHub
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

@sickpig sickpig referenced this pull request Jun 5, 2018

Merged

[PORT] Depends cherries #1120

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment