Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (e85f75d682270d310d9fdca5d623618f0a019aa7)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (e85f75d682270d310d9fdca5d623618f0a019aa7)
  • Date: Fri, 14 Jul 2023 01:05:07 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

devel/rust/HISTORY | 2 +
devel/rust/PRE_BUILD | 4 +-
devel/rust/patches/0001-libressl-3.4.x.patch | 40
+++++++++++++++++++++++++++
3 files changed, 44 insertions(+), 2 deletions(-)

New commits:
commit e85f75d682270d310d9fdca5d623618f0a019aa7
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

devel/rust: libressl patch was updated again

previous update wasn't sufficient for cases with libressl >= 3.8.0,
added extra checks into more files to catch such cases

also, neutralized checksumming in all vendored crates

diff --git a/devel/rust/HISTORY b/devel/rust/HISTORY
index 057b66f..c562341 100644
--- a/devel/rust/HISTORY
+++ b/devel/rust/HISTORY
@@ -1,6 +1,8 @@
2023-07-13 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 1.71.0
* patches/0001-libressl-3.4.x.patch: updated
+ * PRE_]BUILD: incorporated code from firefox spell to neutralize
checksumming
+ in all vendored crates

2023-06-01 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 1.70.0
diff --git a/devel/rust/PRE_BUILD b/devel/rust/PRE_BUILD
index 531b74c..3615c48 100755
--- a/devel/rust/PRE_BUILD
+++ b/devel/rust/PRE_BUILD
@@ -6,8 +6,8 @@ apply_patch_dir patches &&
sedit '1s@bash$@sh@' src/tools/rust-installer/install-template.sh &&

# remove checksums to avoid failure with patched sources
-sed -i 's/"files":{[^}]*}/"files":{}/' \
- vendor/{libc,openssl-sys}/.cargo-checksum.json &&
+find vendor -name .cargo-checksum.json \
+ -exec sed -i -e 's/\("files":{\)[^}]*/\1/' {} \; &&

# Bootstrapping
# Installed rust will in general NOT WORK!
diff --git a/devel/rust/patches/0001-libressl-3.4.x.patch
b/devel/rust/patches/0001-libressl-3.4.x.patch
index 6933c79..62256e3 100644
--- a/devel/rust/patches/0001-libressl-3.4.x.patch
+++ b/devel/rust/patches/0001-libressl-3.4.x.patch
@@ -10,3 +10,43 @@ diff --git a/vendor/openssl-sys/build/main.rs
b/vendor/openssl-sys/build/main.rs
_ => version_error(),
};

+diff --git a/vendor/openssl-sys/build/cfgs.rs
b/vendor/openssl-sys/build/cfgs.rs
+index 960515f..f901e5a 100644
+--- a/vendor/openssl-sys/build/cfgs.rs
++++ b/vendor/openssl-sys/build/cfgs.rs
+@@ -52,6 +52,9 @@ pub fn get(openssl_version: Option<u64>, libressl_version:
Option<u64>) -> Vec<&
+ if libressl_version >= 0x3_07_00_00_0 {
+ cfgs.push("libressl370");
+ }
++ if libressl_version >= 0x3_08_00_00_0 {
++ cfgs.push("libressl380");
++ }
+ } else {
+ let openssl_version = openssl_version.unwrap();
+
+diff --git a/vendor/openssl-sys-0.9.85/build/main.rs
b/vendor/openssl-sys-0.9.85/build/main.rs
+--- a/vendor/openssl-sys-0.9.85/build/main.rs
++++ b/vendor/openssl-sys-0.9.85/build/main.rs
+@@ -285,6 +285,8 @@ See rust-openssl documentation for more information:
+ (3, 7, 0) => ('3', '7', '0'),
+ (3, 7, 1) => ('3', '7', '1'),
+ (3, 7, _) => ('3', '7', 'x'),
++ (3, 8, 0) => ('3', '8', '0'),
++ (3, 8, _) => ('3', '8', 'x'),
+ _ => version_error(),
+ };
+
+diff --git a/vendor/openssl-sys-0.9.85/build/cfgs.rs
b/vendor/openssl-sys-0.9.85/build/cfgs.rs
+index 960515f..f901e5a 100644
+--- a/vendor/openssl-sys-0.9.85/build/cfgs.rs
++++ b/vendor/openssl-sys-0.9.85/build/cfgs.rs
+@@ -52,6 +52,9 @@ pub fn get(openssl_version: Option<u64>, libressl_version:
Option<u64>) -> Vec<&
+ if libressl_version >= 0x3_07_00_00_0 {
+ cfgs.push("libressl370");
+ }
++ if libressl_version >= 0x3_08_00_00_0 {
++ cfgs.push("libressl380");
++ }
+ } else {
+ let openssl_version = openssl_version.unwrap();
+



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (e85f75d682270d310d9fdca5d623618f0a019aa7), Pavel Vinogradov, 07/13/2023

Archive powered by MHonArc 2.6.24.

Top of Page