tebako 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d02ef72aa920ed26d95b18dce3f2b0dc60aa66633d83876fd03e0da9161d5cf
-  data.tar.gz: c1524406708fe09d25a800537af70f0df315ece0e41e9a6146739d201680fe2e
+  metadata.gz: 484389b525402e736d81e83df4bc8613128bf5d830d9b2756b033feaaee09fce
+  data.tar.gz: bc863fa069c014e02f887ebeac297a4036157afdab0ea0a480a406864e6c3769
 SHA512:
-  metadata.gz: 751def113919ecca7b08900b246042b76942af841d40fb3db41da7bb7926ac30ce6c107b43864a3c2fca4ac1abdb0a700d99977e1562fa0405022cb6e6f09caf
-  data.tar.gz: 9a3c9d1d09f4e7c7704e093926f63b629ad62bc34e9f5ed505af03dc6697072a4b26decb77bdc46c9f5723ec9fd831c73dadb1afcabd5449cae13cc37636e33e
+  metadata.gz: 84d6926fecec65501e49d2e045b64431dcdef9aa8afa395ce498f0c08bffc7625900d7f2119193849d0a972400e109bab507b62dfef5abab536d32a8c2b51370
+  data.tar.gz: 7ad876c67e9963eae634f7436f1db236c712bd1652cd7fa69318d160cf7a5254b39d9a6ba4822c5ac2f5783fc8d913dfb9251413d81721a9c251de6072652e02

data/CMakeLists.txt

@@ -360,7 +360,7 @@ else(IS_DARWIN)
 
   if(RB_W32)
     string(CONCAT RUBY_C_FLAGS ${RUBY_C_FLAGS} " -DRB_W32=1")
-    string(CONCAT RUBY_L_FLAGS ${RUBY_L_FLAGS} " -L${TLIBD}")
+    string(CONCAT RUBY_L_FLAGS ${RUBY_L_FLAGS} " -l:libstdc++.a -L${TLIBD}")
   endif(RB_W32)
 endif(IS_DARWIN)
 
@@ -388,6 +388,7 @@ ExternalProject_Add(${RUBY_PRJ}
                                                         --prefix=${DATA_SRC_DIR}              \
                                                         ${C_FLAGS_DEST}=\"${RUBY_C_FLAGS}\"   \
                                                         LDFLAGS=\"${RUBY_L_FLAGS}\""
+  COMMAND          ruby ${EXE}/tebako-packager pass1a ${RUBY_SOURCE_DIR}
   BUILD_COMMAND    make ${RUBY_MAKEFILE} -j${NCORES}
   INSTALL_COMMAND  make ${RUBY_MAKEFILE} install
   COMMAND          ${GNU_BASH} -c "ruby ${EXE}/tebako-packager pass2 ${OSTYPE_TXT} ${RUBY_SOURCE_DIR} ${DEPS_LIB_DIR} ${DATA_SRC_DIR} ${RUBY_STASH_DIR} ${RUBY_VER}"

data/exe/tebako-packager

@@ -57,6 +57,14 @@ begin
     end
 
     Tebako::Packager.stash(ARGV[1], ARGV[2])
+  when "pass1a"
+    #       ARGV[0] -- command
+    #       ARGV[1] -- RUBY_SOURCE_DIR
+    unless ARGV.length == 2
+      raise Tebako::Error,
+            "tebako-packager pass1a command expects 2 arguments, #{ARGV.length} has been provided."
+    end
+    Tebako::Packager.pass1a(ARGV[1])
   when "pass2"
     #       ARGV[0] -- command
     #       ARGV[1] -- OSTYPE

data/lib/tebako/packager/pass1.rb

@@ -150,7 +150,7 @@ module Tebako
             # Generate export definitions; use WinMain to build rubyw.exe
             patch_map.store("cygwin/GNUmakefile.in", get_gnumakefile_in_patch_p1(ruby_ver))
             # ....................................................
-            # RUBY_EXPORT=1 (shall ve set for static builds but is missing in openssl extension)
+            # RUBY_EXPORT=1 (shall be set for static builds but is missing in openssl extension)
             patch_map.store("ext/openssl/extconf.rb", OPENSSL_EXTCONF_RB_PATCH)
           end
 

data/lib/tebako/packager/pass1a.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2024 [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 "patch_literals"
+
+# Tebako - an executable packager
+module Tebako
+  module Packager
+    # Ruby patching definitions (pass1a)
+    module Pass1A
+      class << self
+        def get_patch_map # rubocop:disable Naming/AccessorMethodName
+          {
+            "gem_prelude.rb" => GEM_PRELUDE_RB_PATCH
+          }
+        end
+
+        include Tebako::Packager::PatchLiterals
+      end
+    end
+  end
+end

data/lib/tebako/packager/pass2.rb

@@ -115,7 +115,6 @@ module Tebako
           {
             "template/Makefile.in" => template_makefile_in_patch(ostype, deps_lib_dir, ruby_ver),
             "tool/mkconfig.rb" => mcrb_subst,
-            "gem_prelude.rb" => GEM_PRELUDE_RB_PATCH,
             "dir.c" => get_dir_c_patch(ostype),            "dln.c" => get_dln_c_patch(ostype, ruby_ver),
             "io.c" => get_io_c_patch(ostype, ruby_ver),    "main.c" => MAIN_C_PATCH,
             "file.c" => PatchHelpers.patch_c_file("/* define system APIs */"),

data/lib/tebako/packager/patch_helpers.rb

@@ -40,6 +40,7 @@ module Tebako
           puts "   ... patching #{fname}"
           restore_and_save(fname)
           contents = File.read(fname)
+
           mapping.each { |pattern, subst| contents.sub!(pattern, subst) }
           File.open(fname, "w") { |file| file << contents }
         end

data/lib/tebako/packager.rb

@@ -29,6 +29,7 @@ require "fileutils"
 
 require_relative "error"
 require_relative "packager/pass1"
+require_relative "packager/pass1a"
 require_relative "packager/pass2"
 require_relative "packager/patch_helpers"
 
@@ -111,13 +112,21 @@ module Tebako
         PatchHelpers.recreate(src_dir)
         do_patch(Pass1.get_patch_map(ostype, mount_point, ruby_ver), ruby_source_dir)
 
-        # Roll back pass2 patches
+        # Roll back pass1a, pass2 patches
         # Just in case we are recovering after some error
         PatchHelpers.restore_and_save_files(FILES_TO_RESTORE, ruby_source_dir)
         PatchHelpers.restore_and_save_files(FILES_TO_RESTORE_MUSL, ruby_source_dir) if ostype =~ /linux-musl/
         PatchHelpers.restore_and_save_files(FILES_TO_RESTORE_MSYS, ruby_source_dir) if ostype =~ /msys/
       end
 
+      # Pass1A
+      # Patch gem_prelude.rb
+      def pass1a(ruby_source_dir)
+        puts "-- Running pass1a script"
+
+        do_patch(Pass1A.get_patch_map, ruby_source_dir)
+      end
+
       # Pass2
       # Creates packaging environment, patching ensures that tebako package is linked statically
       def pass2(ostype, ruby_source_dir, deps_lib_dir, ruby_ver)

data/lib/tebako/version.rb

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

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

@@ -1,5 +1,5 @@
 #! /bin/bash
-# Copyright (c) 2022, [Ribose Inc](https://www.ribose.com).
+# Copyright (c) 2022,2024 [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
 # This file is a part of tebako
 #
@@ -43,70 +43,17 @@ do_patch_multiline() {
   "$gSed" -i "s/$re/${sbst//$'\n'/"\\n"}/g" "$1"
 }
 
-# ....................................................
-# Surprise, surprise ... Upstream project shall found boost libraries for fbthrift
-# https://github.com/facebook/fbthrift/commit/c23af9dee42374d43d2f10e0e07edf1c1c97c328
-
-
 if [[ "$OSTYPE" == "linux-gnu"* || "$OSTYPE" == "linux-musl"* || "$OSTYPE" == "msys" ]]; then
   gSed="sed"
-# shellcheck disable=SC2251
-! IFS= read -r -d '' sbst << EOM
-find_package(OpenSSL REQUIRED)
-# -- Start of tebako patch --
-find_package(Boost 1.65 REQUIRED COMPONENTS filesystem)
-include_directories(\${Boost_INCLUDE_DIRS})
-# -- End of tebako patch --
-EOM
-
 elif [[ "$OSTYPE" == "darwin"* ]]; then
   gSed="gsed"
-
-# shellcheck disable=SC2251
-! IFS= read -r -d '' sbst << EOM
-find_package(OpenSSL REQUIRED)
-# -- Start of tebako patch --
-find_package(Boost 1.65 REQUIRED COMPONENTS filesystem)
-include_directories(\${Boost_INCLUDE_DIRS})
-# Suppress superfluous randlib warnings about \"*.a\" having no symbols on MacOSX.
-set(CMAKE_C_ARCHIVE_CREATE   \"<CMAKE_AR> Scr <TARGET> <LINK_FLAGS> <OBJECTS>\")
-set(CMAKE_CXX_ARCHIVE_CREATE \"<CMAKE_AR> Scr <TARGET> <LINK_FLAGS> <OBJECTS>\")
-set(CMAKE_C_ARCHIVE_FINISH   \"<CMAKE_RANLIB> -no_warning_for_no_symbols -c <TARGET>\")
-set(CMAKE_CXX_ARCHIVE_FINISH \"<CMAKE_RANLIB> -no_warning_for_no_symbols -c <TARGET>\")
-# -- End of tebako patch --
-EOM
-
 else
   echo "Unknown OSTYPE=$OSTYPE"
   exit 1
 fi
 
-restore_and_save "$1/CMakeLists.txt"
-re="find_package(OpenSSL REQUIRED)"
-"$gSed" -i "s/$re/${sbst//$'\n'/"\\n"}/g" "$1/CMakeLists.txt"
-
-# GCC 13 compatibility
-# --- thrift/compiler/lib/cpp2/util.cc ---
-re="#include <stdexcept>"
-# shellcheck disable=SC2251
-! IFS= read -r -d '' sbst << EOM
-#include <stdexcept>
-
-\/* -- Start of tebako patch -- *\/
-#include <cstdint>
-\/* -- End of tebako patch -- *\/
-EOM
-
-do_patch_multiline "$1/thrift/compiler/lib/cpp2/util.cc"
-
-
 if [[ "$OSTYPE" == "msys" ]]; then
-  re="if(WIN32)"
-  sbst="if(MSVC) # tebako patched"
-  do_patch "$1/thrift/compiler/CMakeLists.txt" "$re" "$sbst"
-
-  re="ftruncate(file\.fd(), finalBufferSize);"
-  sbst="folly::portability::unistd::ftruncate(file.fd(), finalBufferSize); \/* tebako patched *\/"
+  re="ftruncate(file\.fd(), finalBufferSize),"
+  sbst="folly::portability::unistd::ftruncate(file.fd(), finalBufferSize), \/* tebako patched *\/"
   do_patch "$1/thrift/lib/cpp2/frozen/FrozenUtil.h" "$re" "$sbst"
-
 fi

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

@@ -1,5 +1,5 @@
 #! /bin/bash
-# Copyright (c) 2022-2023, [Ribose Inc](https://www.ribose.com).
+# Copyright (c) 2022-2024, [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
 # This file is a part of tebako
 #
@@ -41,6 +41,7 @@ restore_and_save() {
 
 do_patch() {
   restore_and_save "$1"
+#  echo "$GNU_SED" -i "s/$2/$3/g" "$1"
   "$GNU_SED" -i "s/$2/$3/g" "$1"
 }
 
@@ -316,15 +317,6 @@ EOM
   sbst=" \/* tebako patched *\/ folly::portability::unistd::lseek(fd,"
   do_patch  "$1/folly/portability/SysUio.cpp" "$re" "$sbst"
 
-# --- folly/portability/Unistd.cpp ---
-  re="(lseek(fd,"
-  sbst="( \/* tebako patched *\/ folly::portability::unistd::lseek(fd,"
-  do_patch  "$1/folly/portability/Unistd.cpp" "$re" "$sbst"
-
-  re="lseek(fd, 0,"
-  sbst=" \/* tebako patched *\/ folly::portability::unistd::lseek(fd, 0,"
-  "$GNU_SED" -i "s/$re/$sbst/g" "$1/folly/portability/Unistd.cpp"
-
 # --- folly/logging/ImmediateFileWriter.h ---
   re="isatty(file"
   sbst=" \/* tebako patched *\/ folly::portability::unistd::isatty(file"
@@ -402,6 +394,7 @@ EOM
 #ifdef __MINGW32__
   #include <mswsock.h>
   using cmsghdr = WSACMSGHDR;
+  #define CMSG_SPACE WSA_CMSG_SPACE
 #endif
 \/* -- End of tebako patch -- *\/
 
@@ -448,7 +441,55 @@ EOM
   sbst="#if defined(__XROS__) || defined(__MINGW32__) \/* tebako patched *\/"
   "$GNU_SED" -i "s/$re/$sbst/g" "$1/folly/system/ThreadName.cpp"
 
+# --- folly/net/NetOps.h ---
+
+  re="#include <WS2tcpip\.h> \/\/ @manual"
+# shellcheck disable=SC2251
+! IFS= read -r -d '' sbst << EOM
+#include <WS2tcpip.h> \/\/ @manual
+
+\/* -- Start of tebako patch -- *\/
+#ifdef __MINGW32__
+  #include <memory>
+  #include <mswsock.h>
+#endif
+\/* -- End of tebako patch -- *\/
+EOM
+  do_patch_multiline  "$1/folly/net/NetOps.h" "$re" "$sbst"
+
+# --- folly/Random.cpp ---
+
+  re="#include <folly\/synchronization\/RelaxedAtomic\.h>"
+# shellcheck disable=SC2251
+! IFS= read -r -d '' sbst << EOM
+#include <folly\/synchronization\/RelaxedAtomic.h>
+
+\/* -- Start of tebako patch -- *\/
+#include <folly\/portability\/Fcntl.h>
+\/* -- End of tebako patch -- *\/
+EOM
+  do_patch_multiline  "$1/folly/Random.cpp" "$re" "$sbst"
+
+# --- folly/Utility.h ---
+  re="T uninit;"
+  sbst="T uninit = 0;  \/* tebako patched *\/"
+  do_patch  "$1/folly/Utility.h" "$re" "$sbst"
+
+# --- folly/experimental/io/AsyncBase.cpp ---
+  re="CHECK_ERR(close(pollFd_));"
+  sbst="CHECK_ERR(folly::portability::unistd::close(pollFd_));  \/* tebako patched *\/"
+  do_patch  "$1/folly/experimental/io/AsyncBase.cpp" "$re" "$sbst"
+
+# --- folly/portability/Unistd.cpp ---
+  re="res = lseek64(fd, offset, whence);"
+  sbst="res = folly::portability::unistd::lseek64(fd, offset, whence); \/* tebako patched *\/ "
+  do_patch  "$1/folly/portability/Unistd.cpp" "$re" "$sbst"
+
+  re="res = lseek(fd, offset, whence);"
+  sbst="res = folly::portability::unistd::lseek(fd, offset, whence); \/* tebako patched *\/ "
+  "$GNU_SED" -i "s/$re/$sbst/g" "$1/folly/portability/Unistd.cpp"
 # ---
+
   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"
@@ -471,5 +512,6 @@ EOM
 # while gettimeofday is provided by MSys, the other two functions are lost
   defined_n_win32_to_msc_ver "$1/folly/portability/SysTime.h"
   defined_win32_to_msc_ver "$1/folly/portability/SysTime.cpp"
+  defined_win32_to_msc_ver "$1/folly/lang/Exception.cpp"
 
 fi

data/version.txt

@@ -1 +1 @@
-0.6.5
+0.6.6

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tebako
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-05-15 00:00:00.000000000 Z
+date: 2024-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -69,6 +69,7 @@ files:
 - lib/tebako/error.rb
 - lib/tebako/packager.rb
 - lib/tebako/packager/pass1.rb
+- lib/tebako/packager/pass1a.rb
 - lib/tebako/packager/pass2.rb
 - lib/tebako/packager/patch_buildsystem.rb
 - lib/tebako/packager/patch_helpers.rb