ffi-libarchive-binary 0.3.2-x86_64-darwin → 0.4.0.rc1-x86_64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23574bba1caf3bb0fcde75c36ccb845f4e99ac32f065baa6e3da8b87c143b842
-  data.tar.gz: 24cab2e6c1e6bde37d6f54814ca50a821d571902d3665466884da4b61b5df054
+  metadata.gz: '074084f27227ad30d49f781694c48eea0c1aaed75b789fb5ec2426cfc80275ea'
+  data.tar.gz: bda32e68a1bf9ae4274663457d4268eb8e02ecc9c16f173152c27270181020fe
 SHA512:
-  metadata.gz: 1f912f9abe91fed87cd235862aba11ce8e8bad9576cb988cb617105e6359f4de9d6cd919da123248428d7eae51739ea08eb72886017463afb604705f657e2b0f
-  data.tar.gz: 26a4d747d6fffc6b37060cafa42931c64778a6be4e7035207a87245a0ec0ef1c9f6037b90c5c736ab2ee4b074b10171d10a7fbd6d58581110aaf2628997686d0
+  metadata.gz: cea9a48513d8967465aca5f99ca9ee4c7bb19864e198646e15ae90e6738b221b691bdd8656abd671fe3f9a592a692214464c6e39d6e634a764566f20fc80fbd4
+  data.tar.gz: 3bd9da90d80e5c99312b9e7e68fb5ce8848b69a12ce2df1da1db0f7d606781f8b1cfca5397747426aed8748a2e26102ed30f6613ef9932da19463b345ac93ae9

data/.rubocop.yml

@@ -4,6 +4,7 @@ inherit_from:
 AllCops:
   TargetRubyVersion: 2.7
   SuggestExtensions: false
+  NewCops: enable
   Exclude:
     - 'ffi-libarchive-binary.gemspec'
     - 'tmp/**/*'

data/ext/configuration.yml

@@ -0,0 +1,40 @@
+libraries:
+  zlib:
+    all:
+      version: "1.3.1"
+      url: "http://zlib.net/fossils/zlib-1.3.1.tar.gz"
+      sha256: "9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23"
+  libexpat:
+    all:
+      version: "2.6.4"
+      url: "https://github.com/libexpat/libexpat/releases/download/R_2_6_4/expat-2.6.4.tar.gz"
+      sha256: "fd03b7172b3bd7427a3e7a812063f74754f24542429b634e0db6511b53fb2278"
+  # openssl:
+  #   version 3.x.y requires pod2man, that is not easily available on Windows
+  openssl:
+    windows:
+      version: "1.1.1w"
+      url: "https://github.com/openssl/openssl/releases/download/OpenSSL_1_1_1w/openssl-1.1.1w.tar.gz"
+      sha256: "cf3098950cb4d853ad95c0841f1f9c6d3dc102dccfcacd521d93925208b76ac8"
+    all:
+      version: "3.3.2"
+      url: "https://github.com/openssl/openssl/releases/download/openssl-3.3.2/openssl-3.3.2.tar.gz"
+      sha256: "2e8a40b01979afe8be0bbfb3de5dc1c6709fedb46d6c89c10da114ab5fc3d281"
+  # xz:
+  #   versions > 5.2.4 get crazy on MinGW
+  #   versions <= 5.2.5 do not support arm64-apple-darwin target
+  #   version 5.2.7 could not be linked statically to libarchive
+  xz:
+    windows:
+      version: "5.2.4"
+      url: "https://tukaani.org/xz/xz-5.2.4.tar.gz"
+      sha256: "b512f3b726d3b37b6dc4c8570e137b9311e7552e8ccbab4d39d47ce5f4177145"
+    all:
+      version: "5.2.6"
+      url: "https://tukaani.org/xz/xz-5.2.6.tar.gz"
+      sha256: "a2105abee17bcd2ebd15ced31b4f5eda6e17efd6b10f921a01cda4a44c91b3a0"
+  libarchive:
+    all:
+      version: "3.7.7"
+      url: "https://www.libarchive.org/downloads/libarchive-3.7.7.tar.gz"
+      sha256: "4cc540a3e9a1eebdefa1045d2e4184831100667e6d7d5b315bb1cbc951f8ddff"

data/lib/ffi-libarchive-binary/base_recipe.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "mini_portile2"
+require_relative "configuration"
 
 module LibarchiveBinary
   FORMATS = {
@@ -24,9 +25,17 @@ module LibarchiveBinary
     "arm64-apple-darwin" => "libarchive.dylib",
   }.freeze
 
+  ROOT = Pathname.new(File.expand_path("../..", __dir__))
+
   class BaseRecipe < MiniPortile
-    def initialize(name, version)
-      super
+    def initialize(name)
+      library = LibarchiveBinary.library_for(name)
+      version = library["version"]
+      super(name, version)
+      @files << {
+        url: library["url"],
+        sha256: library["sha256"],
+      }
       @printed = {}
     end
 

data/lib/ffi-libarchive-binary/configuration.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require "psych"
+require "yaml"
+
+module LibarchiveBinary
+  def self.libraries
+    configuration_file = File.join(File.dirname(__FILE__), "..", "..", "ext", "configuration.yml")
+    @@libraries ||= ::YAML.load_file(configuration_file)["libraries"] || {}
+  rescue Psych::SyntaxError => e
+    puts "Warning: The configuration file '#{configuration_file}' contains invalid YAML syntax."
+    puts e.message
+    exit 1
+  rescue StandardError => e
+    puts "An unexpected error occurred while loading the configuration file '#{configuration_file}'."
+    puts e.message
+    exit 1
+  end
+
+  def self.library_for(libname)
+    if MiniPortile::windows?
+      libraries[libname]["windows"] || libraries[libname]["all"]
+    else
+      libraries[libname]["all"]
+    end
+  rescue StandardError => e
+    puts "Failed to load library configuration for '#{libname}'."
+    puts e.message
+    exit 1
+  end
+end

data/lib/ffi-libarchive-binary/libarchive_recipe.rb

@@ -3,6 +3,7 @@
 require "pathname"
 require "open3"
 
+require_relative "configuration"
 require_relative "base_recipe"
 require_relative "zlib_recipe"
 require_relative "libexpat_recipe"
@@ -12,22 +13,15 @@ require_relative "xz_recipe"
 module LibarchiveBinary
   class LibarchiveRecipe < MiniPortileCMake
     ROOT = Pathname.new(File.expand_path("../..", __dir__))
-    #
-    # libarchive 3.7.x uses new GLIBC packaging ( links to libc only and not to pthread, dl, ...)
-    # this does not link work on Ubuntu 20 with GLIBC 3.21
-    #
-    # Cannot build 3.7.x on Ubuntu 22 either because it creates a reference to GLIB 3.22 (min) that does
-    # not resolve on Ubuntu 20
-    #
-    # So without patching we are stick to 3.6.2 until Ubuntu 20 shall be supported
-    #
+    NAME = "libarchive"
     def initialize
-      super("libarchive", "3.6.2")
+      libarchive = LibarchiveBinary.library_for(NAME)
+      super(NAME, libarchive["version"])
       @printed = {}
 
       @files << {
-        url: "https://www.libarchive.org/downloads/libarchive-3.6.2.tar.gz",
-        sha256: "ba6d02f15ba04aba9c23fd5f236bb234eab9d5209e95d1c4df85c44d5f19b9b3",
+        url: libarchive["url"],
+        sha256: libarchive["sha256"],
       }
 
       @target = ROOT.join(@target).to_s
@@ -53,9 +47,9 @@ module LibarchiveBinary
         "-DENABLE_ZLIB::BOOL=ON",     "-DENABLE_BZip2:BOOL=OFF",      "-DENABLE_LIBXML2:BOOL=OFF",
         "-DENABLE_EXPAT::BOOL=ON",    "-DENABLE_TAR:BOOL=OFF",        "-DENABLE_ICONV::BOOL=OFF",
         "-DENABLE_CPIO::BOOL=OFF",    "-DENABLE_CAT:BOOL=OFF",        "-DENABLE_ACL:BOOL=OFF",
-        "-DENABLE_TEST:BOOL=OFF",     "-DENABLE_UNZIP:BOOL=OFF",
-        "-DCMAKE_INCLUDE_PATH=#{include_path}",
-        "-DCMAKE_LIBRARY_PATH=#{library_path}"
+        "-DENABLE_TEST:BOOL=OFF",     "-DENABLE_UNZIP:BOOL=OFF",      "-DOPENSSL_USE_STATIC_LIBS=ON",
+        "-DCMAKE_INCLUDE_PATH:STRING=#{include_path}",
+        "-DCMAKE_LIBRARY_PATH:STRING=#{library_path}"
       ]
     end
 
@@ -76,7 +70,7 @@ module LibarchiveBinary
 
     def library_path
       paths = [@zlib_recipe.path, @expat_recipe.path, @openssl_recipe.path, @xz_recipe.path]
-      paths.map { |k| "#{k}/lib" }.join(";")
+      paths.map { |k| "#{k}/lib;#{k}/lib64" }.join(";")
     end
 
     def activate
@@ -136,6 +130,27 @@ module LibarchiveBinary
       @lib_fullpath ||= lib_filename.nil? ? nil : File.join(lib_workpath, lib_filename)
     end
 
+    def libraries
+      configuration_file = File.join(File.dirname(__FILE__), "..", "..", "ext", "configuration.yml")
+      @libraries ||= ::YAML.load_file(configuration_file)["libraries"] || {}
+    rescue Psych::SyntaxError => e
+      puts "Warning: The configuration file '#{configuration_file}' contains invalid YAML syntax."
+      puts e.message
+      exit 1
+    rescue StandardError => e
+      puts "An unexpected error occurred while loading the configuration file '#{configuration_file}'."
+      puts e.message
+      exit 1
+    end
+
+    def library_for(libname)
+      libraries[libname][MiniPortile::windows? ? "windows" : "all"]
+    rescue StandardError => e
+      puts "Failed to load library configuration for '#{libname}'."
+      puts e.message
+      exit 1
+    end
+
     def verify_lib
       begin
         out, = Open3.capture2("file #{lib_fullpath}")

data/lib/ffi-libarchive-binary/libexpat_recipe.rb

@@ -4,15 +4,8 @@ require_relative "base_recipe"
 
 module LibarchiveBinary
   class LibexpatRecipe < BaseRecipe
-    ROOT = Pathname.new(File.expand_path("../..", __dir__))
-
     def initialize
-      super("libexpat", "2.6.4")
-
-      @files << {
-        url: "https://github.com/libexpat/libexpat/releases/download/R_2_6_4/expat-2.6.4.tar.gz",
-        sha256: "fd03b7172b3bd7427a3e7a812063f74754f24542429b634e0db6511b53fb2278",
-      }
+      super("libexpat")
 
       @target = ROOT.join(@target).to_s
     end

data/lib/ffi-libarchive-binary/openssl_recipe.rb

@@ -14,16 +14,8 @@ module LibarchiveBinary
   ENV_CMD = ["env", "CFLAGS=-fPIC", "LDFLAGS=-fPIC"].freeze
 
   class OpensslRecipe < BaseRecipe
-    ROOT = Pathname.new(File.expand_path("../..", __dir__))
-
     def initialize
-      super("openssl", "1.1.1n")
-
-      @files << {
-        url: "https://www.openssl.org/source/openssl-1.1.1n.tar.gz",
-        sha256: "40dceb51a4f6a5275bde0e6bf20ef4b91bfc32ed57c0552e2e8e15463372b17a",
-      }
-
+      super("openssl")
       @target = ROOT.join(@target).to_s
     end
 

data/lib/ffi-libarchive-binary/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LibarchiveBinary
-  VERSION = "0.3.2"
+  VERSION = "0.4.0.rc1"
 end

data/lib/ffi-libarchive-binary/xz_recipe.rb

@@ -4,39 +4,11 @@ require_relative "base_recipe"
 
 module LibarchiveBinary
   class XZRecipe < BaseRecipe
-    ROOT = Pathname.new(File.expand_path("../..", __dir__))
-
-    # As of 19.10.2022
-    #   versions > 5.2.4 get crazy on MinGW
-    #   versions <= 5.2.5 do not support arm64-apple-darwin target
-    #   version 5.2.7 could not be linked statically to libarchive
-
     def initialize
-      if MiniPortile::windows?
-        super("xz", "5.2.4")
-        windows_files
-      else
-        super("xz", "5.2.6")
-        not_windows_files
-      end
-
+      super("xz")
       @target = ROOT.join(@target).to_s
     end
 
-    def windows_files
-      @files << {
-        url: "https://tukaani.org/xz/xz-5.2.4.tar.gz",
-        sha256: "b512f3b726d3b37b6dc4c8570e137b9311e7552e8ccbab4d39d47ce5f4177145",
-      }
-    end
-
-    def not_windows_files
-      @files << {
-        url: "https://tukaani.org/xz/xz-5.2.6.tar.gz",
-        sha256: "a2105abee17bcd2ebd15ced31b4f5eda6e17efd6b10f921a01cda4a44c91b3a0",
-      }
-    end
-
     def configure_defaults
       [
         "--host=#{@host}",

data/lib/ffi-libarchive-binary/zlib_recipe.rb

@@ -5,16 +5,8 @@ require_relative "base_recipe"
 
 module LibarchiveBinary
   class ZLibRecipe < BaseRecipe
-    ROOT = Pathname.new(File.expand_path("../..", __dir__))
-
     def initialize
-      super("zlib", "1.3.1")
-
-      @files << {
-        url: "http://zlib.net/fossils/zlib-1.3.1.tar.gz",
-        sha256: "9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23",
-      }
-
+      super("zlib")
       @target = ROOT.join(@target).to_s
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi-libarchive-binary
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0.rc1
 platform: x86_64-darwin
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-21 00:00:00.000000000 Z
+date: 2024-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -128,10 +128,12 @@ files:
 - README.adoc
 - Rakefile
 - ext/Makefile
+- ext/configuration.yml
 - ext/extconf.rb
 - ffi-libarchive-binary.gemspec
 - lib/ffi-libarchive-binary.rb
 - lib/ffi-libarchive-binary/base_recipe.rb
+- lib/ffi-libarchive-binary/configuration.rb
 - lib/ffi-libarchive-binary/libarchive.dylib
 - lib/ffi-libarchive-binary/libarchive_recipe.rb
 - lib/ffi-libarchive-binary/libexpat_recipe.rb
@@ -158,9 +160,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.1.6
 signing_key: