sqlite3 1.5.1-x86_64-linux → 1.5.3-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 121bf1126615c2477479af175b187030f36228acf862684c236261840618b2ee
-  data.tar.gz: 47bd7191472611ed56dc6de9c498c486d177bbdea0d31bb53cf69d05a2e3e191
+  metadata.gz: 4069105ca51f434c7efcf9b78a2b125762dca13738e04ef4e7058e4535fe080b
+  data.tar.gz: fa4290a00ba15e26fb1af974476625cd7b9cf0039d08383ea71c42e992c244d8
 SHA512:
-  metadata.gz: 3e7196723d1519a08dfa4aa8682c7e778ff65cbec0af6b970787950d09be35e888542352abaa6ae39b21b1705727ff0ca67ece9adb42fa4d188becc9916d5953
-  data.tar.gz: 7a625721ed72c3bbe2cb5c05f14c108315165da542368fdc831780d14fbb2dfab932b032c2b4fe47407f5def1831957c067413bcce8464c48f7e73d6846d1c02
+  metadata.gz: f390a9753a5535f826add4a573b37d2fbcd19eb208f34481051c93aab59b856f0ec109ed425cfbd32eb5cfae2300a5e19bfec9ea18f4a82b08b9003f6187fe19
+  data.tar.gz: 64836b0886ca11b695c78491cf0b39f27cc04ab83de8281864d75ceedfaf5b3d8eac288f41d1a422f298008b68cfd2a4f078131a95fd24d4ff4a5213f0072097

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # sqlite3-ruby Changelog
 
+## 1.5.3 / 2022-10-11
+
+### Fixed
+
+* Fixed installation of the "ruby" platform gem when building from source on Fedora. In v1.5.0..v1.5.2, installation failed on some systems due to the behavior of Fedora's pkg-config implementation. [#355]
+
+
+## 1.5.2 / 2022-10-01
+
+### Packaging
+
+This version correctly vendors the tarball for sqlite v3.39.4 in the vanilla "ruby" platform gem package, so that users will not require network access at installation.
+
+v1.5.0 and v1.5.1 mistakenly packaged the tarball for sqlite v3.38.5 in the vanilla "ruby" platform gem, resulting in downloading the intended tarball over the network at installation time (or, if the network was not available, failure to install). Note that the precompiled native gems were not affected by this issue. [#352]
+
+
 ## 1.5.1 / 2022-09-29
 
 ### Dependencies

data/dependencies.yml

@@ -0,0 +1,14 @@
+# TODO: stop using symbols here once we no longer support Ruby 2.7 and can rely on symbolize_names
+:sqlite3:
+  # checksum verified by first checking the published sha3(256) checksum against https://sqlite.org/download.html:
+  #
+  # $ sha3sum -a 256 ports/archives/sqlite-autoconf-3390400.tar.gz
+  # 431328e30d12c551da9ba7ef2122b269076058512014afa799caaf62ca567090  ports/archives/sqlite-autoconf-3390400.tar.gz
+  #
+  # $ sha256sum ports/archives/sqlite-autoconf-3390400.tar.gz
+  # f31d445b48e67e284cf206717cc170ab63cbe4fd7f79a82793b772285e78fdbb  ports/archives/sqlite-autoconf-3390400.tar.gz
+  #
+  :version: "3.39.4"
+  :files:
+    - :url: "https://sqlite.org/2022/sqlite-autoconf-3390400.tar.gz"
+      :sha256: "f31d445b48e67e284cf206717cc170ab63cbe4fd7f79a82793b772285e78fdbb"

data/ext/sqlite3/extconf.rb

@@ -1,5 +1,6 @@
 require "mkmf"
 require "mini_portile2"
+require "yaml"
 
 module Sqlite3
   module ExtConf
@@ -65,15 +66,24 @@ module Sqlite3
           end
           recipe.activate
 
-          ENV["PKG_CONFIG_ALLOW_SYSTEM_CFLAGS"] = "t" # on macos, pkg-config will not return --cflags without this
-          pcfile = File.join(recipe.path, "lib", "pkgconfig", "sqlite3.pc")
-          if pkg_config(pcfile)
-            # see https://bugs.ruby-lang.org/issues/18490
-            libs = xpopen(["pkg-config", "--libs", "--static", pcfile], err: [:child, :out], &:read)
-            libs.split.each { |lib| append_ldflags(lib) } if $?.success?
-          else
-            abort("\nCould not configure the build properly. Please install either the `pkg-config` utility or the `pkg-config` rubygem.\n\n")
+          # on macos, pkg-config will not return --cflags without this
+          ENV["PKG_CONFIG_ALLOW_SYSTEM_CFLAGS"] = "t"
+
+          lib_path = File.join(recipe.path, "lib")
+          pcfile = File.join(lib_path, "pkgconfig", "sqlite3.pc")
+          abort_pkg_config("pkg_config") unless pkg_config(pcfile)
+
+          # see https://bugs.ruby-lang.org/issues/18490
+          flags = xpopen(["pkg-config", "--libs", "--static", pcfile], err: [:child, :out], &:read)
+          abort_pkg_config("xpopen") unless $?.success?
+          flags = flags.split
+
+          # see https://github.com/flavorjones/mini_portile/issues/118
+          "-L#{lib_path}".tap do |lib_path_flag|
+            flags.prepend(lib_path_flag) unless flags.include?(lib_path_flag)
           end
+
+          flags.each { |flag| append_ldflags(flag) }
         end
       end
 
@@ -131,29 +141,18 @@ module Sqlite3
       end
 
       def mini_portile_config
-        {
-          sqlite3: {
-            # checksum verified by first checking the published sha3(256) checksum against https://sqlite.org/download.html:
-            #
-            # $ sha3sum -a 256 ports/archives/sqlite-autoconf-3390400.tar.gz
-            # 431328e30d12c551da9ba7ef2122b269076058512014afa799caaf62ca567090  ports/archives/sqlite-autoconf-3390400.tar.gz
-            #
-            # $ sha256sum ports/archives/sqlite-autoconf-3390400.tar.gz
-            # f31d445b48e67e284cf206717cc170ab63cbe4fd7f79a82793b772285e78fdbb  ports/archives/sqlite-autoconf-3390400.tar.gz
-            #
-            version: "3.39.4",
-            files: [{
-                      url: "https://sqlite.org/2022/sqlite-autoconf-3390400.tar.gz",
-                      sha256: "f31d445b48e67e284cf206717cc170ab63cbe4fd7f79a82793b772285e78fdbb",
-                    }],
-          }
-        }
+        # TODO: once Ruby 2.7 is no longer supported, use symbolize_names: true
+        YAML.load_file(File.join(package_root_dir, "dependencies.yml"))
       end
 
       def abort_could_not_find(missing)
         abort("\nCould not find #{missing}.\nPlease visit https://github.com/sparklemotion/sqlite3-ruby for installation instructions.\n\n")
       end
 
+      def abort_pkg_config(id)
+        abort("\nCould not configure the build properly (#{id}). Please install either the `pkg-config` utility or the `pkg-config` rubygem.\n\n")
+      end
+
       def cross_build?
         enable_config("cross-build")
       end

data/lib/sqlite3/version.rb

@@ -1,11 +1,11 @@
 module SQLite3
 
-  VERSION = "1.5.1"
+  VERSION = "1.5.3"
 
   module VersionProxy
     MAJOR = 1
     MINOR = 5
-    TINY  = 1
+    TINY  = 3
     BUILD = nil
 
     STRING = [ MAJOR, MINOR, TINY, BUILD ].compact.join( "." )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sqlite3
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.3
 platform: x86_64-linux
 authors:
 - Jamis Buck
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-29 00:00:00.000000000 Z
+date: 2022-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -103,6 +103,7 @@ files:
 - LICENSE
 - LICENSE-DEPENDENCIES
 - README.md
+- dependencies.yml
 - ext/sqlite3/aggregator.c
 - ext/sqlite3/aggregator.h
 - ext/sqlite3/backup.c