Upgrade openssl, selectors, and cocoa

[mbrubeck]

This lets Servo use one version of bitflags for all dependencies.

r? @larsbergstrom or @Ms2ger

[hoppipolla-critic-bot]

Critic review: https://critic.hoppipolla.co.uk/r/5645

This is an external review system which you may optionally use for the code review of your pull request.

In order to help critic track your changes, please do not make in-place history rewrites (e.g. via git rebase -i or git commit --amend) when updating this pull request.

[larsbergstrom]

@bors-servo: r+

[bors-servo]

📌 Commit 68b8060 has been approved by larsbergstrom

[bors-servo]

⌛ Testing commit 68b8060 with merge c9d4e72...

[bors-servo]

💔 Test failed - gonk

[bors-servo]

☔ The latest upstream changes (presumably #6616) made this pull request unmergeable. Please resolve the merge conflicts.

[jdm]

error: linking with `./fake-ld.sh` failed: exit code: 1
[linker command line elided for brevity]
note: /home/servo/.cargo/registry/src/github.com-0a35038f75765ae4/openssl-0.6.4/src/bio/mod.rs:63: error: undefined reference to 'BIO_set_mem_eof_return_shim'
/home/servo/.cargo/registry/src/github.com-0a35038f75765ae4/openssl-0.6.4/src/bio/mod.rs:75: error: undefined reference to 'BIO_eof_shim'
/home/servo/.cargo/registry/src/github.com-0a35038f75765ae4/openssl-0.6.4/src/ssl/mod.rs:452: error: undefined reference to 'SSL_CTX_set_read_ahead_shim'
/home/servo/.cargo/registry/src/github.com-0a35038f75765ae4/openssl-0.6.4/src/ssl/mod.rs:700: error: undefined reference to 'SSL_set_tlsext_host_name_shim'
collect2: error: ld returned 1 exit status

error: aborting due to previous error
Could not compile `b2s`.

[mbrubeck]

It looks like the gonk build was broken by sfackler/rust-openssl@d0b769c. I'm not sure why the linker arguments passed to fake-ld.sh don't include the openssl-sys out directory or the openssl_shim library.

[mbrubeck]

Possibly related to this override in ports/gonk/.cargo/config?

[target.arm-linux-androideabi.openssl]
rustc-flags = "-l crypto -l ssl"

[mbrubeck]

More details on the Gonk problem:

The openssl-sys crate includes a small C library called openssl_shim which wraps some functions from OpenSSL. In older versions of openssl-sys, this shim was needed only for compatibility with old versions of OpenSSL. But in the latest version of openssl-sys, the shim is needed regardless of OpenSSL version.

The shim depends on preprocessor macros defined in the OpenSSL headers. The B2G "obj" directory we use in our Gonk build has compiled OpenSSL libraries, but it does not have the OpenSSL headers. This causes errors when building the shim.

We previously worked around the lack of headers by overriding the build script in ports/gonk/.cargo/config, which just skips building the shim. However, in the latest version, the shim is required. Skipping it causes the above errors at link time.

Possible solutions:

• Get the necessary header files for the OpenSSL libraries in our B2G build dir, and enable the shim (remove the override from ports/gonk/.cargo/config).
• Revert sfackler/rust-openssl@d0b769c and move the shimmed macros back into Rust code.
• If we don't actually depend on any of the shimmed functions, we could hide them behind an optional feature in openssl-sys and disable this in Servo.

[metajack]

pinging @sfackler

Also, this was discussed at the meeting, but the result was not recorded here. I think that @Manishearth had suggested getting the headers in the right place. What will that take?

[larsbergstrom]

Oh, yeah, sorry - I was talking, so I think it got missed in the meeting minutes.

I lost my B2G build (I accidentally broke the linux VM image), but if we make a new one we should be able to add those files to the instructions:

tar zcf B2G.tgz B2G/bionic B2G/system B2G/frameworks/native/opengl/include B2G/external/zlib B2G/hardware/libhardware/include/hardware B2G/ndk/sources/cxx-stl B2G/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.7 B2G/out/target/product/flame/obj/ B2G/prebuilts/ndk/9/sources/cxx-stl/gnu-libstdc++/4.6/libs/armeabi/
larsberg@ubuntu:/mnt/more$ s3cmd put B2G.tgz s3://servo-rust/B2G/B2G.tgz

[sfackler]

There's actually a second shim to handle mapping the SSL_OP_* constants since their values change based on the openssl version: https://github.com/sfackler/rust-openssl/blob/master/openssl-sys/build.rs#L77.

If you're okay keeping precompiled binaries around, one option would be to add a OPENSSL_SHIM_PATH environment variable that'd allow you to point the buildscript to a prebuilt version of the shim.

[larsbergstrom]

I've added the openssl headers. They should be in B2G/external/openssl/include/openssl.

[mbrubeck]

r? @larsbergstrom

[larsbergstrom]

@bors-servo r+

[bors-servo]

📌 Commit a13e237 has been approved by larsbergstrom

[mbrubeck]

@bors-servo r=larsbergstrom

(Forgot to "git add" a few more lines of Cargo.lock changes)

[bors-servo]

📌 Commit 63d39a4 has been approved by larsbergstrom

[bors-servo]

⌛ Testing commit 63d39a4 with merge df722ec...

[bors-servo]

☀️ Test successful - android, gonk, linux1, linux2, linux3, mac1, mac2, mac3