Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (0573fbd963d63fdfb03e1be4de9cb2232e239d8a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (0573fbd963d63fdfb03e1be4de9cb2232e239d8a)
  • Date: Tue, 16 Aug 2022 22:19:10 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

ChangeLog | 1
VDEPENDS | 5 +-
ruby-raa/ruby-3.1/HISTORY | 4 +
ruby-raa/ruby-3.1/PRE_BUILD | 3 +
ruby-raa/ruby-3.1/patches/0001-Fix-build-with-LibreSSL-3.5.patch | 25
++++++++++
5 files changed, 37 insertions(+), 1 deletion(-)

New commits:
commit 0573fbd963d63fdfb03e1be4de9cb2232e239d8a
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

VDEPENDS: Add runtime_depends support

commit 62b901f9b87be7d0b0abf90d504e60a8eebf2213
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

ruby-3.1: Fix build against libressl

diff --git a/ChangeLog b/ChangeLog
index 56f4363..ca02f96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
2022-08-16 Ismael Luceno <ismael AT sourcemage.org>
* devel/fossil: new spell, simple, high-reliability, distributed SCM
+ * VDEPENDS: Add support for runtime_depends (*-prefixed rules)

2022-08-14 Vlad Glagolev <stealth AT sourcemage.org>
* net/rofi-connman: new spell, menu-driven connman interface
diff --git a/VDEPENDS b/VDEPENDS
index a85cbbe..337caf1 100644
--- a/VDEPENDS
+++ b/VDEPENDS
@@ -55,7 +55,10 @@ vdepends() {
rest="${rest%[ ]flags:*}"
;;
esac
- depends -sub "$features" "$dep" "$flags" || return
+ case "$dep" in
+ (\**) runtime_depends -sub "$features" "${dep#\*}" "$flags" || return
;;
+ (*) depends -sub "$features" "$dep" "$flags" || return ;;
+ esac
# remove whitespace
read rest <<< "$rest"
# parse and check versions
diff --git a/ruby-raa/ruby-3.1/HISTORY b/ruby-raa/ruby-3.1/HISTORY
index 2767905..322dfd6 100644
--- a/ruby-raa/ruby-3.1/HISTORY
+++ b/ruby-raa/ruby-3.1/HISTORY
@@ -1,3 +1,7 @@
+2022-08-16 Ismael Luceno <ismael AT sourcemage.org>
+ * PRE_BUILD, patches/0001-Fix-build-with-LibreSSL-3.5.patch:
+ fixed build against libressl
+
2022-04-12 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 3.1.2, SECURITY_PATCH++, (CVE-2022-28738,
CVE-2022-28739)

diff --git a/ruby-raa/ruby-3.1/PRE_BUILD b/ruby-raa/ruby-3.1/PRE_BUILD
new file mode 100755
index 0000000..c230ad1
--- /dev/null
+++ b/ruby-raa/ruby-3.1/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+apply_patch_dir patches
diff --git a/ruby-raa/ruby-3.1/patches/0001-Fix-build-with-LibreSSL-3.5.patch
b/ruby-raa/ruby-3.1/patches/0001-Fix-build-with-LibreSSL-3.5.patch
new file mode 100644
index 0000000..55993d9
--- /dev/null
+++ b/ruby-raa/ruby-3.1/patches/0001-Fix-build-with-LibreSSL-3.5.patch
@@ -0,0 +1,25 @@
+From e25fb0d0d86da5a9398ebdc9216b2ea89f80fa3d Mon Sep 17 00:00:00 2001
+From: Jeremy Evans <code AT jeremyevans.net>
+Date: Fri, 25 Mar 2022 13:11:31 -0700
+Subject: [PATCH] Fix build with LibreSSL 3.5
+
+Origin: Upstream
+Upstream-Status: Backport
[https://github.com/ruby/openssl/commit/e25fb0d0d86da5a9398ebdc9216b2ea89f80fa3d]
+Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
+---
+ ext/openssl/ossl_pkey.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ext/openssl/ossl_pkey.c b/ext/openssl/ossl_pkey.c
+index 2a4835a2..24d0da46 100644
+--- a/ext/openssl/ossl_pkey.c
++++ b/ext/openssl/ossl_pkey.c
+@@ -670,7 +670,7 @@ ossl_pkey_export_traditional(int argc, VALUE *argv,
VALUE self, int to_der)
+ }
+ }
+ else {
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000 &&
!defined(LIBRESSL_VERSION_NUMBER)
++#if OSSL_OPENSSL_PREREQ(1, 1, 0) || OSSL_LIBRESSL_PREREQ(3, 5, 0)
+ if (!PEM_write_bio_PrivateKey_traditional(bio, pkey, enc, NULL, 0,
+ ossl_pem_passwd_cb,
+ (void *)pass)) {



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (0573fbd963d63fdfb03e1be4de9cb2232e239d8a), Ismael Luceno, 08/16/2022

Archive powered by MHonArc 2.6.24.

Top of Page