[gentoo-commits] repo/proj/libressl:master commit in: dev-lang/rust/files/

[gentoo-commits] repo/proj/libressl:master commit in: dev-lang/rust/files/

[orbea]

commit:     bf69c96f63971f67ce9b7b44bbef3066f9769146
Author:     orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Sat Nov  9 20:38:16 2024 +0000
Commit:     orbea <orbea <AT> riseup <DOT> net>
CommitDate: Sat Nov  9 20:38:16 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=bf69c96f

dev-lang/rust: update patch for libressl-4.0.0

Signed-off-by: orbea <orbea <AT> riseup.net>

 dev-lang/rust/files/1.71.0-libressl-openssl-sys.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/rust/files/1.71.0-libressl-openssl-sys.patch b/dev-lang/rust/files/1.71.0-libressl-openssl-sys.patch
index 4869569..bfa3ad2 100644
--- a/dev-lang/rust/files/1.71.0-libressl-openssl-sys.patch
+++ b/dev-lang/rust/files/1.71.0-libressl-openssl-sys.patch
@@ -4,7 +4,7 @@
              (3, 7, 0) => ('3', '7', '0'),
              (3, 7, 1) => ('3', '7', '1'),
              (3, 7, _) => ('3', '7', 'x'),
-+            (3, _, _) => ('3', 'x', 'x'),
++            (_, _, _) => ('x', 'x', 'x'),
              _ => version_error(),
          };
  

[gentoo-commits] repo/proj/libressl:master commit in: dev-lang/rust/files/

[orbea]

commit:     deb8b2d1d1414efd90b557701193e7e28567a967
Author:     orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Tue Oct 15 20:02:13 2024 +0000
Commit:     orbea <orbea <AT> riseup <DOT> net>
CommitDate: Tue Oct 15 20:08:03 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=deb8b2d1

dev-lang/rust: update libressl patch

Signed-off-by: orbea <orbea <AT> riseup.net>

 dev-lang/rust/files/1.72.0-libressl-openssl-sys.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/rust/files/1.72.0-libressl-openssl-sys.patch b/dev-lang/rust/files/1.72.0-libressl-openssl-sys.patch
index 2d03b58..2bb3403 100644
--- a/dev-lang/rust/files/1.72.0-libressl-openssl-sys.patch
+++ b/dev-lang/rust/files/1.72.0-libressl-openssl-sys.patch
@@ -4,7 +4,7 @@
              (3, 7, 1) => ('3', '7', '1'),
              (3, 7, _) => ('3', '7', 'x'),
              (3, 8, 0) => ('3', '8', '0'),
-+            (3, _, _) => ('3', 'x', 'x'),
++            (_, _, _) => ('x', 'x', 'x'),
              _ => version_error(),
          };
  

[gentoo-commits] repo/proj/libressl:master commit in: dev-lang/rust/files/

[orbea]

commit:     c0b3a738552c78599f5e686985d7b42b0ba026fa
Author:     orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Sun Feb 25 02:31:34 2024 +0000
Commit:     orbea <orbea <AT> riseup <DOT> net>
CommitDate: Sun Feb 25 02:31:34 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=c0b3a738

dev-lang/rust: drop patch

Signed-off-by: orbea <orbea <AT> riseup.net>

 ....0-ignore-broken-and-non-applicable-tests.patch | 40 ----------------------
 1 file changed, 40 deletions(-)

diff --git a/dev-lang/rust/files/1.68.0-ignore-broken-and-non-applicable-tests.patch b/dev-lang/rust/files/1.68.0-ignore-broken-and-non-applicable-tests.patch
deleted file mode 100644
index 3ebd6e1..0000000
--- a/dev-lang/rust/files/1.68.0-ignore-broken-and-non-applicable-tests.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 1879d1d1a284bf51c752e47db284ce22701ed5d0 Mon Sep 17 00:00:00 2001
-From: Samuel Holland <samuel@sholland.org>
-Date: Sun, 16 Sep 2018 16:38:48 +0000
-Subject: [PATCH 12/15] Ignore broken and non-applicable tests
-
-c-link-to-rust-va-list-fn: unstable feature, broken on aarch64, #56475
-env-funky-keys: can't handle LD_PRELOAD (e.g. sandbox)
-long-linker-command-lines: takes >10 minutes to run (but still passes)
-simd-intrinsic-generic-bitmask.rs: broken on BE, #59356
-sparc-struct-abi: no sparc target
-sysroot-crates-are-unstable: can't run rustc without RPATH
----
- test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile | 2 ++
- test/ui/env-funky-keys.rs                                   | 1 +
- 6 files changed, 10 insertions(+)
-
-diff --git a/tests/run-make-fulldeps/sysroot-crates-are-unstable/Makefile b/tests/run-make-fulldeps/sysroot-crates-are-unstable/Makefile
-index 9e770706857..6d92ec5cec8 100644
---- a/tests/run-make-fulldeps/sysroot-crates-are-unstable/Makefile
-+++ b/tests/run-make-fulldeps/sysroot-crates-are-unstable/Makefile
-@@ -1,1 +1,3 @@
-+# ignore-test
-+
- all:
-         python2.7 test.py
-diff --git a/tests/ui/env-funky-keys.rs b/tests/ui/env-funky-keys.rs
-index c5c824ac58d..f3fe047a79c 100644
---- a/tests/ui/env-funky-keys.rs
-+++ b/tests/ui/env-funky-keys.rs
-@@ -1,6 +1,7 @@
- // run-pass
- // Ignore this test on Android, because it segfaults there.
- 
-+// ignore-test
- // ignore-android
- // ignore-windows
- // ignore-cloudabi no execve
--- 
-2.24.1
-

[gentoo-commits] repo/proj/libressl:master commit in: dev-lang/rust/files/

[orbea]

commit:     1cea73eae5768915086a7891628438865d7664df
Author:     orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Sun Jul 16 16:37:51 2023 +0000
Commit:     orbea <orbea <AT> riseup <DOT> net>
CommitDate: Sun Jul 16 16:37:51 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=1cea73ea

dev-lang/rust: don't use grep -P

Closes: https://github.com/gentoo/libressl/issues/534
Signed-off-by: orbea <orbea <AT> riseup.net>

 dev-lang/rust/files/rehash-crate.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-lang/rust/files/rehash-crate.sh b/dev-lang/rust/files/rehash-crate.sh
index 8f738b7..1ffd775 100644
--- a/dev-lang/rust/files/rehash-crate.sh
+++ b/dev-lang/rust/files/rehash-crate.sh
@@ -7,8 +7,8 @@ cargo='.cargo-checksum.json'
 
 grep -- '+++' "${1:?}" | while read -r _ f; do
 	file="${f#*/}"
-	orig_sum="$(grep -Po "(?<=\"${file}\":\")[0-9a-fA-F]+(?=\")" \
-		"${cargo}")"
+	orig_sum="$(grep -Eo "\"${file}\":\"[0-9a-fA-F]+\"" "${cargo}" |
+		cut -d':' -f2 | tr -d '"')"
 	if [ -n "${orig_sum}" ]; then
 		sum="$(sha256sum "${file}")"
 		sed -i "s|${orig_sum}|${sum%% *}|" "${cargo}"