From 63d39a464f31ad05e2b5359d1d6a085aff087ae3 Mon Sep 17 00:00:00 2001 From: Matt Brubeck Date: Fri, 24 Jul 2015 14:10:22 -0700 Subject: [PATCH] Upgrade cocoa, openssl, and selectors --- components/servo/Cargo.lock | 32 ++++++++++++++------------------ ports/cef/Cargo.lock | 27 ++++++++++++++------------- ports/gonk/.cargo/config | 3 --- ports/gonk/Cargo.lock | 25 ++++++++++--------------- python/servo/command_base.py | 2 +- 5 files changed, 39 insertions(+), 50 deletions(-) diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index b5ae7490a37..1e58187769d 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -71,11 +71,6 @@ dependencies = [ "x11 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "bitflags" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "bitflags" version = "0.3.2" @@ -147,10 +142,11 @@ dependencies = [ [[package]] name = "cocoa" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "objc 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -194,7 +190,7 @@ name = "cookie" version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "openssl 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", @@ -521,7 +517,7 @@ version = "0.0.26" source = "git+https://github.com/servo/glutin?branch=servo#b22056cc75602e2e8cecba605b93a4e52a99a2a2" dependencies = [ "android_glue 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "cocoa 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "cocoa 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "gdi32-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -628,7 +624,7 @@ dependencies = [ "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "mime 0.0.12 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "solicit 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -878,7 +874,7 @@ dependencies = [ "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)", "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "net_traits 0.0.1", - "openssl 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "png 0.1.0 (git+https://github.com/servo/rust-png)", "regex 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)", "regex_macros 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)", @@ -966,18 +962,18 @@ dependencies = [ [[package]] name = "openssl" -version = "0.6.2" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-sys 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "openssl-sys" -version = "0.6.2" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "gcc 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1221,9 +1217,9 @@ dependencies = [ [[package]] name = "selectors" version = "0.1.0" -source = "git+https://github.com/servo/rust-selectors#625734e1e8d70c012672b248adca302d0276fe08" +source = "git+https://github.com/servo/rust-selectors#5d5c2ec6c9e703cb3d231b92fc962b330d2f67d5" dependencies = [ - "bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "cssparser 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1533,7 +1529,7 @@ dependencies = [ "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", "unicase 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index 3551ce8bc9b..95acc5ae7cc 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -4,7 +4,7 @@ version = "0.0.1" dependencies = [ "azure 0.1.0 (git+https://github.com/servo/rust-azure)", "cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cocoa 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "cocoa 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "compositing 0.0.1", "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -146,10 +146,11 @@ dependencies = [ [[package]] name = "cocoa" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "objc 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -193,7 +194,7 @@ name = "cookie" version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "openssl 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", @@ -513,7 +514,7 @@ version = "0.0.26" source = "git+https://github.com/servo/glutin?branch=servo#b22056cc75602e2e8cecba605b93a4e52a99a2a2" dependencies = [ "android_glue 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "cocoa 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "cocoa 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "gdi32-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -620,7 +621,7 @@ dependencies = [ "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "mime 0.0.12 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "solicit 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -870,7 +871,7 @@ dependencies = [ "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)", "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "net_traits 0.0.1", - "openssl 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "png 0.1.0 (git+https://github.com/servo/rust-png)", "regex 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)", "regex_macros 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)", @@ -945,18 +946,18 @@ dependencies = [ [[package]] name = "openssl" -version = "0.6.2" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-sys 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "openssl-sys" -version = "0.6.2" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "gcc 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1192,9 +1193,9 @@ dependencies = [ [[package]] name = "selectors" version = "0.1.0" -source = "git+https://github.com/servo/rust-selectors#625734e1e8d70c012672b248adca302d0276fe08" +source = "git+https://github.com/servo/rust-selectors#5d5c2ec6c9e703cb3d231b92fc962b330d2f67d5" dependencies = [ - "bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "cssparser 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1506,7 +1507,7 @@ dependencies = [ "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", "unicase 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/ports/gonk/.cargo/config b/ports/gonk/.cargo/config index 417f118e43b..a447c48b997 100644 --- a/ports/gonk/.cargo/config +++ b/ports/gonk/.cargo/config @@ -1,6 +1,3 @@ [target.arm-linux-androideabi] ar = "arm-linux-androideabi-ar" linker = "./fake-ld.sh" - -[target.arm-linux-androideabi.openssl] -rustc-flags = "-l crypto -l ssl" diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock index b12866d9cd5..585322d7b3b 100644 --- a/ports/gonk/Cargo.lock +++ b/ports/gonk/Cargo.lock @@ -57,11 +57,6 @@ dependencies = [ "x11 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "bitflags" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "bitflags" version = "0.3.2" @@ -170,7 +165,7 @@ name = "cookie" version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "openssl 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", @@ -554,7 +549,7 @@ dependencies = [ "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "mime 0.0.12 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "solicit 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -796,7 +791,7 @@ dependencies = [ "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)", "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "net_traits 0.0.1", - "openssl 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "png 0.1.0 (git+https://github.com/servo/rust-png)", "regex 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)", "regex_macros 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)", @@ -862,18 +857,18 @@ dependencies = [ [[package]] name = "openssl" -version = "0.6.2" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-sys 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "openssl-sys" -version = "0.6.2" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "gcc 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1100,9 +1095,9 @@ dependencies = [ [[package]] name = "selectors" version = "0.1.0" -source = "git+https://github.com/servo/rust-selectors#625734e1e8d70c012672b248adca302d0276fe08" +source = "git+https://github.com/servo/rust-selectors#5d5c2ec6c9e703cb3d231b92fc962b330d2f67d5" dependencies = [ - "bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "cssparser 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1395,7 +1390,7 @@ dependencies = [ "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", "unicase 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/python/servo/command_base.py b/python/servo/command_base.py index 7c41fa42196..b712a1d87b3 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -285,7 +285,7 @@ class CommandBase(object): "%(gonkdir)s/out/target/product/%(gonkproduct)s/obj/lib" ) % {"gonkdir": env["GONKDIR"], "gonkproduct": env["GONK_PRODUCT"]} env["OPENSSL_LIB_DIR"] = openssl_dir - env['OPENSSL_INCLUDE_DIR'] = path.join(openssl_dir, "include") + env['OPENSSL_INCLUDE_DIR'] = path.join(env["GONKDIR"], "external/openssl/include") # FIXME: These are set because they are the variable names that # android-rs-glue expects. However, other submodules have makefiles that