tebako 0.5.2 → 0.5.3

data/lib/tebako/packager/patch_literals.rb

@@ -0,0 +1,255 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2023 [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.
+
+# Tebako - an executable packager
+module Tebako
+  module Packager
+    # Ruby patching literals (pass2)
+    # rubocop:disable Metrics/ModuleLength
+    module PatchLiterals
+      TOOL_MKCONFIG_RB_PATCH = {
+        "    if fast[name]" => <<~SUBST
+          # -- Start of tebako patch --
+              v_head_comp = "  CONFIG[\\"prefix\\"] \#{eq} "
+              if v_head_comp == v[0...(v_head_comp.length)]
+                if win32
+                v = "\#{v[0...(v_head_comp.length)]}CONFIG[\\"RUBY_EXEC_PREFIX\\"] = '/__tebako_memfs__'
+          "
+                else
+                  v = "\#{v[0...(v_head_comp.length)]}'/__tebako_memfs__'
+          "
+                end
+              end
+              v_head_comp = "  CONFIG[\\"RUBY_EXEC_PREFIX\\"] \#{eq} "
+              if v_head_comp == v[0...(v_head_comp.length)]
+                v = "\#{v[0...(v_head_comp.length)]}'/__tebako_memfs__'
+          "
+              end
+          # -- End of tebako patch --
+              if fast[name]
+        SUBST
+      }.freeze
+
+      # Alpine-specific patches https://github.com/docker-library/ruby/blob/master/3.1/alpine3.15/Dockerfile
+      # -- Patch no. 1 --
+      # https://github.com/docker-library/ruby/issues/196
+      # https://bugs.ruby-lang.org/issues/14387#note-13 (patch source)
+      # https://bugs.ruby-lang.org/issues/14387#note-16
+      # ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here)
+
+      # -- Patch no. 2 -- not needed: isnan, isinf are detected correctly by configure script
+      # the configure script does not detect isnan/isinf as macros
+      #	export ac_cv_func_isnan=yes ac_cv_func_isinf=yes;
+
+      #	-- Patch no. 3 --
+      # hack in "ENABLE_PATH_CHECK" disabling to suppress:  "warning: Insecure world writable dir"
+      # Applied in CMakeLists.txt
+
+      LINUX_MUSL_THREAD_PTHREAD_PATCH = {
+        "#if MAINSTACKADDR_AVAILABLE && !defined(get_main_stack)" => <<~SUBST
+          /* -- Start of tebako patch -- */
+          #if defined(__linux__) && !defined(__GLIBC__) && defined(HAVE_GETRLIMIT)
+          #ifndef PAGE_SIZE
+          #include <unistd.h>
+          #define PAGE_SIZE sysconf(_SC_PAGE_SIZE)
+          #endif
+          static int
+          get_main_stack(void **addr, size_t *size)
+          {
+              size_t start, end, limit, prevend = 0;
+              struct rlimit r;
+              FILE *f;
+              char buf[PATH_MAX+80], s[8];
+              int n;
+              STACK_GROW_DIR_DETECTION;
+              f = fopen("/proc/self/maps", "re");
+              if (!f)
+                  return -1;
+              n = 0;
+              while (fgets(buf, sizeof buf, f)) {
+                  n = sscanf(buf, "%zx-%zx %*s %*s %*s %*s %7s", &start, &end, s);
+                  if (n >= 2) {
+                      if (n == 3 && strcmp(s, "[stack]") == 0)
+                          break;
+                      prevend = end;
+                  }
+                  n = 0;
+              }
+              fclose(f);
+              if (n == 0)
+                  return -1;
+              limit = 100 << 20; /* 100MB stack limit */
+              if (getrlimit(RLIMIT_STACK, &r)==0 && r.rlim_cur < limit)
+                  limit = r.rlim_cur & -PAGE_SIZE;
+              if (limit > end) limit = end;
+              if (prevend < end - limit) prevend = end - limit;
+              if (start > prevend) start = prevend;
+              *addr = IS_STACK_DIR_UPPER() ? (void *)start : (void *)end;
+              *size = end - start;
+              return 0;
+          }
+          #else
+          /* -- End of tebako patch -- */
+        SUBST
+      }.freeze
+
+      MAIN_C_PATCH = {
+        "int\nmain(int argc, char **argv)" =>
+        "#include <tebako/tebako-main.h>\n\nint\nmain(int argc, char **argv)",
+
+        "    ruby_sysinit(&argc, &argv);" => <<~SUBST
+              ruby_sysinit(&argc, &argv);
+          /* -- Start of tebako patch -- */
+              if (tebako_main(&argc, &argv) != 0) {
+                return -1;
+              }
+          /* -- End of tebako patch -- */
+        SUBST
+      }.freeze
+
+      # Compensate ruby incorrect processing of (f)getattrlist returning ENOTSUP
+      # Note. We are not patching need_normalization function
+      # In this function (f)getattrlist failure with ENOTSUP is processed correctly
+
+      DIR_C_BASE_PATCH_ONE = <<~SUBST
+        #if defined HAVE_GETATTRLIST && defined ATTR_DIR_ENTRYCOUNT
+            /* tebako patch */ if (!within_tebako_memfs(path))
+      SUBST
+
+      DIR_C_BASE_PATCH_TWO = <<~SUBST
+        #if USE_NAME_ON_FS == USE_NAME_ON_FS_REAL_BASENAME
+              /* tebako patch */ if (!within_tebako_memfs(path)) plain = 1; else magical = 1;
+      SUBST
+
+      DIR_C_BASE_PATCH = {
+        "#if defined HAVE_GETATTRLIST && defined ATTR_DIR_ENTRYCOUNT" => DIR_C_BASE_PATCH_ONE,
+        "#if USE_NAME_ON_FS == USE_NAME_ON_FS_REAL_BASENAME\n	    plain = 1;" => DIR_C_BASE_PATCH_TWO,
+        "if (is_case_sensitive(dirp, path) == 0)" =>
+          "if (is_case_sensitive(dirp, path) == 0 /* tebako patch */ && !within_tebako_memfs(path))",
+        "if ((*cur)->type == ALPHA) {" =>
+          "if ((*cur)->type == ALPHA /* tebako patch */ && !within_tebako_memfs(buf)) {",
+        "else if (e == EIO) {" =>
+          "else if (e == EIO /* tebako patch */ && !within_tebako_memfs(path)) {"
+      }.freeze
+
+      COMMON_MK_PATCH = {
+        "ext/extinit.c: $(srcdir)/template/extinit.c.tmpl $(PREP)" =>
+          "ext/extinit.c: $(srcdir)/template/extinit.c.tmpl $(PREP) $(EXTS_MK)"
+      }.freeze
+
+      C_FILES_TO_PATCH = [
+        ["file.c", "/* define system APIs */"],
+        ["io.c", "/* define system APIs */"],
+        ["util.c", "#ifndef S_ISDIR"],
+        ["dln.c", "static const char funcname_prefix[sizeof(FUNCNAME_PREFIX) - 1] = FUNCNAME_PREFIX;"]
+      ].freeze
+
+      TEMPLATE_MAKEFILE_IN_BASE_PATTERN_TWO_PRE_3_1 =
+        "\t\t$(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ) " \
+        "$(EXTOBJS) $(LIBRUBYARG) $(MAINLIBS) $(LIBS) $(EXTLIBS) $(OUTFLAG)$@"
+
+      TEMPLATE_MAKEFILE_IN_BASE_PATCH_TWO_PRE_3_1 =
+        "# -- Start of tebako patch --\n" \
+        "\t\t$(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ) " \
+        "$(EXTOBJS) $(LIBRUBYARG_STATIC) $(LIBS) $(OUTFLAG)$@\n" \
+        "# -- End of tebako patch --"
+
+      TEMPLATE_MAKEFILE_IN_BASE_PATTERN_TWO =
+        "\t\t$(Q) $(PURIFY) $(CC) $(EXE_LDFLAGS) $(XLDFLAGS) $(MAINOBJ) " \
+        "$(EXTOBJS) $(LIBRUBYARG) $(MAINLIBS) $(LIBS) $(EXTLIBS) $(OUTFLAG)$@"
+
+      TEMPLATE_MAKEFILE_IN_BASE_PATCH_TWO =
+        "# -- Start of tebako patch --\n" \
+        "\t\t$(Q) $(PURIFY) $(CC) $(EXE_LDFLAGS) $(XLDFLAGS) $(MAINOBJ) " \
+        "$(EXTOBJS) $(LIBRUBYARG_STATIC) $(LIBS) $(OUTFLAG)$@\n" \
+        "# -- End of tebako patch --"
+
+      C_FILE_SUBST = <<~SUBST
+        /* -- Start of tebako patch -- */
+        #ifndef NO_TEBAKO_INCLUDES
+        #include <tebako/tebako-config.h>
+        #include <tebako/tebako-defines.h>
+        #include <tebako/tebako-io-rb-w32.h>
+        #include <tebako/tebako-io.h>
+        #endif
+        /* -- End of tebako patch -- */
+      SUBST
+
+      MSYS_PATCHES = {
+        "ruby.c" => {
+          "#define RUBY_RELATIVE(path, len) rb_str_buf_cat(BASEPATH(), (path), (len))" =>
+          "#define RUBY_RELATIVE(path, len) rubylib_path_new((path), (len))  /* tebako patched */",
+          "#define PREFIX_PATH() sopath" =>
+            "#define PREFIX_PATH() rubylib_path_new(tebako_mount_point(), " \
+            "strlen(tebako_mount_point())) /* tebako patched */",
+          '#include "mjit.h"' =>
+            "#include \"mjit.h\"\n" \
+            "/* -- Start of tebako patch -- */\n" \
+            "#include <tebako/tebako-main.h>\n" \
+            "/* -- End of tebako patch -- */"
+        },
+        "/win32/win32.c" => {
+          "#undef __STRICT_ANSI__" =>
+          "#undef __STRICT_ANSI__\n" \
+          "/* -- Start of tebako patch -- */\n" \
+          "#define NO_TEBAKO_INCLUDES\n" \
+          "/* -- End of tebako patch -- */"
+        },
+        "win32/dir.h" => {
+          "#define opendir(s)   rb_w32_opendir((s))" => "#{C_FILE_SUBST}\n#define opendir(s)   rb_w32_opendir((s))"
+        },
+        "file.c" => {
+          "    wpath = mbstr_to_wstr(CP_UTF8, path, -1, &len);" =>
+          "/* -- Start of tebako patch -- */\n" \
+          "if (tebako_file_load_ok(path)) return 1;\n" \
+          "/* -- End of tebako patch -- */\n" \
+          "wpath = mbstr_to_wstr(CP_UTF8, path, -1, &len);",
+          '#include "win32/file.h' =>
+          "#include \"win32/file.h\"\n" \
+          "/* -- Start of tebako patch -- */\n" \
+          "#include <tebako/tebako-main.h>\n" \
+          "/* -- End of tebako patch -- */"
+        }
+
+      }.freeze
+
+      # rubocop:disable Style/WordArray
+      DARWIN_BREW_LIBS = [
+        ["openssl@1.1", "ssl"],   ["openssl@1.1", "crypto"],  ["zlib", "z"],            ["gdbm", "gdbm"],
+        ["readline", "readline"], ["libffi", "ffi"],          ["ncurses", "ncurses"],   ["fmt", "fmt"],
+        ["lz4", "lz4"],           ["xz", "lzma"],             ["libyaml", "yaml"],
+        ["double-conversion", "double-conversion"]
+      ].freeze
+
+      DARWIN_BREW_LIBS_32 = [["libyaml", "yaml"]].freeze
+
+      DARWIN_DEP_LIBS = ["glog", "gflags"].freeze
+      # rubocop:enable Style/WordArray
+    end
+    # rubocop:enable Metrics/ModuleLength
+  end
+end

data/lib/tebako/version.rb

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

data/tebako.gemspec

@@ -51,7 +51,7 @@ Gem::Specification.new do |spec|
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files --recurse-submodules -z`.split("\x0").reject do |f|
       (f == __FILE__) ||
-        f.match(%r{\A(?:(?:test|spec|features|deps|output|common\.env)/|\.(?:git|cirrus|tebako|rubocop))})
+        f.match(%r{\A(?:(?:tests|tests-2|features|deps|output|common\.env)/|\.(?:git|cirrus|tebako|rubocop))})
     end
   end
 

data/version.txt

@@ -1 +1 @@
-0.5.2
+0.5.3

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tebako
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-07-08 00:00:00.000000000 Z
+date: 2023-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -70,71 +70,13 @@ files:
 - lib/tebako/packager.rb
 - lib/tebako/packager/pass1.rb
 - lib/tebako/packager/pass2.rb
+- lib/tebako/packager/patch_helpers.rb
+- lib/tebako/packager/patch_literals.rb
 - lib/tebako/version.rb
 - resources/tebako-fs.cpp.in
 - resources/tebako-version.h.in
 - src/tebako-main.cpp
 - tebako.gemspec
-- tests-2/fixtures/gems-bundler/Gemfile
-- tests-2/fixtures/gems-bundler/gems-bundler.rb
-- tests-2/fixtures/gems-byebug/Gemfile
-- tests-2/fixtures/gems-byebug/gems-byebug.rb
-- tests-2/fixtures/gems-expressir/Gemfile
-- tests-2/fixtures/gems-expressir/gems-expressir.rb
-- tests-2/fixtures/gems-libmspack/Gemfile
-- tests-2/fixtures/gems-libmspack/gems-libmspack.rb
-- tests-2/fixtures/gems-sassc/Gemfile
-- tests-2/fixtures/gems-sassc/base_style/all.scss
-- tests-2/fixtures/gems-sassc/base_style/reset.scss
-- tests-2/fixtures/gems-sassc/gems-sassc.rb
-- tests-2/fixtures/gems-seven-zip/Gemfile
-- tests-2/fixtures/gems-seven-zip/gems-seven-zip.rb
-- tests-2/fixtures/launcher-coreincl/launcher-coreincl.rb
-- tests-2/fixtures/launcher-package/launcher-package.rb
-- tests-2/fixtures/launcher-pwd/launcher-pwd.rb
-- tests-2/fixtures/launcher-stdinredir/input.txt
-- tests-2/fixtures/launcher-stdinredir/launcher-stdinredir.rb
-- tests-2/fixtures/launcher-stdoutredir/launcher-stdoutredir.rb
-- tests-2/fixtures/patches-dir/level-1/level-2/file-1.txt
-- tests-2/fixtures/patches-dir/level-1/level-2/file-2.txt
-- tests-2/fixtures/patches-dir/level-1/level-2/file-3.txt
-- tests-2/fixtures/patches-dir/patches-dir.rb
-- tests-2/fixtures/patches-io-and-file/level-1/level-2/file-1.txt
-- tests-2/fixtures/patches-io-and-file/level-1/level-2/file-2.txt
-- tests-2/fixtures/patches-io-and-file/level-1/level-2/file-3.txt
-- tests-2/fixtures/patches-io-and-file/level-1/link-3
-- tests-2/fixtures/patches-io-and-file/patches-io-and-file.rb
-- tests-2/fixtures/patches-main/patches-main.rb
-- tests-2/tebako-test.rb
-- tests/scripts/cross-tests.sh
-- tests/scripts/functional-tests.sh
-- tests/test-00/test.rb
-- tests/test-01/tebako-test-run.rb
-- tests/test-09/tebako-test-0.0.1.gem
-- tests/test-11/bin/tebako-test-run.rb
-- tests/test-11/lib/tebako-test.rb
-- tests/test-11/tebako-test.gemspec
-- tests/test-12/tebako-test-a.gemspec
-- tests/test-12/tebako-test-b.gemspec
-- tests/test-13/bin/tebako-test-run.rb
-- tests/test-13/lib/tebako-test.rb
-- tests/test-13/tebako-test.gemspec
-- tests/test-15/Gemfile
-- tests/test-15/Rakefile
-- tests/test-15/bin/tebako-test-run.rb
-- tests/test-15/lib/tebako/bundle/test.rb
-- tests/test-15/lib/tebako/bundle/test/version.rb
-- tests/test-15/tebako-bundle-test.gemspec
-- tests/test-16/Gemfile
-- tests/test-16/Rakefile
-- tests/test-16/bin/tebako-test-run.rb
-- tests/test-16/lib/tebako/bundle/test.rb
-- tests/test-16/lib/tebako/bundle/test/version.rb
-- tests/test-16/tebako-bundle-test.gemspec
-- tests/test-18/Gemfile
-- tests/test-18/tebako-test-run.rb
-- tests/test-19/Gemfile
-- tests/test-19/tebako-test-run.rb
 - tools/.gitattributes
 - tools/.github/workflows/lint.yml
 - tools/README.md

data/tests/scripts/cross-tests.sh

@@ -1,34 +0,0 @@
-#! /bin/bash
-#
-# Copyright (c) 2021, [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.
-
-# More safety, by turning some bugs into errors.
-# Without `errexit` you don’t need ! and can replace
-# PIPESTATUS with a simple $?
-set -o errexit -o pipefail -o noclobber -o nounset
-
-chmod +x test-*-package
-for TP in test-*-package; do "./$TP"; done