tebako 0.12.12 → 0.12.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbeaa96ed5adc8b64a5b45221d29cbb3f5b54fda39a1cf6d8c5c5b2783325d1a
-  data.tar.gz: d9caebc260d253d3331ceb1a8fdc44fa54afcd7e206039a10c41fad015bc0564
+  metadata.gz: e5dfbc9c8a17708a202aa333ed09c402b36b6d706f2887c388ff347c894b0aed
+  data.tar.gz: 0ada18f007357af9d5b3669d7978798b3ba75f8e7a33da21db54ef0d5aeb942b
 SHA512:
-  metadata.gz: 2677f3e56a34f9733010fcc991c20bbd82ba4568f48a00128e0da4e143ff53193d6208d049af068143f91c85d32f06a0ea9d9529ac54505fe18f38f1746a15d5
-  data.tar.gz: 1acc1c09d10b14f8bcf10f4a121d00dec596e797b733d40ada3e8a376c910b32ab1e8e24834addda583319fc62720db8debaa1ed75b8ebe79b52e331bc8febcf
+  metadata.gz: 862754c38a4a4cfaad4efb5d5b8ae17e8e710e4ff6207514dffa9b65f2254300dd545e526c19f3e7af4f716aa5f7c13f13ab75108ae300357d3d2e553f2552c1
+  data.tar.gz: 77a2252f8ee30c8c8ffaa1329f4ada031fc31b9e22e24228886d5a8a59c5e23da8894eea94233e0159f3d08e58ef6d3d7ead9ef25efc290d7ce593de65489400

data/CMakeLists.txt

@@ -108,14 +108,15 @@ elseif("${OSTYPE_TXT}" MATCHES "^msys*" OR "${OSTYPE_TXT}" MATCHES "^cygwin*")
   set(RUBY_WITHOUT_EXT "dbm,syslog,pty,gdbm,readline,-test-/*")
 elseif("${OSTYPE_TXT}" MATCHES "^darwin.*")
   set(IS_DARWIN ON)
-  if(${RUBY_VER} VERSION_LESS "3.1.0")
-    set(OPENSSL_VER "1.1")
-  else(${RUBY_VER} VERSION_LESS "3.1.0")
-    set(OPENSSL_VER "3")
-  endif(${RUBY_VER} VERSION_LESS "3.1.0")
-  set(BUILD_OPENSSL_ROOT_DIR "${BREW_PREFIX}/opt/openssl@${OPENSSL_VER}")
 endif()
 
+if(${RUBY_VER} VERSION_LESS "3.1.0")
+  set(OPENSSL_VER "1.1")
+else(${RUBY_VER} VERSION_LESS "3.1.0")
+  set(OPENSSL_VER "3")
+endif(${RUBY_VER} VERSION_LESS "3.1.0")
+
+
 if(IS_DARWIN)
   execute_process(
     COMMAND "sysctl" "-n" "hw.ncpu"
@@ -177,7 +178,7 @@ string(CONCAT RUBY_API_VER ${RUBY_VER_BASE} ".0")
 #  list(GET LIBDWARFS_WR_VER_COMPONENTS 2 LIBDWARFS_WR_VER_PATCH)
 #  set (LIBDWARFS_WR_VER_M ${LIBDWARFS_WR_VER_MAJOR}.${LIBDWARFS_WR_VER_MINOR}.${LIBDWARFS_WR_VER_PATCH})
 #else(DWARFS_PRELOAD)
-def_ext_prj_g(DWARFS_WR "v0.9.5")
+def_ext_prj_g(DWARFS_WR "v0.9.6")
 #endif(DWARFS_PRELOAD)
 
 def_ext_prj_g(PATCHELF "65e14792061c298f1d2bc44becd48a10cbf0bc81")
@@ -288,6 +289,7 @@ else(DWARFS_PRELOAD)
                -DWITH_ASAN:BOOL=OFF
                -DWITH_COVERAGE:BOOL=OFF
                -DTEBAKO_BUILD_SCOPE=MKD
+               -DOPENSSL_VERSION=${OPENSSL_VER}
                -DRB_W32=${RB_W32}
                -GNinja
     BUILD_BYPRODUCTS ${__LIBDWARFS_WR}
@@ -335,6 +337,9 @@ if(IS_DARWIN)
 else(IS_DARWIN)
   if(IS_MUSL)
     string(CONCAT RUBY_C_FLAGS ${RUBY_C_FLAGS} " -DENABLE_PATH_CHECK=0")
+    if("${OPENSSL_VER}" EQUAL "1.1")
+      set(OPENSSL_RUBY_OPTION "--with-openssl-dir=${DEPS}")
+    endif("${OPENSSL_VER}" EQUAL "1.1")
   endif(IS_MUSL)
 
   if(RB_W32)

data/README.adoc

@@ -104,7 +104,7 @@ higher.
 | 2.7.8 | Linux, macOS
 | 3.0.7 | Linux, macOS
 | 3.1.6 | Linux, macOS, Windows
-| 3.2.{4,5,6} | Linux, macOS, Windows
+| 3.2.{4,5,6,7} | Linux, macOS, Windows
 | 3.3.{3,4,5,6,7} | Linux, macOS, Windows
 | 3.4.1 | Linux, macOS, Windows
 
@@ -781,7 +781,7 @@ the Tebako root folder (see details: <<root-folder-selection>>)
 
 `Ruby`::
 this parameter defines Ruby version that will be packaged (optional, defaults to
-`3.2.6`)
+`3.3.7`)
 
 `project-root`::
 a folder at the host source file system where project files are located.
@@ -1092,7 +1092,7 @@ specified in Gemfile.
 | The version specified by `--Ruby` option if it is supported and satisfies Gemfile requirement; error otherwise
 | The minimal supported Ruby version that satisfies Gemfile requirement; error otherwise
 | *Not specified*
-| The version specified by `--Ruby` option if it is supported; error otherwise | Default Tebako Ruby version (3.2.6).
+| The version specified by `--Ruby` option if it is supported; error otherwise | Default Tebako Ruby version (3.3.7).
 
 |===
 

data/common.env

@@ -1,5 +1,5 @@
 BUILD_TYPE=Release
 DEPS=deps
 INCBIN_TAG=348e36b
-DWARFS_WR_TAG=v0.9.5
-RUBY_VER=3.2.6
+DWARFS_WR_TAG=v0.9.6
+RUBY_VER=3.3.7

data/lib/tebako/deploy_helper.rb

@@ -68,7 +68,7 @@ module Tebako
     def deploy
       BuildHelpers.with_env(deploy_env) do
         update_rubygems
-        system("#{gem_command} env") if @verbose
+        system("#{@gem_command} env") if @verbose
         install_gem("tebako-runtime")
         install_gem("bundler", @bundler_version) if @needs_bundler
         deploy_solution

data/lib/tebako/packager/pass1_patch.rb

@@ -236,7 +236,7 @@ module Tebako
       def msys_patches
         pm = msys_base_patches
 
-        if @ruby_ver.ruby337?
+        if @ruby_ver.ruby3x7?
           # ....................................................
           # RUBY_EXTERN shall be extern for static build but is set to __declspec(dllimport) for encodin libarary
           pm.store("include/ruby/onigmo.h", INCLUDE_RUBY_ONIGMO_H_PATCH)

data/lib/tebako/packager/pass2_patch.rb

@@ -35,16 +35,6 @@ require_relative "patch_buildsystem"
 module Tebako
   # Packager module
   module Packager
-    class << self
-      def crt_pass2_patch(ostype, deps_lib_dir, ruby_ver)
-        scmb = ScenarioManagerBase.new(ostype)
-        if scmb.msys?
-          Pass2MSysPatch.new(ostype, deps_lib_dir, ruby_ver)
-        else
-          Pass2NonMSysPatch.new(ostype, deps_lib_dir, ruby_ver)
-        end
-      end
-    end
     # Ruby patching definitions (pass2)
     class Pass2Patch < Patch
       def initialize(ostype, deps_lib_dir, ruby_ver)
@@ -62,6 +52,12 @@ module Tebako
         pm
       end
 
+      protected
+
+      def io_c_patch
+        PatchHelpers.patch_c_file_pre("/* define system APIs */")
+      end
+
       private
 
       include Tebako::Packager::PatchBuildsystem
@@ -88,17 +84,6 @@ module Tebako
         patch
       end
 
-      def io_c_msys_patch
-        patch = @ruby_ver.ruby32? ? IO_C_MSYS_PATCH : IO_C_MSYS_PATCH_PRE_32
-        patch.merge(IO_C_MSYS_BASE_PATCH)
-      end
-
-      def io_c_patch
-        patch = PatchHelpers.patch_c_file_pre("/* define system APIs */")
-        patch.merge!(io_c_msys_patch) if @scmb.msys?
-        patch
-      end
-
       def util_c_patch
         if @ruby_ver.ruby31?
           PatchHelpers.patch_c_file_post("#endif /* !HAVE_GNU_QSORT_R */")
@@ -140,69 +125,6 @@ module Tebako
       end
     end
 
-    # Msys Pass2 patches
-    class Pass2MSysPatch < Pass2Patch
-      def patch_map
-        pm = super
-        pm.merge!(msys_patches)
-        pm.store("config.status", get_config_status_patch(@ostype, @deps_lib_dir, @ruby_ver))
-        pm
-      end
-
-      private
-
-      include Tebako::Packager::PatchBuildsystem
-      include Tebako::Packager::PatchLiterals
-
-      # Other MSYS (GNUMakefile) specific patches
-      #  - The same issue with libraries as for Makefile above
-      #  - 'Kill' ruby.exp regeneration on pass2
-      #     since we want to use output from pass1 for implib generation
-      #     [VERY UGLY HACK]
-      #  - Introduce LIBRUBY dependency on static extensions
-      #    This is an addition to COMMON_MK_PATCH specified above
-      def gnumakefile_in_patch_p2 # rubocop:disable Metrics/MethodLength
-        objext = @ruby_ver.ruby32? ? "$(OBJEXT)" : "@OBJEXT@"
-
-        {
-          "$(Q) $(DLLWRAP) \\" => GNUMAKEFILE_IN_DLLTOOL_SUBST,
-
-          "--output-exp=$(RUBY_EXP) \\" => "# tebako patched --output-exp=$(RUBY_EXP) \\",
-
-          "--export-all $(LIBRUBY_A) $(LIBS) -o $(PROGRAM)" =>
-            "# tebako patched --export-all $(LIBRUBY_A) $(LIBS) -o $(PROGRAM)",
-
-          "@rm -f $(PROGRAM)" => "# tebako patched @rm -f $(PROGRAM)",
-
-          "	$(Q) $(LDSHARED) $(DLDFLAGS) $(OBJS) dmyext.o $(SOLIBS) -o $(PROGRAM)" =>
-           "# tebako patched  $(Q) $(LDSHARED) $(DLDFLAGS) $(OBJS) dmyext.o $(SOLIBS) -o $(PROGRAM)",
-
-          "$(WPROGRAM): $(RUBYW_INSTALL_NAME).res.#{objext}" =>
-            "$(WPROGRAM): $(RUBYW_INSTALL_NAME).res.#{objext} $(WINMAINOBJ)  # tebako patched",
-
-          "RUBYDEF = $(DLL_BASE_NAME).def" => GNUMAKEFILE_IN_WINMAIN_SUBST,
-
-          "$(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(LIBS) -o $@" =>
-            "$(WINMAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(MAINLIBS) -o $@  # tebako patched",
-
-          "$(RUBY_EXP): $(LIBRUBY_A)" => "dummy.exp: $(LIBRUBY_A) # tebako patched",
-
-          "$(PROGRAM): $(RUBY_INSTALL_NAME).res.#{objext}" =>
-            "$(PROGRAM): $(RUBY_INSTALL_NAME).res.#{objext} $(LIBRUBY_A) # tebako patched\n" \
-            "$(LIBRUBY_A): $(LIBRUBY_A_OBJS) $(INITOBJS) # tebako patched\n"
-        }
-      end
-
-      def msys_patches
-        {
-          "cygwin/GNUmakefile.in" => gnumakefile_in_patch_p2,
-          "ruby.c" => RUBY_C_MSYS_PATCHES,
-          "win32/file.c" => WIN32_FILE_C_MSYS_PATCHES,
-          "win32/win32.c" => WIN32_WIN32_C_MSYS_PATCHES
-        }
-      end
-    end
-
     # Non-msys Pass2 patches
     class Pass2NonMSysPatch < Pass2Patch
       def patch_map
@@ -212,7 +134,6 @@ module Tebako
         pm
       end
 
-      include Tebako::Packager::PatchBuildsystem
       include Tebako::Packager::PatchLiterals
     end
   end

data/lib/tebako/packager/pass2_patch_crt.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2021-2025 [Ribose Inc](https://www.ribose.com).
+# All rights reserved.
+# This file is a part of tebako
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+require_relative "pass2_patch"
+require_relative "pass2msys_patch"
+
+# Tebako - an executable packager
+module Tebako
+  # Packager module
+  module Packager
+    class << self
+      def crt_pass2_patch(ostype, deps_lib_dir, ruby_ver)
+        scmb = ScenarioManagerBase.new(ostype)
+        if scmb.msys?
+          Pass2MSysPatch.new(ostype, deps_lib_dir, ruby_ver)
+        else
+          Pass2NonMSysPatch.new(ostype, deps_lib_dir, ruby_ver)
+        end
+      end
+    end
+  end
+end

data/lib/tebako/packager/pass2msys_patch.rb

@@ -0,0 +1,186 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2021-2025 [Ribose Inc](https://www.ribose.com).
+# All rights reserved.
+# This file is a part of tebako
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+require_relative "pass2_patch"
+require_relative "patch_helpers"
+require_relative "patch_literals"
+
+# Tebako - an executable packager
+module Tebako
+  # Packager module
+  module Packager
+    IO_C_MSYS_BASE_PATCH = {
+      "#define open	rb_w32_uopen" => "#define open(p, f, m) tebako_open(3, (p), (f), (m))"
+    }.freeze
+
+    IO_C_MSYS_PATCH_PRE_32 = {
+      "(rb_w32_io_cancelable_p((fptr)->fd) ? Qnil : rb_io_wait(fptr->self, RB_INT2NUM(RUBY_IO_READABLE), Qnil))" =>
+          "((is_tebako_file_descriptor((fptr)->fd) || rb_w32_io_cancelable_p((fptr)->fd)) ? \\\n" \
+          "Qnil : rb_io_wait(fptr->self, RB_INT2NUM(RUBY_IO_READABLE), Qnil))"
+    }.freeze
+
+    IO_C_MSYS_PATCH = {
+      "(rb_w32_io_cancelable_p((fptr)->fd) ? Qnil : rb_io_wait(fptr->self, " \
+      "RB_INT2NUM(RUBY_IO_READABLE), RUBY_IO_TIMEOUT_DEFAULT))" =>
+          "((is_tebako_file_descriptor((fptr)->fd) || rb_w32_io_cancelable_p((fptr)->fd)) ? \\\n" \
+          "Qnil : rb_io_wait(fptr->self, RB_INT2NUM(RUBY_IO_READABLE), RUBY_IO_TIMEOUT_DEFAULT))"
+    }.freeze
+
+    RUBY_C_MSYS_PATH_SUBST = <<~SUBST
+      /* -- Start of tebako patch -- */
+              VALUE path = within_tebako_memfs(paths) ?
+                              rb_str_new_cstr(paths) :
+                              RUBY_RELATIVE(paths, len);
+              /* -- End of tebako patch -- */
+    SUBST
+
+    RUBY_C_MSYS_PATCHES = {
+      "#ifndef MAXPATHLEN" => "#{PatchLiterals::C_FILE_SUBST_LESS}\n#ifndef MAXPATHLEN",
+      "VALUE path = RUBY_RELATIVE(paths, len);" => RUBY_C_MSYS_PATH_SUBST
+    }.freeze
+
+    WIN32_FILE_C_MSYS_SUBST = <<~SUBST
+      /* -- Start of tebako patch -- */
+        if (tebako_file_load_ok(path)) return ret;
+          /* -- End of tebako patch -- */
+      wpath = mbstr_to_wstr(CP_UTF8, path, -1, &len);
+    SUBST
+
+    WIN32_FILE_C_MSYS_PATCHES = {
+      "#ifndef INVALID_FILE_ATTRIBUTES" => "#{PatchLiterals::C_FILE_SUBST_LESS}\n#ifndef INVALID_FILE_ATTRIBUTES",
+      "wpath = mbstr_to_wstr(CP_UTF8, path, -1, &len);" => WIN32_FILE_C_MSYS_SUBST
+    }.freeze
+
+    WIN32_WIN32_C_MSYS_SUBST = <<~SUBST
+      /* -- Start of tebako patch -- */
+        if (is_tebako_cwd()) {
+          char* tebako_cwd = tebako_getcwd(NULL,0);
+          if (tebako_cwd == NULL) {
+            errno = ENOMEM;
+            return NULL;
+          }
+          len = strlen(tebako_cwd) + 1;
+
+          if (buffer) {
+            if (size < len) {
+              free(tebako_cwd);
+              errno = ERANGE;
+              return NULL;
+            }
+          }
+          else {
+            buffer = (*alloc)(len, arg);
+            if (!buffer) {
+              free(tebako_cwd);
+              errno = ENOMEM;
+              return NULL;
+            }
+          }
+          translate_char(tebako_cwd, (char)0x5c, '/', CP_UTF8);
+          strcpy(buffer, tebako_cwd);
+          free(tebako_cwd);
+          return buffer;
+        }
+        /* -- End of tebako patch -- */
+
+        len = GetCurrentDirectoryW(0, NULL);
+    SUBST
+
+    WIN32_WIN32_C_MSYS_PATCHES = {
+      "#if defined _MSC_VER && _MSC_VER <= 1200" =>
+        "#{PatchLiterals::C_FILE_SUBST_LESS}\n#if defined _MSC_VER && _MSC_VER <= 1200",
+      "len = GetCurrentDirectoryW(0, NULL);" => WIN32_WIN32_C_MSYS_SUBST
+    }.freeze
+
+    # Msys Pass2 patches
+    class Pass2MSysPatch < Pass2Patch
+      def patch_map
+        pm = super
+        pm.merge!(msys_patches)
+        pm.store("config.status", get_config_status_patch(@ostype, @deps_lib_dir, @ruby_ver))
+        pm
+      end
+
+      private
+
+      # Other MSYS (GNUMakefile) specific patches
+      #  - The same issue with libraries as for Makefile above
+      #  - 'Kill' ruby.exp regeneration on pass2
+      #     since we want to use output from pass1 for implib generation
+      #     [VERY UGLY HACK]
+      #  - Introduce LIBRUBY dependency on static extensions
+      #    This is an addition to COMMON_MK_PATCH specified above
+      def gnumakefile_in_patch_p2 # rubocop:disable Metrics/MethodLength
+        objext = @ruby_ver.ruby32? ? "$(OBJEXT)" : "@OBJEXT@"
+
+        {
+          "$(Q) $(DLLWRAP) \\" => GNUMAKEFILE_IN_DLLTOOL_SUBST,
+
+          "--output-exp=$(RUBY_EXP) \\" => "# tebako patched --output-exp=$(RUBY_EXP) \\",
+
+          "--export-all $(LIBRUBY_A) $(LIBS) -o $(PROGRAM)" =>
+            "# tebako patched --export-all $(LIBRUBY_A) $(LIBS) -o $(PROGRAM)",
+
+          "@rm -f $(PROGRAM)" => "# tebako patched @rm -f $(PROGRAM)",
+
+          "	$(Q) $(LDSHARED) $(DLDFLAGS) $(OBJS) dmyext.o $(SOLIBS) -o $(PROGRAM)" =>
+           "# tebako patched  $(Q) $(LDSHARED) $(DLDFLAGS) $(OBJS) dmyext.o $(SOLIBS) -o $(PROGRAM)",
+
+          "$(WPROGRAM): $(RUBYW_INSTALL_NAME).res.#{objext}" =>
+            "$(WPROGRAM): $(RUBYW_INSTALL_NAME).res.#{objext} $(WINMAINOBJ)  # tebako patched",
+
+          "RUBYDEF = $(DLL_BASE_NAME).def" => GNUMAKEFILE_IN_WINMAIN_SUBST,
+
+          "$(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(LIBS) -o $@" =>
+            "$(WINMAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(MAINLIBS) -o $@  # tebako patched",
+
+          "$(RUBY_EXP): $(LIBRUBY_A)" => "dummy.exp: $(LIBRUBY_A) # tebako patched",
+
+          "$(PROGRAM): $(RUBY_INSTALL_NAME).res.#{objext}" =>
+            "$(PROGRAM): $(RUBY_INSTALL_NAME).res.#{objext} $(LIBRUBY_A) # tebako patched\n" \
+            "$(LIBRUBY_A): $(LIBRUBY_A_OBJS) $(INITOBJS) # tebako patched\n"
+        }
+      end
+
+      def io_c_patch
+        patch = super
+        patch.merge!(@ruby_ver.ruby32? ? IO_C_MSYS_PATCH : IO_C_MSYS_PATCH_PRE_32)
+        patch.merge!(IO_C_MSYS_BASE_PATCH)
+        patch
+      end
+
+      def msys_patches
+        {
+          "cygwin/GNUmakefile.in" => gnumakefile_in_patch_p2,
+          "ruby.c" => RUBY_C_MSYS_PATCHES,
+          "win32/file.c" => WIN32_FILE_C_MSYS_PATCHES,
+          "win32/win32.c" => WIN32_WIN32_C_MSYS_PATCHES
+        }
+      end
+    end
+  end
+end

data/lib/tebako/packager/patch_literals.rb

@@ -220,23 +220,6 @@ module Tebako
             flags = fcntl(fd, F_GETFD); /* should not fail except EBADF. */
       SUBST
 
-      IO_C_MSYS_BASE_PATCH = {
-        "#define open	rb_w32_uopen" => "#define open(p, f, m) tebako_open(3, (p), (f), (m))"
-      }.freeze
-
-      IO_C_MSYS_PATCH_PRE_32 = {
-        "(rb_w32_io_cancelable_p((fptr)->fd) ? Qnil : rb_io_wait(fptr->self, RB_INT2NUM(RUBY_IO_READABLE), Qnil))" =>
-            "((is_tebako_file_descriptor((fptr)->fd) || rb_w32_io_cancelable_p((fptr)->fd)) ? \\\n" \
-            "Qnil : rb_io_wait(fptr->self, RB_INT2NUM(RUBY_IO_READABLE), Qnil))"
-      }.freeze
-
-      IO_C_MSYS_PATCH = {
-        "(rb_w32_io_cancelable_p((fptr)->fd) ? Qnil : rb_io_wait(fptr->self, " \
-        "RB_INT2NUM(RUBY_IO_READABLE), RUBY_IO_TIMEOUT_DEFAULT))" =>
-            "((is_tebako_file_descriptor((fptr)->fd) || rb_w32_io_cancelable_p((fptr)->fd)) ? \\\n" \
-            "Qnil : rb_io_wait(fptr->self, RB_INT2NUM(RUBY_IO_READABLE), RUBY_IO_TIMEOUT_DEFAULT))"
-      }.freeze
-
       FILE_C_MSYS_SUBST = <<~SUBST
         /* -- Start of tebako patch -- */
                if (is_tebako_file_descriptor((fptr)->fd)) return ENOTSUP;
@@ -248,71 +231,6 @@ module Tebako
         "while ((int)rb_thread_io_blocking_region(rb_thread_flock, op, fptr->fd) < 0) {" => FILE_C_MSYS_SUBST
       }.freeze
 
-      RUBY_C_MSYS_PATH_SUBST = <<~SUBST
-        /* -- Start of tebako patch -- */
-                VALUE path = within_tebako_memfs(paths) ?
-                                rb_str_new_cstr(paths) :
-                                RUBY_RELATIVE(paths, len);
-               /* -- End of tebako patch -- */
-      SUBST
-
-      RUBY_C_MSYS_PATCHES = {
-        "#ifndef MAXPATHLEN" => "#{C_FILE_SUBST_LESS}\n#ifndef MAXPATHLEN",
-        "VALUE path = RUBY_RELATIVE(paths, len);" => RUBY_C_MSYS_PATH_SUBST
-      }.freeze
-
-      WIN32_FILE_C_MSYS_SUBST = <<~SUBST
-        /* -- Start of tebako patch -- */
-          if (tebako_file_load_ok(path)) return ret;
-            /* -- End of tebako patch -- */
-        wpath = mbstr_to_wstr(CP_UTF8, path, -1, &len);
-      SUBST
-
-      WIN32_FILE_C_MSYS_PATCHES = {
-        "#ifndef INVALID_FILE_ATTRIBUTES" => "#{C_FILE_SUBST_LESS}\n#ifndef INVALID_FILE_ATTRIBUTES",
-        "wpath = mbstr_to_wstr(CP_UTF8, path, -1, &len);" => WIN32_FILE_C_MSYS_SUBST
-      }.freeze
-
-      WIN32_WIN32_C_MSYS_SUBST = <<~SUBST
-        /* -- Start of tebako patch -- */
-          if (is_tebako_cwd()) {
-            char* tebako_cwd = tebako_getcwd(NULL,0);
-            if (tebako_cwd == NULL) {
-              errno = ENOMEM;
-              return NULL;
-            }
-            len = strlen(tebako_cwd) + 1;
-
-            if (buffer) {
-              if (size < len) {
-                free(tebako_cwd);
-                errno = ERANGE;
-                return NULL;
-              }
-            }
-            else {
-              buffer = (*alloc)(len, arg);
-              if (!buffer) {
-                free(tebako_cwd);
-                errno = ENOMEM;
-                return NULL;
-              }
-            }
-            translate_char(tebako_cwd, (char)0x5c, '/', CP_UTF8);
-            strcpy(buffer, tebako_cwd);
-            free(tebako_cwd);
-            return buffer;
-          }
-          /* -- End of tebako patch -- */
-
-          len = GetCurrentDirectoryW(0, NULL);
-      SUBST
-
-      WIN32_WIN32_C_MSYS_PATCHES = {
-        "#if defined _MSC_VER && _MSC_VER <= 1200" => "#{C_FILE_SUBST_LESS}\n#if defined _MSC_VER && _MSC_VER <= 1200",
-        "len = GetCurrentDirectoryW(0, NULL);" => WIN32_WIN32_C_MSYS_SUBST
-      }.freeze
-
       LINUX_PATCHES = {
         "ext/extmk.rb" => {
           "mf.macro \"EXTLIBS\", $extlibs" => "#  mf.macro \"EXTLIBS\", $extlibs   tebako patched"

data/lib/tebako/packager.rb

@@ -35,7 +35,7 @@ require_relative "ruby_builder"
 require_relative "stripper"
 require_relative "packager/pass1_patch"
 require_relative "packager/pass1a_patch"
-require_relative "packager/pass2_patch"
+require_relative "packager/pass2_patch_crt"
 require_relative "packager/patch_helpers"
 
 # Tebako - an executable packager

data/lib/tebako/ruby_version.rb

@@ -39,6 +39,7 @@ module Tebako
       "3.2.4" => "c72b3c5c30482dca18b0f868c9075f3f47d8168eaf626d4e682ce5b59c858692",
       "3.2.5" => "ef0610b498f60fb5cfd77b51adb3c10f4ca8ed9a17cb87c61e5bea314ac34a16",
       "3.2.6" => "d9cb65ecdf3f18669639f2638b63379ed6fbb17d93ae4e726d4eb2bf68a48370",
+      "3.2.7" => "8488fa620ff0333c16d437f2b890bba3b67f8745fdecb1472568a6114aad9741",
       "3.3.3" => "83c05b2177ee9c335b631b29b8c077b4770166d02fa527f3a9f6a40d13f3cce2",
       "3.3.4" => "fe6a30f97d54e029768f2ddf4923699c416cdbc3a6e96db3e2d5716c7db96a34",
       "3.3.5" => "3781a3504222c2f26cb4b9eb9c1a12dbf4944d366ce24a9ff8cf99ecbce75196",
@@ -48,7 +49,7 @@ module Tebako
     }.freeze
 
     MIN_RUBY_VERSION_WINDOWS = "3.1.6"
-    DEFAULT_RUBY_VERSION = "3.2.6"
+    DEFAULT_RUBY_VERSION = "3.3.7"
 
     def initialize(ruby_version)
       @ruby_version = ruby_version.nil? ? DEFAULT_RUBY_VERSION : ruby_version
@@ -90,8 +91,14 @@ module Tebako
       @ruby33 ||= ruby3x? && @ruby_version[2].to_i >= 3
     end
 
-    def ruby337?
-      @ruby337 ||= ruby34? || (ruby33? && @ruby_version[2] == "3" && @ruby_version[4].to_i >= 7)
+    def ruby33only?
+      @ruby33only ||= ruby3x? && @ruby_version[2] == "3"
+    end
+
+    def ruby3x7?
+      @ruby3x7 ||= ruby34? ||
+                   (ruby33only? && @ruby_version[4].to_i >= 7) ||
+                   (ruby32only? && @ruby_version[4].to_i >= 7)
     end
 
     def ruby34?

data/lib/tebako/version.rb

@@ -26,5 +26,5 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 module Tebako
-  VERSION = "0.12.12"
+  VERSION = "0.12.14"
 end

data/tools/.github/workflows/test.yml

@@ -182,3 +182,29 @@ jobs:
 
       - name: Run CMake test
         run: cmake -B test.build -S tests/cmake
+
+  test-setup-openssl-alpine:
+    name: test openssl 1.1.1 setup on alpine
+    runs-on: ubuntu-latest
+    container:
+      image: alpine:3.17
+
+    steps:
+      - name: Install packages
+        run: |
+          apk --no-cache --upgrade add git bash cmake make build-base autoconf binutils-dev linux-headers
+          git config --global --add safe.directory $PWD
+
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Run cmake script
+        run: |
+          cmake -B build/setup-openssl tests/setup-openssl
+          cmake --build build/setup-openssl
+
+      - name: Test
+        run: |
+          set -o errexit -o pipefail -o noclobber -o nounset
+          v=$(build/setup-openssl/deps/bin/openssl version)
+          [ "$v" = "OpenSSL 1.1.1w  11 Sep 2023" ]

data/tools/ci-scripts/patch-folly.sh

@@ -499,6 +499,8 @@ EOM
   defined_msc_ver_to_win32 "$1/folly/external/farmhash/farmhash.cpp"
   defined_msc_ver_to_win32 "$1/folly/detail/IPAddressSource.h"
   defined_msc_ver_to_win32 "$1/folly/portability/Sockets.cpp"
+  defined_win32_to_msc_ver "$1/folly/portability/Sched.h"
+  defined_win32_to_msc_ver "$1/folly/portability/Sched.cpp"
 
   defined_n_win32_to_msc_ver "$1/folly/portability/Dirent.h"
   defined_win32_to_msc_ver "$1/folly/portability/Dirent.cpp"

data/tools/cmake-scripts/macos-environment.cmake

@@ -55,7 +55,10 @@ if (CMAKE_HOST_SYSTEM_NAME MATCHES "Darwin")
 
   message(STATUS "Using brew environment at ${BREW_PREFIX}")
   # https://github.com/actions/virtual-environments/blob/main/images/macos/macos-10.15-Readme.me
-  set(OPENSSL_ROOT_DIR "${BREW_PREFIX}/opt/openssl@3")
+  if(NOT DEFINED OPENSSL_VERSION)
+    set(OPENSSL_VERSION "3")
+  endif()
+  set(OPENSSL_ROOT_DIR "${BREW_PREFIX}/opt/openssl@${OPENSSL_VERSION}")
   set(CMAKE_PREFIX_PATH "${BREW_PREFIX}")
   include_directories("${OPENSSL_ROOT_DIR}/include")
   include_directories("${BREW_PREFIX}/include")
@@ -80,7 +83,7 @@ if (CMAKE_HOST_SYSTEM_NAME MATCHES "Darwin")
   set(CMAKE_CXX_FLAGS "-DTARGET_OS_SIMULATOR=0 -DTARGET_OS_IPHONE=0")
 
   set(BUILD_CMAKE_ARGUMENTS -DCMAKE_PREFIX_PATH=${BUILD_CMAKE_PREFIX_PATH}
-                            -DOPENSSL_ROOT_DIR=${BUILD_OPENSSL_ROOT_DIR}
+                            -DOPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR}
                             -DBISON_EXECUTABLE=${BISON_EXECUTABLE}
                             -DFLEX_EXECUTABLE=${FLEX_EXECUTABLE}
   )

data/tools/cmake-scripts/setup-libarchive.cmake

@@ -1,4 +1,4 @@
-# Copyright (c) 2022-2024 [Ribose Inc](https://www.ribose.com).
+# Copyright (c) 2022-2025 [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
 # This file is a part of tebako
 #
@@ -27,6 +27,10 @@ def_ext_prj_t(LIBARCHIVE "3.6.2" "9e2c1b80d5fbe59b61308fdfab6c79b5021d7ff4ff2489
 
 message(STATUS "Collecting libarchive - " v${LIBARCHIVE_VER} " at " ${LIBARCHIVE_SOURCE_DIR})
 
+if(DEFINED OPENSSL_ROOT_DIR)
+  set(OPENSSL_DIR_OPT "-DOPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR}")
+endif(DEFINED OPENSSL_ROOT_DIR)
+
 set(CMAKE_ARGUMENTS -DCMAKE_INSTALL_PREFIX=${DEPS}
                     -DCMAKE_BUILD_TYPE=Release
                     -DBUILD_SHARED_LIBS:BOOL=OFF
@@ -41,13 +45,14 @@ set(CMAKE_ARGUMENTS -DCMAKE_INSTALL_PREFIX=${DEPS}
                     -DENABLE_TEST:BOOL=OFF
                     -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
                     -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
+                    ${OPENSSL_DIR_OPT}
 )
 
-if(TEBAKO_BUILD_TARGET)
+if(DEFINED TEBAKO_BUILD_TARGET)
   list(APPEND CMAKE_ARGUMENTS  -DCMAKE_C_FLAGS=--target=${TEBAKO_BUILD_TARGET})
   list(APPEND CMAKE_ARGUMENTS  -DCMAKE_EXE_LINKER_FLAGS=--target=${TEBAKO_BUILD_TARGET})
   list(APPEND CMAKE_ARGUMENTS  -DCMAKE_SHARED_LINKER_FLAGS=--target=${TEBAKO_BUILD_TARGET})
-endif(TEBAKO_BUILD_TARGET)
+endif(DEFINED TEBAKO_BUILD_TARGET)
 
   # ...................................................................
   # libarchive is the module that creates the real pain here

data/tools/cmake-scripts/{setup-openssl.cmake → setup-openssl-1.1.1.cmake}

@@ -1,4 +1,4 @@
-# Copyright (c) 2023 [Ribose Inc](https://www.ribose.com).
+# Copyright (c) 2023-2025 [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
 # This file is a part of tebako
 #
@@ -38,6 +38,7 @@ if(OPENSSL_RES EQUAL 0)
   message(STATUS "Found OpenSSL version ${OPENSSL_VER} at ${DEPS}/bin/openssl")
   if((${OPENSSL_VER} VERSION_GREATER_EQUAL "1.1.0") AND (${OPENSSL_VER} VERSION_LESS "3.0.0"))
     set(WITH_OPENSSL_BUILD OFF)
+    set(OPENSSL_ROOT_DIR "${DEPS}")
   endif((${OPENSSL_VER} VERSION_GREATER_EQUAL "1.1.0") AND (${OPENSSL_VER} VERSION_LESS "3.0.0"))
 endif(OPENSSL_RES EQUAL 0)
 
@@ -67,3 +68,28 @@ if(WITH_OPENSSL_BUILD)
     endif((${OPENSSL_VER} VERSION_GREATER_EQUAL "1.1.0") AND (${OPENSSL_VER} VERSION_LESS "3.0.0"))
   endif(OPENSSL_RES EQUAL 0)
 endif(WITH_OPENSSL_BUILD)
+
+if(WITH_OPENSSL_BUILD)
+  message(STATUS "Building OpenSSL 1.1.1w")
+  def_ext_prj_g(OPENSSL "OpenSSL_1_1_1w")
+
+  set(__LIBSSL "${DEPS}/lib/libssl.a")
+  set(__LIBCRYPTO "${DEPS}/lib/libcrypto.a")
+
+  ExternalProject_Add(${OPENSSL_PRJ}
+    PREFIX ${DEPS}
+    GIT_REPOSITORY "https://github.com/openssl/openssl.git"
+    GIT_TAG ${OPENSSL_TAG}
+    UPDATE_COMMAND ""
+    SOURCE_DIR ${OPENSSL_SOURCE_DIR}
+    BINARY_DIR ${OPENSSL_BINARY_DIR}
+    CONFIGURE_COMMAND   ${GNU_BASH} -c "${OPENSSL_SOURCE_DIR}/config          \
+                                                        --openssldir=${DEPS}  \
+                                                        --prefix=${DEPS}      \
+                                                        no-shared"
+    BUILD_BYPRODUCTS ${__LIBSSL} ${__LIBCRYPTO}
+  )
+
+  set(OPENSSL_ROOT_DIR "${DEPS}")
+
+endif(WITH_OPENSSL_BUILD)

data/tools/dwarfs-test-helper/CMakeLists.txt

@@ -0,0 +1,34 @@
+# Copyright (c) 2025, [Ribose Inc](https://www.ribose.com).
+# All rights reserved.
+# This file is a part of tebako
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+cmake_minimum_required(VERSION 3.24.0)
+project(setup-openssl)
+
+include(ExternalProject)
+
+set(GNU_BASH bash)
+
+include(${ROOT}/tools/cmake-scripts/def-external-project.cmake)
+include(${ROOT}/tools/cmake-scripts/setup-openssl-1.1.1.cmake)

data/tools/tests/setup-openssl/CMakeLists.txt

@@ -0,0 +1,36 @@
+# Copyright (c) 2025, [Ribose Inc](https://www.ribose.com).
+# All rights reserved.
+# This file is a part of tebako
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+cmake_minimum_required(VERSION 3.24.0)
+project(setup-openssl-test)
+
+include(ExternalProject)
+
+set(ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../..)
+set(DEPS ${CMAKE_CURRENT_BINARY_DIR}/deps)
+set(GNU_BASH bash)
+
+include(${ROOT}/cmake-scripts/def-external-project.cmake)
+include(${ROOT}/cmake-scripts/setup-openssl-1.1.1.cmake)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tebako
 version: !ruby/object:Gem::Version
-  version: 0.12.12
+  version: 0.12.14
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-02-14 00:00:00.000000000 Z
+date: 2025-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -219,6 +219,8 @@ files:
 - lib/tebako/packager/pass1_patch.rb
 - lib/tebako/packager/pass1a_patch.rb
 - lib/tebako/packager/pass2_patch.rb
+- lib/tebako/packager/pass2_patch_crt.rb
+- lib/tebako/packager/pass2msys_patch.rb
 - lib/tebako/packager/patch.rb
 - lib/tebako/packager/patch_buildsystem.rb
 - lib/tebako/packager/patch_helpers.rb
@@ -254,14 +256,16 @@ files:
 - tools/cmake-scripts/setup-libfmt.cmake
 - tools/cmake-scripts/setup-libhowardhinnerdate.cmake
 - tools/cmake-scripts/setup-libutfcpp.cmake
-- tools/cmake-scripts/setup-openssl.cmake
+- tools/cmake-scripts/setup-openssl-1.1.1.cmake
 - tools/cmake-scripts/version.cmake
+- tools/dwarfs-test-helper/CMakeLists.txt
 - tools/include/pro-statvfs.h
 - tools/tests/cmake/CMakeLists.txt
 - tools/tests/setup-libfmt/CMakeLists.txt
 - tools/tests/setup-libhowardhinnerdate/CMakeLists.txt
 - tools/tests/setup-librachive/CMakeLists.txt
 - tools/tests/setup-libutfcpp/CMakeLists.txt
+- tools/tests/setup-openssl/CMakeLists.txt
 homepage: https://github.com/tamatebako/tebako
 licenses:
 - BSD-2-Clause
@@ -292,7 +296,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Packager for Ruby executables