tebako 0.12.13 → 0.12.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca21b853dda6d1726e193f4cda4adb7211e7c9d0d94177c664e5a2de496c9477
-  data.tar.gz: 9b62c855391c75aeb28f9fa2756cab09947a4e74ac4634b72c325e7f8b2afb88
+  metadata.gz: e5dfbc9c8a17708a202aa333ed09c402b36b6d706f2887c388ff347c894b0aed
+  data.tar.gz: 0ada18f007357af9d5b3669d7978798b3ba75f8e7a33da21db54ef0d5aeb942b
 SHA512:
-  metadata.gz: a7fd732e6afbda66288b24a464f89c005d16110d186861e6e1eba1768863594fdbc81287cdae35abdb0b2a56ea34fff38a0a194c9888b9b809e5cfd710081f85
-  data.tar.gz: '08d20603581360ecbca566fd31d9a8a6b640afc9dbef2af7c73e53b74fa218d800a696b0def74e72f3d56542b01176a0b89092dbd34452332e913d44275c1ee0'
+  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/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/version.rb

@@ -26,5 +26,5 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 module Tebako
-  VERSION = "0.12.13"
+  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.13
+  version: 0.12.14
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-02-15 00:00:00.000000000 Z
+date: 2025-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -256,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
@@ -294,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