From aba5767078a6eb9b4467fc3bf0a307d0a834e3b3 Mon Sep 17 00:00:00 2001 From: Niels Sascha Reedijk Date: Wed, 9 May 2018 20:36:46 +0000 Subject: [PATCH] Rust 1.17.0: update the git2 dependency of cargo to prevent crashes --- dev-lang/rust/patches/cargo-0.18.0.patchset | 214 ++++++++++++++++++-- dev-lang/rust/rust-1.17.0.recipe | 4 +- 2 files changed, 204 insertions(+), 14 deletions(-) diff --git a/dev-lang/rust/patches/cargo-0.18.0.patchset b/dev-lang/rust/patches/cargo-0.18.0.patchset index 79d7130ac..5be425424 100644 --- a/dev-lang/rust/patches/cargo-0.18.0.patchset +++ b/dev-lang/rust/patches/cargo-0.18.0.patchset @@ -1,7 +1,7 @@ From 919eca059d280e4b73403d4d1013a52525fc72e2 Mon Sep 17 00:00:00 2001 From: Niels Sascha Reedijk Date: Sun, 8 Oct 2017 08:09:26 +0000 -Subject: [PATCH 1/4] Update dependencies to packages with Haiku support +Subject: [PATCH 1/5] Update dependencies to packages with Haiku support * num_cpus from 1.3.0 to 1.4.0 * fs2 from 0.4.1 to 0.4.2 @@ -10,7 +10,7 @@ Subject: [PATCH 1/4] Update dependencies to packages with Haiku support 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock -index 44c3a43..ef6d222 100644 +index 44c3a43b..ef6d2223 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -13,7 +13,7 @@ dependencies = [ @@ -68,13 +68,13 @@ index 44c3a43..ef6d222 100644 "checksum openssl-probe 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "756d49c8424483a3df3b5d735112b4da22109ced9a8294f1f5cdf80fb3810919" "checksum openssl-sys 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)" = "14f5bfd12054d764510b887152d564ba11d99ae24ea7d740781778f646620576" -- -2.7.0 +2.16.2 From c8a25f5dc277550dbd18fbe530337c92464fbf18 Mon Sep 17 00:00:00 2001 From: Niels Sascha Reedijk Date: Sun, 8 Oct 2017 08:10:10 +0000 -Subject: [PATCH 2/4] Haiku: libc does not define SIGSYS. Use the constant +Subject: [PATCH 2/5] Haiku: libc does not define SIGSYS. Use the constant instead. To be fixed in future versions of liblibc @@ -83,7 +83,7 @@ To be fixed in future versions of liblibc 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cargo/util/errors.rs b/src/cargo/util/errors.rs -index 80a2540..2ccfc2b 100644 +index 80a25401..2ccfc2b0 100644 --- a/src/cargo/util/errors.rs +++ b/src/cargo/util/errors.rs @@ -431,7 +431,7 @@ pub fn process_error(msg: &str, @@ -96,13 +96,13 @@ index 80a2540..2ccfc2b 100644 _ => "", }; -- -2.7.0 +2.16.2 From 69d9620d86d523874414ab26dc4f2a1589ca2b19 Mon Sep 17 00:00:00 2001 From: Niels Sascha Reedijk Date: Sun, 8 Oct 2017 11:30:02 +0000 -Subject: [PATCH 3/4] Haiku: properly process the SYSCONFDIR for Haiku +Subject: [PATCH 3/5] Haiku: properly process the SYSCONFDIR for Haiku packaging --- @@ -110,7 +110,7 @@ Subject: [PATCH 3/4] Haiku: properly process the SYSCONFDIR for Haiku 1 file changed, 2 insertions(+) diff --git a/configure b/configure -index 55e9bb0..ea47e82 100755 +index 55e9bb0d..ea47e820 100755 --- a/configure +++ b/configure @@ -379,6 +379,7 @@ CFG_INFODIR=${CFG_INFODIR#${CFG_PREFIX}} @@ -130,13 +130,13 @@ index 55e9bb0..ea47e82 100755 putvar CFG_RUSTDOC putvar CFG_CARGO -- -2.7.0 +2.16.2 From 0351ea70283314d9b88fd9af529a864b07028877 Mon Sep 17 00:00:00 2001 From: Niels Sascha Reedijk Date: Sun, 8 Oct 2017 17:54:43 +0000 -Subject: [PATCH 4/4] Haiku: rename() gives an error when the filenames are the +Subject: [PATCH 4/5] Haiku: rename() gives an error when the filenames are the same. Backport of future fix --- @@ -144,7 +144,7 @@ Subject: [PATCH 4/4] Haiku: rename() gives an error when the filenames are the 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cargo/ops/cargo_rustc/mod.rs b/src/cargo/ops/cargo_rustc/mod.rs -index 14ebcc2..4b029c9 100644 +index 14ebcc28..4b029c99 100644 --- a/src/cargo/ops/cargo_rustc/mod.rs +++ b/src/cargo/ops/cargo_rustc/mod.rs @@ -364,7 +364,7 @@ fn rustc(cx: &mut Context, unit: &Unit, exec: Arc) -> CargoResult +Date: Wed, 9 May 2018 18:17:02 +0000 +Subject: [PATCH 5/5] Haiku: update libgit2-sys to 0.6.18 + +This includes PR #276 for the git2-rs repository. git_libgit2_shutdown is no +longer called atexit(). This call created segfaults regularly in cargo. +--- + Cargo.lock | 49 ++++++++++++++++++++++++++++++++++--------------- + 1 file changed, 34 insertions(+), 15 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index ef6d2223..6ec09033 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -14,13 +14,13 @@ dependencies = [ + "filetime 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "flate2 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", + "fs2 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "git2 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "git2 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", + "git2-curl 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", + "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.21 (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.18 (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)", +@@ -71,6 +71,11 @@ name = "bitflags" + version = "0.7.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + ++[[package]] ++name = "bitflags" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ + [[package]] + name = "bufstream" + version = "0.1.2" +@@ -84,7 +89,7 @@ dependencies = [ + "cargo 0.18.0", + "filetime 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "flate2 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", +- "git2 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "git2 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", + "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.21 (registry+https://github.com/rust-lang/crates.io-index)", +@@ -99,6 +104,11 @@ dependencies = [ + "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + ] + ++[[package]] ++name = "cc" ++version = "1.0.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ + [[package]] + name = "cfg-if" + version = "0.1.0" +@@ -142,7 +152,7 @@ name = "curl" + version = "0.4.6" + source = "registry+https://github.com/rust-lang/crates.io-index" + dependencies = [ +- "curl-sys 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "curl-sys 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-probe 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-sys 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", +@@ -151,7 +161,7 @@ dependencies = [ + + [[package]] + name = "curl-sys" +-version = "0.3.11" ++version = "0.3.12" + source = "registry+https://github.com/rust-lang/crates.io-index" + dependencies = [ + "gcc 0.3.45 (registry+https://github.com/rust-lang/crates.io-index)", +@@ -159,6 +169,7 @@ dependencies = [ + "libz-sys 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-sys 0.9.10 (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.3 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + ] + +@@ -235,12 +246,12 @@ dependencies = [ + + [[package]] + name = "git2" +-version = "0.6.4" ++version = "0.6.10" + source = "registry+https://github.com/rust-lang/crates.io-index" + dependencies = [ +- "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.21 (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.18 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-probe 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-sys 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +@@ -252,7 +263,7 @@ version = "0.7.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + dependencies = [ + "curl 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "git2 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "git2 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + ] +@@ -307,12 +318,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + + [[package]] + name = "libgit2-sys" +-version = "0.6.8" ++version = "0.6.18" + source = "registry+https://github.com/rust-lang/crates.io-index" + dependencies = [ ++ "cc 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)", + "cmake 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)", +- "curl-sys 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", +- "gcc 0.3.45 (registry+https://github.com/rust-lang/crates.io-index)", ++ "curl-sys 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)", + "libssh2-sys 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", + "libz-sys 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", +@@ -791,6 +802,11 @@ name = "utf8-ranges" + version = "1.0.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + ++[[package]] ++name = "vcpkg" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ + [[package]] + name = "void" + version = "1.0.2" +@@ -820,13 +836,15 @@ dependencies = [ + "checksum aho-corasick 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ca972c2ea5f742bfce5687b9aef75506a764f61d37f8f649047846a9686ddb66" + "checksum aho-corasick 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "500909c4f87a9e52355b26626d890833e9e1d53ac566db76c36faa984b889699" + "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.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7b48dbe2ff0e98fa2f03377d204a9637d3c9816cd431bfe05a8abbd0ea11d074" ++"checksum cc 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)" = "0ebb87d1116151416c0cf66a0e3fb6430cccd120fd6300794b4dfaa050ac40ba" + "checksum cfg-if 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "de1e760d7b6535af4241fca8bd8adf68e2e7edacc6b29f5d399050c5e48cf88c" + "checksum chrono 0.2.25 (registry+https://github.com/rust-lang/crates.io-index)" = "9213f7cd7c27e95c2b57c49f0e69b1ea65b27138da84a170133fd21b07659c00" + "checksum cmake 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)" = "d18d68987ed4c516dcc3e7913659bfa4076f5182eea4a7e0038bb060953e76ac" + "checksum crossbeam 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "0c5ea215664ca264da8a9d9c3be80d2eaf30923c259d03e870388eb927508f97" + "checksum curl 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c90e1240ef340dd4027ade439e5c7c2064dd9dc652682117bd50d1486a3add7b" +-"checksum curl-sys 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)" = "23e7e544dc5e1ba42c4a4a678bd47985e84b9c3f4d3404c29700622a029db9c3" ++"checksum curl-sys 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)" = "f00c8ba847fb0730c293069b4d1203dc01bf3c2e1f90b4e55f426ed8f4a1eeac" + "checksum docopt 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ab32ea6e284d87987066f21a9e809a73c14720571ef34516f0890b3d355ccfd8" + "checksum dtoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "80c8b71fd71146990a9742fc06dcbbde19161a267e0ad4e572c35162f4578c90" + "checksum env_logger 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e3856f1697098606fc6cb97a93de88ca3f3bc35bb878c725920e6e82ecf05e83" +@@ -836,7 +854,7 @@ dependencies = [ + "checksum fs2 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9ab76cfd2aaa59b7bf6688ad9ba15bbae64bff97f04ea02144cfd3443e5c2866" + "checksum gcc 0.3.45 (registry+https://github.com/rust-lang/crates.io-index)" = "40899336fb50db0c78710f53e87afc54d8c7266fb76262fecc78ca1a7f09deae" + "checksum gdi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0912515a8ff24ba900422ecda800b52f4016a56251922d397c576bf92c690518" +-"checksum git2 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "046ae03385257040b2a35e56d9669d950dd911ba2bf48202fbef73ee6aab27b2" ++"checksum git2 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "40a111aecd59985496012976beca164b4f6c930d507a099831e06b07f19d54f1" + "checksum git2-curl 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "68676bc784bf0bef83278898929bf64a251e87c0340723d0b93fa096c9c5bf8e" + "checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb" + "checksum hamcrest 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bf088f042a467089e9baa4972f57f9247e42a0cc549ba264c7a04fbb8ecb89d4" +@@ -845,7 +863,7 @@ dependencies = [ + "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" + "checksum lazy_static 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "4732c563b9a21a406565c4747daa7b46742f082911ae4753f390dc9ec7ee1a97" + "checksum libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)" = "88ee81885f9f04bff991e306fea7c1c60a5f0f9e409e99f6b40e3311a3363135" +-"checksum libgit2-sys 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)" = "68bed1d1198da5d2b047af68fd71613ddfaa3d5b68797181b33e9d8547263b4b" ++"checksum libgit2-sys 0.6.18 (registry+https://github.com/rust-lang/crates.io-index)" = "82fc20bd8beefe7c9f98aae2d3cff78e57f544cdd83d58fe181ec37a5fbe0c77" + "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" +@@ -904,6 +922,7 @@ dependencies = [ + "checksum user32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4ef4711d107b21b410a3a974b1204d9accc8b10dad75d8324b5d755de1617d47" + "checksum utf8-ranges 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a1ca13c08c41c9c3e04224ed9ff80461d97e121589ff27c753a16cb10830ae0f" + "checksum utf8-ranges 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "662fab6525a98beff2921d7f61a39e7d59e0b425ebc7d0d9e66d316e55124122" ++"checksum vcpkg 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7ed0f6789c8a85ca41bbc1c9d175422116a9869bd1cf31bb08e1493ecce60380" + "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" + "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" + "checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" +-- +2.16.2 diff --git a/dev-lang/rust/rust-1.17.0.recipe b/dev-lang/rust/rust-1.17.0.recipe index 67949198d..77bcc1beb 100644 --- a/dev-lang/rust/rust-1.17.0.recipe +++ b/dev-lang/rust/rust-1.17.0.recipe @@ -39,8 +39,8 @@ PATCHES="rust-$portVersion.patchset" PATCHES_3="rust-installer-$portVersion.patchset" PATCHES_7="cargo-$cargoVersion.patchset" PATCHES_10="cargo-vendor-$srcGitRev10.patchset" -REVISION="1" -ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64" +REVISION="2" +ARCHITECTURES="!x86_gcc2 ?x86 x86_64" SECONDARY_ARCHITECTURES="x86" PROVIDES="