From f8d2883618f626a3d3a183b525e381d87414afbb Mon Sep 17 00:00:00 2001 From: Marc-Antoine Perennou Date: Sun, 30 Apr 2017 08:08:23 +0200 Subject: [PATCH 1/2] update libgit2-sys for libressl compat Signed-off-by: Marc-Antoine Perennou --- Cargo.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c77c24d09c3..fcce7cb3e76 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -20,7 +20,7 @@ dependencies = [ "hamcrest 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", - "libgit2-sys 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)", + "libgit2-sys 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -245,7 +245,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", - "libgit2-sys 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)", + "libgit2-sys 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)", "openssl-probe 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "openssl-sys 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -312,7 +312,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "libgit2-sys" -version = "0.6.8" +version = "0.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cmake 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)", @@ -852,7 +852,7 @@ dependencies = [ "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" "checksum lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3b37545ab726dd833ec6420aaba8231c5b320814b9029ad585555d2a03e94fbf" "checksum libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)" = "babb8281da88cba992fa1f4ddec7d63ed96280a1a53ec9b919fd37b53d71e502" -"checksum libgit2-sys 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)" = "68bed1d1198da5d2b047af68fd71613ddfaa3d5b68797181b33e9d8547263b4b" +"checksum libgit2-sys 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)" = "a3aaa20337a0e79fb75180b6a1970c1f7cff9a413f570d6b999b38a5d5d54e81" "checksum libssh2-sys 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "91e135645c2e198a39552c8c7686bb5b83b1b99f64831c040a6c2798a1195934" "checksum libz-sys 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e5ee912a45d686d393d5ac87fac15ba0ba18daae14e8e7543c63ebf7fb7e970c" "checksum log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "5141eca02775a762cc6cd564d8d2c50f67c0ea3a372cbf1c51592b3e029e10ad" From 5d76dd233e8745eb16be8ad11ab1c7280e21d0c7 Mon Sep 17 00:00:00 2001 From: Marc-Antoine Perennou Date: Sun, 30 Apr 2017 08:51:19 +0200 Subject: [PATCH 2/2] fix build-auth test libgit2 somehow reverted the version back to 0.25.0 after the 0.25.1 release Signed-off-by: Marc-Antoine Perennou --- tests/build-auth.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/build-auth.rs b/tests/build-auth.rs index bbd01cdf4f2..b350d66717a 100644 --- a/tests/build-auth.rs +++ b/tests/build-auth.rs @@ -34,9 +34,9 @@ fn http_auth_offered() { let mut conn = BufStream::new(server.accept().unwrap().0); let req = headers(&mut conn); let user_agent = if cfg!(windows) { - "User-Agent: git/1.0 (libgit2 0.25.1)" + "User-Agent: git/1.0 (libgit2 0.25.0)" } else { - "User-Agent: git/2.0 (libgit2 0.25.1)" + "User-Agent: git/2.0 (libgit2 0.25.0)" }; conn.write_all(b"\ HTTP/1.1 401 Unauthorized\r\n\