More updates for OpenSSL 1.1.0

Author: alexcrichton

.travis.yml

@@ -24,19 +24,12 @@ matrix:
            MAKE_TARGETS="test distcheck doc install uninstall"
            MACOSX_DEPLOYMENT_TARGET=10.7
       os: osx
-      before_install:
-        - export OPENSSL_DIR=`brew --prefix openssl`
-        - export OPENSSL_INCLUDE_DIR=`brew --prefix openssl`/include
-        - export OPENSSL_LIB_DIR=`brew --prefix openssl`/include
     - env: TARGET=i686-apple-darwin
            MAKE_TARGETS=test
            MACOSX_DEPLOYMENT_TARGET=10.7
            CFG_DISABLE_CROSS_TESTS=1
       os: osx
-      before_install:
-        - export OPENSSL_DIR=`brew --prefix openssl`
-        - export OPENSSL_INCLUDE_DIR=`brew --prefix openssl`/include
-        - export OPENSSL_LIB_DIR=`brew --prefix openssl`/include
+      install: brew uninstall openssl && brew install openssl --universal --without-test
 
     # stable musl target, tested
     - env: TARGET=x86_64-unknown-linux-musl

Cargo.lock

@@ -20,18 +20,18 @@ path = "src/cargo/lib.rs"
 advapi32-sys = "0.2"
 crates-io = { path = "src/crates-io", version = "0.4" }
 crossbeam = "0.2"
-curl = "0.3"
+curl = "0.4"
 docopt = "0.6"
 env_logger = "0.3"
 filetime = "0.1"
 flate2 = "0.2"
-fs2 = "0.2"
-git2 = "0.5"
-git2-curl = "0.6"
+fs2 = "0.3"
+git2 = "0.6"
+git2-curl = "0.7"
 glob = "0.2"
 kernel32-sys = "0.2"
 libc = "0.2"
-libgit2-sys = "0.5"
+libgit2-sys = "0.6"
 log = "0.3"
 miow = "0.1"
 num_cpus = "1.0"

Cargo.toml

@@ -252,14 +252,8 @@ target/openssl/$(1).stamp: target/openssl/openssl-$$(OPENSSL_VERS).tar.gz \
 # variables read by various build scripts to find openssl
 cargo-$(1): export OPENSSL_STATIC := 1
 cargo-$(1): export OPENSSL_DIR := $$(OPENSSL_INSTALL_$(1))
-cargo-$(1): export OPENSSL_ROOT_DIR := $$(OPENSSL_INSTALL_$(1))
-cargo-$(1): export OPENSSL_LIB_DIR := $$(OPENSSL_INSTALL_$(1))/lib
-cargo-$(1): export OPENSSL_INCLUDE_DIR := $$(OPENSSL_INSTALL_$(1))/include
 test-unit-$(1): export OPENSSL_STATIC := 1
 test-unit-$(1): export OPENSSL_DIR := $$(OPENSSL_INSTALL_$(1))
-test-unit-$(1): export OPENSSL_ROOT_DIR := $$(OPENSSL_INSTALL_$(1))
-test-unit-$(1): export OPENSSL_LIB_DIR := $$(OPENSSL_INSTALL_$(1))/lib
-test-unit-$(1): export OPENSSL_INCLUDE_DIR := $$(OPENSSL_INSTALL_$(1))/include
 
 # build libz statically into the cargo we're producing
 cargo-$(1): export LIBZ_SYS_STATIC := 1

Makefile.in

@@ -13,6 +13,6 @@ name = "crates_io"
 path = "lib.rs"
 
 [dependencies]
-curl = "0.3"
+curl = "0.4"
 url = "1.0"
 rustc-serialize = "0.3"

src/crates-io/Cargo.toml

@@ -164,7 +164,7 @@ Caused by:
             // just not verify the error message here.
             "[..]"
         } else {
-            "[[..]] SSL error: [..]"
+            "[..] SSL error: [..]"
         })));
 
     t.join().ok().unwrap();

tests/build-auth.rs

@@ -11,7 +11,7 @@ bufstream = "0.1"
 cargo = { path = "../.." }
 filetime = "0.1"
 flate2 = "0.2"
-git2 = "0.5"
+git2 = { version = "0.6", default-features = false }
 hamcrest = "0.1"
 kernel32-sys = "0.2"
 libc = "0.2"

tests/cargotest/Cargo.toml

@@ -199,15 +199,16 @@ fn rebuild_tests_if_lib_changes() {
             #[test]
             fn test() { foo::foo(); }
         "#);
+    p.build();
 
-    assert_that(p.cargo_process("build"),
+    p.root().move_into_the_past();
+
+    assert_that(p.cargo("build"),
                 execs().with_status(0));
     assert_that(p.cargo("test"),
                 execs().with_status(0));
 
     File::create(&p.root().join("src/lib.rs")).unwrap();
-    p.root().move_into_the_past();
-    p.root().join("target").move_into_the_past();
 
     assert_that(p.cargo("build"),
                 execs().with_status(0));

tests/freshness.rs

@@ -26,7 +26,7 @@ fn net_retry_loads_from_config() {
     assert_that(p.cargo_process("build").arg("-v"),
                 execs().with_status(101)
                 .with_stderr_contains("[WARNING] spurious network error \
-(1 tries remaining): [2/-1] [..]"));
+(1 tries remaining): [..]"));
 }
 
 #[test]
@@ -50,7 +50,7 @@ fn net_retry_git_outputs_warning() {
     assert_that(p.cargo_process("build").arg("-v").arg("-j").arg("1"),
                 execs().with_status(101)
                 .with_stderr_contains("[WARNING] spurious network error \
-(2 tries remaining): [2/-1] [..]")
+(2 tries remaining): [..]")
                 .with_stderr_contains("\
-[WARNING] spurious network error (1 tries remaining): [2/-1] [..]"));
+[WARNING] spurious network error (1 tries remaining): [..]"));
 }