From b54442aea89fe01b2e2658aef58984eba6cdf76a Mon Sep 17 00:00:00 2001 From: Cody P Schafer Date: Tue, 26 May 2015 12:02:22 -0400 Subject: [PATCH] cargo: update --- recipes/cargo/cargo_git.bb | 21 ++++---- ...xplicitly-linking-in-openssl.-If-it-.patch | 36 +++++++------- ...emove-per-triple-deps-on-openssl-sys.patch | 48 ++++++++++--------- .../0001-Add-generic-openssl-sys-dep.patch | 38 ++++++++------- ...id-the-build-script-it-is-a-disaster.patch | 26 ++++++++++ ...nconditionally-depend-on-openssl-sys.patch | 32 +++++++------ 6 files changed, 120 insertions(+), 81 deletions(-) create mode 100644 recipes/cargo/files/git2-rs/0002-libgit2-sys-avoid-the-build-script-it-is-a-disaster.patch diff --git a/recipes/cargo/cargo_git.bb b/recipes/cargo/cargo_git.bb index 8475c0b..cfba69e 100644 --- a/recipes/cargo/cargo_git.bb +++ b/recipes/cargo/cargo_git.bb @@ -1,6 +1,6 @@ -# 2015-03-23 -SRCREV_cargo = "8d4bf72bf6b1f997c2e91ec57b79c6bbd2ed65e4" -SRCREV_rust-installer = "60fd8abfcae50629a3fc664bd809238fed039617" +# 2015-05-21 +SRCREV_cargo = "3090cc3151389283ce5f733c66464c65f02aa659" +SRCREV_rust-installer = "e54d4823d26cdb3f98e5a1b17e1c257cd329aa61" require cargo.inc @@ -14,20 +14,21 @@ SRC_URI += " \ \ git://github.com/alexcrichton/git2-rs.git;protocol=https;name=git2-rs;destsuffix=git2-rs \ file://git2-rs/0001-Add-generic-openssl-sys-dep.patch;patchdir=../git2-rs \ + file://git2-rs/0002-libgit2-sys-avoid-the-build-script-it-is-a-disaster.patch;patchdir=../git2-rs \ \ \ git://github.com/alexcrichton/curl.git;protocol=https;destsuffix=curl-rust/curl-sys/curl;name=curl;branch=configure \ - git://github.com/alexcrichton/libgit2.git;protocol=https;destsuffix=git2-rs/libgit2-sys/libgit2;name=libgit2;branch=libgit2-2014-12-19 \ + git://github.com/libgit2/libgit2.git;protocol=https;destsuffix=git2-rs/libgit2-sys/libgit2;name=libgit2 \ " -# 0.2.3 / -sys 0.1.16 -SRCREV_curl-rust = "8db3885f0e39c748c37d6f5409a055aa8412b81f" +# 0.2.10 / -sys 0.1.22 +SRCREV_curl-rust = "00060b1be10cee2ef4ad4b6aa1f0bc34e85a3209" -# 0.2.3 / -sys 0.1.13 -SRCREV_ssh2-rs = "20051a11312ff1769bd21c461232c0cb8bc99815" +# 0.2.7 / -sys 0.1.23 +SRCREV_ssh2-rs = "340827c475174007f0d122795456f82ebd3431fb" -# 0.2.5 / -sys 0.2.6 -SRCREV_git2-rs = "7ba50b6e2170cc73ee55b8de738cf9efb68b6646" +# 0.2.11 / -sys 0.2.14 +SRCREV_git2-rs = "d8f056e802cebbffabe032c7f96e52e76262a11b" SRCREV_FORMAT .= "_curl-rust_curl_ssh2-rs_git2-rs" EXTRA_OECARGO_PATHS = "\ diff --git a/recipes/cargo/files/curl-rust/0001-curl-sys-avoid-explicitly-linking-in-openssl.-If-it-.patch b/recipes/cargo/files/curl-rust/0001-curl-sys-avoid-explicitly-linking-in-openssl.-If-it-.patch index 9de4ccd..32f5953 100644 --- a/recipes/cargo/files/curl-rust/0001-curl-sys-avoid-explicitly-linking-in-openssl.-If-it-.patch +++ b/recipes/cargo/files/curl-rust/0001-curl-sys-avoid-explicitly-linking-in-openssl.-If-it-.patch @@ -1,52 +1,54 @@ -From 03c23cce2e617e4d0902e9adf0a9caa7e27b9699 Mon Sep 17 00:00:00 2001 +From ed86311a8a67028bd8e529cfc2a5dd65d79e8f1d Mon Sep 17 00:00:00 2001 From: Cody P Schafer Date: Tue, 25 Nov 2014 11:50:28 -0500 Subject: [PATCH 1/2] curl-sys: avoid explicitly linking in openssl. If it is needed, pkgconfig will pull it in --- - curl-sys/Cargo.toml | 17 ----------------- + curl-sys/Cargo.toml | 19 ------------------- curl-sys/lib.rs | 1 - - 2 files changed, 18 deletions(-) + 2 files changed, 20 deletions(-) diff --git a/curl-sys/Cargo.toml b/curl-sys/Cargo.toml -index ddc6ca0..36f93a0 100644 +index 6631ae2..f384669 100644 --- a/curl-sys/Cargo.toml +++ b/curl-sys/Cargo.toml -@@ -18,21 +18,4 @@ path = "lib.rs" +@@ -18,23 +18,4 @@ path = "lib.rs" [dependencies] libz-sys = "0.1.0" libc = "0.1" - -# Unix platforms use OpenSSL for now to provide SSL functionality -[target.i686-apple-darwin.dependencies] --openssl-sys = "0.5.0" +-openssl-sys = "0.6.0" -[target.x86_64-apple-darwin.dependencies] --openssl-sys = "0.5.0" +-openssl-sys = "0.6.0" -[target.i686-unknown-linux-gnu.dependencies] --openssl-sys = "0.5.0" +-openssl-sys = "0.6.0" -[target.x86_64-unknown-linux-gnu.dependencies] --openssl-sys = "0.5.0" +-openssl-sys = "0.6.0" -[target.arm-unknown-linux-gnueabihf.dependencies] --openssl-sys = "0.5.0" +-openssl-sys = "0.6.0" -[target.aarch64-unknown-linux-gnu.dependencies] --openssl-sys = "0.5.0" +-openssl-sys = "0.6.0" -[target.i686-unknown-freebsd.dependencies] --openssl-sys = "0.5.0" +-openssl-sys = "0.6.0" -[target.x86_64-unknown-freebsd.dependencies] - openssl-sys = "0.5.0" +-openssl-sys = "0.6.0" +-[target.x86_64-unknown-bitrig.dependencies] + openssl-sys = "0.6.0" diff --git a/curl-sys/lib.rs b/curl-sys/lib.rs -index 0a224a4..1328834 100644 +index f3767ba..879c9a1 100644 --- a/curl-sys/lib.rs +++ b/curl-sys/lib.rs @@ -2,7 +2,6 @@ extern crate libc; - extern crate "libz-sys" as libz; --#[cfg(unix)] extern crate "openssl-sys" as openssl; + extern crate libz_sys; +-#[cfg(unix)] extern crate openssl_sys; use libc::{c_void, c_int, c_char, c_uint, c_long}; -- -2.3.3 +2.4.1 diff --git a/recipes/cargo/files/curl-rust/0002-remove-per-triple-deps-on-openssl-sys.patch b/recipes/cargo/files/curl-rust/0002-remove-per-triple-deps-on-openssl-sys.patch index b806e3a..746ebbb 100644 --- a/recipes/cargo/files/curl-rust/0002-remove-per-triple-deps-on-openssl-sys.patch +++ b/recipes/cargo/files/curl-rust/0002-remove-per-triple-deps-on-openssl-sys.patch @@ -1,46 +1,48 @@ -From 910c8fe2c439ed79451e5bcfb01dedbd4c8225cb Mon Sep 17 00:00:00 2001 +From cfbd8d0b553e180d49e340eb63480292af2b0b9b Mon Sep 17 00:00:00 2001 From: Cody P Schafer Date: Tue, 25 Nov 2014 12:26:48 -0500 Subject: [PATCH 2/2] remove per-triple deps on openssl-sys --- - Cargo.toml | 19 +------------------ - 1 file changed, 1 insertion(+), 18 deletions(-) + Cargo.toml | 21 +-------------------- + 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/Cargo.toml b/Cargo.toml -index 1554aea..3a6efa3 100644 +index 16b72c3..68235ae 100644 --- a/Cargo.toml +++ b/Cargo.toml -@@ -10,6 +10,7 @@ description = "Rust bindings to libcurl for making HTTP requests" - [dependencies] - url = "0.2.0" +@@ -12,30 +12,11 @@ url = "0.2.0" + log = "0.3.0" libc = "0.1" -+openssl-sys = "0.5.1" - - [dependencies.curl-sys] - path = "curl-sys" -@@ -17,21 +18,3 @@ version = "0.1.0" + curl-sys = { path = "curl-sys", version = "0.1.0" } ++openssl-sys = "0.6.0" [dev-dependencies] - log = "0.2" -- + env_logger = "0.3.0" + -# Unix platforms use OpenSSL for now to provide SSL functionality -[target.i686-apple-darwin.dependencies] --openssl-sys = "0.5.1" +-openssl-sys = "0.6.0" -[target.x86_64-apple-darwin.dependencies] --openssl-sys = "0.5.1" +-openssl-sys = "0.6.0" -[target.i686-unknown-linux-gnu.dependencies] --openssl-sys = "0.5.1" +-openssl-sys = "0.6.0" -[target.x86_64-unknown-linux-gnu.dependencies] --openssl-sys = "0.5.1" +-openssl-sys = "0.6.0" -[target.arm-unknown-linux-gnueabihf.dependencies] --openssl-sys = "0.5.1" +-openssl-sys = "0.6.0" -[target.aarch64-unknown-linux-gnu.dependencies] --openssl-sys = "0.5.1" +-openssl-sys = "0.6.0" -[target.i686-unknown-freebsd.dependencies] --openssl-sys = "0.5.1" +-openssl-sys = "0.6.0" -[target.x86_64-unknown-freebsd.dependencies] --openssl-sys = "0.5.1" +-openssl-sys = "0.6.0" +-[target.x86_64-unknown-bitrig.dependencies] +-openssl-sys = "0.6.0" +- + [[test]] + + name = "test" -- -2.3.3 +2.4.1 diff --git a/recipes/cargo/files/git2-rs/0001-Add-generic-openssl-sys-dep.patch b/recipes/cargo/files/git2-rs/0001-Add-generic-openssl-sys-dep.patch index b5653b7..96cc2ba 100644 --- a/recipes/cargo/files/git2-rs/0001-Add-generic-openssl-sys-dep.patch +++ b/recipes/cargo/files/git2-rs/0001-Add-generic-openssl-sys-dep.patch @@ -1,50 +1,56 @@ -From ff3a41ab9e7da8aeb35f66c7f6496566f9305fa8 Mon Sep 17 00:00:00 2001 +From 4954d19a91f78d27574a2567b43f83cc91f3fd34 Mon Sep 17 00:00:00 2001 From: Cody P Schafer Date: Mon, 10 Nov 2014 15:06:29 -0500 -Subject: [PATCH] Add generic openssl-sys dep +Subject: [PATCH 1/3] Add generic openssl-sys dep --- - libgit2-sys/Cargo.toml | 27 ++------------------------- - 1 file changed, 2 insertions(+), 25 deletions(-) + libgit2-sys/Cargo.toml | 33 ++------------------------------- + 1 file changed, 2 insertions(+), 31 deletions(-) diff --git a/libgit2-sys/Cargo.toml b/libgit2-sys/Cargo.toml -index efea9f3..27e3783 100644 +index c5e150f..e87cdd1 100644 --- a/libgit2-sys/Cargo.toml +++ b/libgit2-sys/Cargo.toml -@@ -16,31 +16,8 @@ description = "Native bindings to the libgit2 library" +@@ -16,37 +16,8 @@ description = "Native bindings to the libgit2 library" [dependencies] libssh2-sys = "0.1.0" libc = "0.1" -+openssl-sys = "0.5.0" ++openssl-sys = "0.6.0" +libz-sys = "0.1.0" [build-dependencies] pkg-config = "0.3" - -[target.i686-apple-darwin.dependencies] --openssl-sys = "0.5.0" +-openssl-sys = "0.6.0" -libz-sys = "0.1.0" -[target.x86_64-apple-darwin.dependencies] --openssl-sys = "0.5.0" +-openssl-sys = "0.6.0" -libz-sys = "0.1.0" -[target.i686-unknown-linux-gnu.dependencies] --openssl-sys = "0.5.0" +-openssl-sys = "0.6.0" -libz-sys = "0.1.0" -[target.x86_64-unknown-linux-gnu.dependencies] --openssl-sys = "0.5.0" +-openssl-sys = "0.6.0" -libz-sys = "0.1.0" -[target.aarch64-unknown-linux-gnu.dependencies] --openssl-sys = "0.5.0" +-openssl-sys = "0.6.0" -libz-sys = "0.1.0" -[target.arm-unknown-linux-gnueabihf.dependencies] --openssl-sys = "0.5.0" +-openssl-sys = "0.6.0" -libz-sys = "0.1.0" -[target.i686-unknown-freebsd.dependencies] --openssl-sys = "0.5.0" +-openssl-sys = "0.6.0" -libz-sys = "0.1.0" -[target.x86_64-unknown-freebsd.dependencies] --openssl-sys = "0.5.0" +-openssl-sys = "0.6.0" +-libz-sys = "0.1.0" +-[target.x86_64-unknown-bitrig.dependencies] +-openssl-sys = "0.6.0" +-libz-sys = "0.1.0" +-[target.x86_64-unknown-openbsd.dependencies] +-openssl-sys = "0.6.0" -libz-sys = "0.1.0" -- -2.3.3 +2.4.1 diff --git a/recipes/cargo/files/git2-rs/0002-libgit2-sys-avoid-the-build-script-it-is-a-disaster.patch b/recipes/cargo/files/git2-rs/0002-libgit2-sys-avoid-the-build-script-it-is-a-disaster.patch new file mode 100644 index 0000000..c5be1c2 --- /dev/null +++ b/recipes/cargo/files/git2-rs/0002-libgit2-sys-avoid-the-build-script-it-is-a-disaster.patch @@ -0,0 +1,26 @@ +From bbc72d2eb464b1296433b2c6ade7bc8e303912f7 Mon Sep 17 00:00:00 2001 +From: Cody P Schafer +Date: Tue, 26 May 2015 22:10:18 -0400 +Subject: [PATCH 2/3] libgit2-sys: avoid the build script, it is a disaster + +--- + libgit2-sys/build.rs | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/libgit2-sys/build.rs b/libgit2-sys/build.rs +index dacd187..471ca69 100644 +--- a/libgit2-sys/build.rs ++++ b/libgit2-sys/build.rs +@@ -15,6 +15,9 @@ macro_rules! t { + } + + fn main() { ++ pkg_config::find_library("libgit2").unwrap(); ++ return; ++ + register_dep("SSH2"); + register_dep("OPENSSL"); + +-- +2.4.1 + diff --git a/recipes/cargo/files/ssh2-rs/0001-Unconditionally-depend-on-openssl-sys.patch b/recipes/cargo/files/ssh2-rs/0001-Unconditionally-depend-on-openssl-sys.patch index e5280cd..ff86d54 100644 --- a/recipes/cargo/files/ssh2-rs/0001-Unconditionally-depend-on-openssl-sys.patch +++ b/recipes/cargo/files/ssh2-rs/0001-Unconditionally-depend-on-openssl-sys.patch @@ -1,41 +1,43 @@ -From c4bea40ae7d77d7fe7b3a1a9a4e31597fea2d8ad Mon Sep 17 00:00:00 2001 +From fbb1992f77853b16a59c32695aa24081bfd620a6 Mon Sep 17 00:00:00 2001 From: Cody P Schafer Date: Mon, 1 Dec 2014 10:51:31 -0500 Subject: [PATCH] Unconditionally depend on openssl-sys --- - libssh2-sys/Cargo.toml | 18 ------------------ - 1 file changed, 18 deletions(-) + libssh2-sys/Cargo.toml | 20 -------------------- + 1 file changed, 20 deletions(-) diff --git a/libssh2-sys/Cargo.toml b/libssh2-sys/Cargo.toml -index 56545c4..80844bd 100644 +index a59dfec..fc65e32 100644 --- a/libssh2-sys/Cargo.toml +++ b/libssh2-sys/Cargo.toml -@@ -15,24 +15,6 @@ path = "lib.rs" +@@ -15,26 +15,6 @@ path = "lib.rs" [dependencies] libz-sys = "0.1.0" libc = "0.1" - -[target.i686-apple-darwin.dependencies] --openssl-sys = "0.5.0" +-openssl-sys = "0.6.0" -[target.x86_64-apple-darwin.dependencies] --openssl-sys = "0.5.0" +-openssl-sys = "0.6.0" -[target.i686-unknown-linux-gnu.dependencies] --openssl-sys = "0.5.0" +-openssl-sys = "0.6.0" -[target.x86_64-unknown-linux-gnu.dependencies] --openssl-sys = "0.5.0" +-openssl-sys = "0.6.0" -[target.aarch64-unknown-linux-gnu.dependencies] --openssl-sys = "0.5.0" +-openssl-sys = "0.6.0" -[target.arm-unknown-linux-gnueabihf.dependencies] --openssl-sys = "0.5.0" +-openssl-sys = "0.6.0" -[target.i686-unknown-freebsd.dependencies] --openssl-sys = "0.5.0" +-openssl-sys = "0.6.0" -[target.x86_64-unknown-freebsd.dependencies] --openssl-sys = "0.5.0" +-openssl-sys = "0.6.0" -[target.x86_64-unknown-dragonfly.dependencies] - openssl-sys = "0.5.0" +-openssl-sys = "0.6.0" +-[target.x86_64-unknown-bitrig.dependencies] + openssl-sys = "0.6.0" [build-dependencies] -- -2.3.3 +2.4.1