Skip to Content.
Sympa Menu

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

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 (a1fe3298c0a302a0b3771a7dd3d00861abf343cb)
  • Date: Mon, 22 Aug 2022 13:59:21 +0000

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

ruby-raa/ruby-3.1/HISTORY | 2 +
ruby-raa/ruby-3.1/patches/0001-Unbundle-gems.patch | 33
+++++++++++++++++++++
2 files changed, 35 insertions(+)

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

ruby-3.1: Unbundle gems

The rbs gem specifically fails to compile against musl.

At the risk gems in general might contain pre-compiled artifacts, it's
necessary to unbundle them.

diff --git a/ruby-raa/ruby-3.1/HISTORY b/ruby-raa/ruby-3.1/HISTORY
index 322dfd6..539b52d 100644
--- a/ruby-raa/ruby-3.1/HISTORY
+++ b/ruby-raa/ruby-3.1/HISTORY
@@ -1,6 +1,8 @@
2022-08-16 Ismael Luceno <ismael AT sourcemage.org>
* PRE_BUILD, patches/0001-Fix-build-with-LibreSSL-3.5.patch:
fixed build against libressl
+ * patches/0001-Unbundle-gems.patch:
+ unbundled gems due to build issues against musl

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/patches/0001-Unbundle-gems.patch
b/ruby-raa/ruby-3.1/patches/0001-Unbundle-gems.patch
new file mode 100644
index 0000000..8a2e562
--- /dev/null
+++ b/ruby-raa/ruby-3.1/patches/0001-Unbundle-gems.patch
@@ -0,0 +1,33 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+Subject: [PATCH] Unbundle gems
+Date: Mon, 18 Oct 2021 13:22:48 +0200
+From: Jakub Jirutka <jakub AT jirutka.cz>
+
+Don't install bundled gems - we package them separately.
+
+Origin: Alpine Linux
+Upstream-Status: Unknown
+[ismael AT iodev.co.uk: Normalised patch and edited commit message]
+Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
+---
+ tool/rbinstall.rb | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/tool/rbinstall.rb
++++ b/tool/rbinstall.rb
+@@ -947,6 +947,7 @@
+ end
+ end
+
++=begin XXX-Patched
+ install?(:ext, :comm, :gem, :'bundled-gems') do
+ gem_dir = Gem.default_dir
+ install_dir = with_destdir(gem_dir)
+@@ -1026,5 +1027,6 @@
+ puts "skip installing bundled gems because of lacking zlib"
+ end
+ end
++=end
+
+ parse_args()
+



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

Archive powered by MHonArc 2.6.24.

Top of Page