From bc1cba037848e8f661f77ceb0cf835df76c1019f Mon Sep 17 00:00:00 2001 From: Jakub Jirutka Date: Wed, 8 Nov 2017 21:21:06 +0100 Subject: community/cargo: build with newer openssl crate for LibreSSL compat --- community/cargo/APKBUILD | 8 +- .../cargo/cargo.lock-use-openssl-0.9.20.patch | 123 +++++++++++++++++++++ 2 files changed, 128 insertions(+), 3 deletions(-) create mode 100644 community/cargo/cargo.lock-use-openssl-0.9.20.patch (limited to 'community') diff --git a/community/cargo/APKBUILD b/community/cargo/APKBUILD index 10539dcc8e..0efd3a2678 100644 --- a/community/cargo/APKBUILD +++ b/community/cargo/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Jakub Jirutka pkgname=cargo pkgver=0.22.0 -pkgrel=1 +pkgrel=2 pkgdesc="The Rust package manager" url="https://crates.io" arch="x86_64" # limited by rust pkg @@ -26,7 +26,8 @@ _bootstrap_cargo_ver=0.17.0 source="$pkgname-$pkgver.tar.gz::https://github.com/rust-lang/$pkgname/archive/$pkgver.tar.gz https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$_bootstrap_cargo_ver-x86_64-alpine-linux-musl.tar.gz tests-fix-build-auth-http_auth_offered.patch - tests-ignore-ssh_something_happens.patch" + tests-ignore-ssh_something_happens.patch + cargo.lock-use-openssl-0.9.20.patch" builddir="$srcdir/$pkgname-$pkgver" export CARGO_HOME="$srcdir/.cargo" @@ -107,4 +108,5 @@ zshcomp() { sha512sums="31764df0462fcd0e7ddd29aee63ed0916b0d05e44d72aa815b3b823256e90f85e582c468a517d048e4451dfc1a3b22434abf25d825d3d926ab7a95f7bb44ad40 cargo-0.22.0.tar.gz b78a03942344852fd1a8c0ac893580c589757d4946150e5959e1df08b163b94ce5319236a48506c18f987cf3500a2c7cfe808eef13092c45d271e169946a18d1 cargo-0.17.0-x86_64-alpine-linux-musl.tar.gz 4e9a0d409951a72b5c1d3578cb310c0efc5d98a5b963432ec4f485f1d58d2354f0050c31574d6bd9090b7247468ef1a13b04b133deabe6daed91032764468f97 tests-fix-build-auth-http_auth_offered.patch -17c669a71443e21cc5e5cc6eb99933c20562b7df9d859c493ff25252167eb1aea6dd7322a06207776eab1c769464f95a432d1520a949512a52592b1eb115a4be tests-ignore-ssh_something_happens.patch" +17c669a71443e21cc5e5cc6eb99933c20562b7df9d859c493ff25252167eb1aea6dd7322a06207776eab1c769464f95a432d1520a949512a52592b1eb115a4be tests-ignore-ssh_something_happens.patch +901e949d7b60ffa3f44a120b61a46885b5d0f9e8eae8bcf2ece847cef339c433a9217249e92416f5fa5aa775c6734d58ccb47346daf6034d7031ff30fdfb9aef cargo.lock-use-openssl-0.9.20.patch" diff --git a/community/cargo/cargo.lock-use-openssl-0.9.20.patch b/community/cargo/cargo.lock-use-openssl-0.9.20.patch new file mode 100644 index 0000000000..bacf125feb --- /dev/null +++ b/community/cargo/cargo.lock-use-openssl-0.9.20.patch @@ -0,0 +1,123 @@ +Rust crate openssl 0.9.15 is not compatible with LibreSSL 2.6.3. + +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -30,7 +30,7 @@ + "log 0.3.8 (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.6.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "openssl 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl 0.9.20 (registry+https://github.com/rust-lang/crates.io-index)", + "psapi-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "same-file 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "scoped-tls 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +@@ -138,6 +138,11 @@ + ] + + [[package]] ++name = "cc" ++version = "1.0.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] + name = "cfg-if" + version = "0.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -200,7 +205,7 @@ + "curl-sys 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.28 (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.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl-sys 0.9.20 (registry+https://github.com/rust-lang/crates.io-index)", + "socket2 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + ] +@@ -213,7 +218,7 @@ + "gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.28 (registry+https://github.com/rust-lang/crates.io-index)", + "libz-sys 1.0.16 (registry+https://github.com/rust-lang/crates.io-index)", +- "openssl-sys 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl-sys 0.9.20 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", + "vcpkg 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", +@@ -318,7 +323,7 @@ + "libc 0.2.28 (registry+https://github.com/rust-lang/crates.io-index)", + "libgit2-sys 0.6.12 (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.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl-sys 0.9.20 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + ] + +@@ -445,7 +450,7 @@ + "libc 0.2.28 (registry+https://github.com/rust-lang/crates.io-index)", + "libssh2-sys 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", + "libz-sys 1.0.16 (registry+https://github.com/rust-lang/crates.io-index)", +- "openssl-sys 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl-sys 0.9.20 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", + ] + +@@ -457,7 +462,7 @@ + "cmake 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.28 (registry+https://github.com/rust-lang/crates.io-index)", + "libz-sys 1.0.16 (registry+https://github.com/rust-lang/crates.io-index)", +- "openssl-sys 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl-sys 0.9.20 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", + ] + +@@ -623,14 +628,14 @@ + + [[package]] + name = "openssl" +-version = "0.9.15" ++version = "0.9.20" + source = "registry+https://github.com/rust-lang/crates.io-index" + dependencies = [ + "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", + "foreign-types 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.28 (registry+https://github.com/rust-lang/crates.io-index)", +- "openssl-sys 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl-sys 0.9.20 (registry+https://github.com/rust-lang/crates.io-index)", + ] + + [[package]] +@@ -640,12 +645,13 @@ + + [[package]] + name = "openssl-sys" +-version = "0.9.15" ++version = "0.9.20" + source = "registry+https://github.com/rust-lang/crates.io-index" + dependencies = [ +- "gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.28 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "vcpkg 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + ] + + [[package]] +@@ -1013,6 +1019,7 @@ + "checksum bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d" + "checksum bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5" + "checksum bufstream 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f2f382711e76b9de6c744cc00d0497baba02fb00a787f088c879f01d09468e32" ++"checksum cc 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a9b13a57efd6b30ecd6598ebdb302cca617930b5470647570468a65d12ef9719" + "checksum cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d4c819a1287eb618df47cc647173c5c4c66ba19d888a6e50d605672aed3140de" + "checksum cmake 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b8ebbb35d3dc9cd09497168f33de1acb79b265d350ab0ac34133b98f8509af1f" + "checksum conv 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "78ff10625fd0ac447827aa30ea8b861fead473bb60aeb73af6c1c58caf0d1299" +@@ -1067,9 +1074,9 @@ + "checksum num-rational 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "288629c76fac4b33556f4b7ab57ba21ae202da65ba8b77466e6d598e31990790" + "checksum num-traits 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "99843c856d68d8b4313b03a17e33c4bb42ae8f6610ea81b28abe076ac721b9b0" + "checksum num_cpus 1.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "aec53c34f2d0247c5ca5d32cca1478762f301740468ee9ee6dcb7a0dd7a0c584" +-"checksum openssl 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)" = "f776f1d8af832fd2c637ee182c801e8f7ea8895718a2be9914cca001f6e2c40a" ++"checksum openssl 0.9.20 (registry+https://github.com/rust-lang/crates.io-index)" = "8bf434ff6117485dc16478d77a4f5c84eccc9c3645c4da8323b287ad6a15a638" + "checksum openssl-probe 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d98df0270d404ccd3c050a41d579c52d1db15375168bb3471e04ec0f5f378daf" +-"checksum openssl-sys 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)" = "ad95f8160d1c150c4f44d4c4959732e048ac046c37f597fe362f8bf57561ffb4" ++"checksum openssl-sys 0.9.20 (registry+https://github.com/rust-lang/crates.io-index)" = "0ad395f1cee51b64a8d07cc8063498dc7554db62d5f3ca87a67f4eed2791d0c8" + "checksum percent-encoding 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "de154f638187706bde41d9b4738748933d64e6b37bdbffc0b47a97d16a6ae356" + "checksum pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "3a8b4c6b8165cd1a1cd4b9b120978131389f64bdaf456435caa41e630edba903" + "checksum psapi-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "abcd5d1a07d360e29727f757a9decb3ce8bc6e0efa8969cfaad669a8317a2478" -- cgit v1.2.3