pg 1.5.4 → 1.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e50a6829d4fe134af52d85429a3db06240fb6d228b96ef5b3fade98d38f4d199
-  data.tar.gz: 281f5700e856a64a4a7c3157bbef4398345ac16698dbcdce54ed0408c0448457
+  metadata.gz: db703158261148542548847eda910c7c2a19fc2aa933e60be83f233d0e553228
+  data.tar.gz: b533d3a5c21262f6b5d5300dc9ee229f30309bda7251d709c513bddf95871197
 SHA512:
-  metadata.gz: 4ca887b068f003b077c17fca5e8297368f5236ed74ae16888a64312fed269110c455e2cd58105b5a23fbb53a1841b081ae215d3a4c3473815914642fcdde75cc
-  data.tar.gz: 86599add8d622097727be30a1a05259c69d8c83fa73e1dad0f46125e95685a752a5df24f235158ff0d62dbfe99034aa8512e89bc39f26edf81a2540c466a6541
+  metadata.gz: fd3123db0d13a0510ae0ba12efeef97ac7dbb13290eabee01787d023310884cdd36585faa902cb58f51fc8c74f38dbc66890061e7bd188466cbb25f3004843ba
+  data.tar.gz: 5611bcbb7e26fd25801f18d06863c2ae9695dafa835d259640fb299a7129e43d3f7db1c98ffdb8001ca7522e859629ee09f63a0352686a36bf0dd391a43b9539

data/.github/workflows/binary-gems.yml

@@ -9,7 +9,7 @@ on:
 
 jobs:
   job_build_x64:
-    name: build
+    name: Build
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -23,7 +23,7 @@ jobs:
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.2"
+          ruby-version: "3.3"
       - run: bundle install
 
       - name: Create a dummy cert to satisfy the build
@@ -43,18 +43,18 @@ jobs:
           path: pkg/*.gem
 
   job_test_binary:
-    name: Test on Windows
+    name: Test
     needs: job_build_x64
     strategy:
       fail-fast: false
       matrix:
         include:
           - os: windows-latest
-            ruby: "3.2"
+            ruby: "3.3"
             platform: "x64-mingw-ucrt"
-            PGVERSION: 15.1-1-windows-x64
+            PGVERSION: 16.0-1-windows-x64
           - os: windows-latest
-            ruby: "3.1.3-1"
+            ruby: "3.1.4-1"
             platform: "x86-mingw32"
             PGVERSION: 10.20-1-windows
           - os: windows-latest

data/.github/workflows/source-gem.yml

@@ -9,7 +9,7 @@ on:
 
 jobs:
   job_build_gem:
-    name: build
+    name: Build
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -28,7 +28,7 @@ jobs:
           path: "*.gem"
 
   job_test_gem:
-    name: Test built gem
+    name: Test
     needs: job_build_gem
     strategy:
       fail-fast: false
@@ -36,19 +36,19 @@ jobs:
         include:
           - os: windows
             ruby: "head"
-            PGVERSION: 15.1-1-windows-x64
-            PGVER: "15"
+            PGVERSION: 16.0-1-windows-x64
+            PGVER: "16"
           - os: windows
             ruby: "2.5"
             PGVERSION: 9.4.26-1-windows-x64
             PGVER: "9.4"
           - os: windows
             ruby: "mswin"
-            PGVERSION: 15.1-1-windows-x64
-            PGVER: "15"
+            PGVERSION: 16.0-1-windows-x64
+            PGVER: "16"
           - os: ubuntu
             ruby: "head"
-            PGVER: "15"
+            PGVER: "16"
           - os: ubuntu
             ruby: "3.2"
             PGVER: "12"
@@ -61,11 +61,11 @@ jobs:
             PGVER: "13"
           - os: ubuntu
             ruby: "truffleruby-head"
-            PGVER: "15"
+            PGVER: "16"
           - os: macos
             ruby: "head"
-            PGVERSION: 15.1-1-osx
-            PGVER: "15"
+            PGVERSION: 16.0-1-osx
+            PGVER: "16"
 
     runs-on: ${{ matrix.os }}-${{ matrix.os_ver || 'latest' }}
     env:

data/History.md

@@ -1,9 +1,18 @@
+## v1.5.5 [2024-02-15] Lars Kanis <lars@greiz-reinsdorf.de>
+
+- Explicitly retype timespec fields to int64_t to fix compatibility with 32bit arches. [#547](https://github.com/ged/ruby-pg/pull/547)
+- Fix possible buffer overflows in PG::BinaryDecoder::CopyRow on 32 bit systems. [#548](https://github.com/ged/ruby-pg/pull/548)
+- Add binary Windows gems for Ruby 3.3.
+- Update Windows fat binary gem to OpenSSL-3.2.1 and PostgreSQL-16.2.
+
+
 ## v1.5.4 [2023-09-01] Lars Kanis <lars@greiz-reinsdorf.de>
 
 - Fix compiling the pg extension with MSVC 2022. [#535](https://github.com/ged/ruby-pg/pull/535)
 - Set PG::Connection's encoding even if setting client_encoding on connection startup fails. [#541](https://github.com/ged/ruby-pg/pull/541)
 - Don't set the server's client_encoding if it's unnecessary. [#542](https://github.com/ged/ruby-pg/pull/542)
   This is important for connection proxies, who disallow configuration settings.
+- Update Windows fat binary gem to OpenSSL-3.1.2 and PostgreSQL-15.4.
 
 
 ## v1.5.3 [2023-04-28] Lars Kanis <lars@greiz-reinsdorf.de>

data/Rakefile

@@ -1,5 +1,8 @@
 # -*- rake -*-
 
+# Enable english error messages, as some specs depend on them
+ENV["LANG"] = "C"
+
 require 'rbconfig'
 require 'pathname'
 require 'tmpdir'
@@ -91,7 +94,7 @@ end
 
 desc "Update list of server error codes"
 task :update_error_codes do
-	URL_ERRORCODES_TXT = "http://git.postgresql.org/gitweb/?p=postgresql.git;a=blob_plain;f=src/backend/utils/errcodes.txt;hb=refs/tags/REL_15_0"
+	URL_ERRORCODES_TXT = "http://git.postgresql.org/gitweb/?p=postgresql.git;a=blob_plain;f=src/backend/utils/errcodes.txt;hb=refs/tags/REL_16_0"
 
 	ERRORCODES_TXT = "ext/errorcodes.txt"
 	sh "wget #{URL_ERRORCODES_TXT.inspect} -O #{ERRORCODES_TXT.inspect} || curl #{URL_ERRORCODES_TXT.inspect} -o #{ERRORCODES_TXT.inspect}"

data/Rakefile.cross

@@ -31,8 +31,8 @@ class CrossLibrary < OpenStruct
 		self.host_platform              = toolchain
 
 		# Cross-compilation constants
-		self.openssl_version            = ENV['OPENSSL_VERSION'] || '3.1.0'
-		self.postgresql_version         = ENV['POSTGRESQL_VERSION'] || '15.2'
+		self.openssl_version            = ENV['OPENSSL_VERSION'] || '3.2.1'
+		self.postgresql_version         = ENV['POSTGRESQL_VERSION'] || '16.2'
 
 		# Check if symlinks work in the current working directory.
 		# This fails, if rake-compiler-dock is running on a Windows box.
@@ -184,6 +184,7 @@ class CrossLibrary < OpenStruct
 				"--host=#{host_platform}",
 				'--with-openssl',
 				'--without-zlib',
+				'--without-icu',
 			]
 
 			chdir( static_postgresql_builddir ) do
@@ -290,7 +291,7 @@ CrossLibraries.each do |xlib|
 		RakeCompilerDock.sh <<-EOT, platform: platform
 			(cp build/gem/gem-*.pem ~/.gem/ || true) &&
 			bundle install --local &&
-			rake native:#{platform} pkg/#{$gem_spec.full_name}-#{platform}.gem MAKE="make -j`nproc`" RUBY_CC_VERSION=3.2.0:3.1.0:3.0.0:2.7.0:2.6.0:2.5.0
+			rake native:#{platform} pkg/#{$gem_spec.full_name}-#{platform}.gem MAKE="make -j`nproc`" RUBY_CC_VERSION=3.3.0:3.2.0:3.1.0:3.0.0:2.7.0:2.6.0:2.5.0
 		EOT
 	end
 	desc "Build the windows binary gems"

data/certs/kanis@comcard.de.pem

@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDLjCCAhagAwIBAgIBCzANBgkqhkiG9w0BAQsFADA9MQ4wDAYDVQQDDAVrYW5p
+czEXMBUGCgmSJomT8ixkARkWB2NvbWNhcmQxEjAQBgoJkiaJk/IsZAEZFgJkZTAe
+Fw0yMzA0MjgwOTI0NDhaFw0yNDA0MjcwOTI0NDhaMD0xDjAMBgNVBAMMBWthbmlz
+MRcwFQYKCZImiZPyLGQBGRYHY29tY2FyZDESMBAGCgmSJomT8ixkARkWAmRlMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApop+rNmg35bzRugZ21VMGqI6
+HGzPLO4VHYncWn/xmgPU/ZMcZdfj6MzIaZJ/czXyt4eHpBk1r8QOV3gBXnRXEjVW
+9xi+EdVOkTV2/AVFKThcbTAQGiF/bT1n2M+B1GTybRzMg6hyhOJeGPqIhLfJEpxn
+lJi4+ENAVT4MpqHEAGB8yFoPC0GqiOHQsdHxQV3P3c2OZqG+yJey74QtwA2tLcLn
+Q53c63+VLGsOjODl1yPn/2ejyq8qWu6ahfTxiIlSar2UbwtaQGBDFdb2CXgEufXT
+L7oaPxlmj+Q2oLOfOnInd2Oxop59HoJCQPsg8f921J43NCQGA8VHK6paxIRDLQID
+AQABozkwNzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUvgTdT7fe
+x17ugO3IOsjEJwW7KP4wDQYJKoZIhvcNAQELBQADggEBACAxNXwfMGG7paZjnG/c
+smdi/ocW2GmCNtILaSzDZqlD5LoA68MiO7u5vwWyBaDJ6giUB330VJoGRbWMxvxN
+JU6Bnwa4yYp9YtF91wYIi7FXwIrCPKd9bk3bf4M5wECdsv+zvVceq2zRXqD7fci8
+1LRG8ort/f4TgaT7B4aNwOaabA2UT6u0FGeglqxLkhir86MY3QQyBfJZUoTKWGkz
+S9a7GXsYpe+8HMOaE4+SZp8SORKPgATND5m/4VdzuO59VXjE5UP7QpXigbxAt7H7
+ciK5Du2ZDhowmWzZwNzR7VvVmfAK6RQJlRB03VkkQRWGld5yApOrYDne6WbD8kE0
+uM8=
+-----END CERTIFICATE-----

data/ext/errorcodes.txt

@@ -2,7 +2,7 @@
 # errcodes.txt
 #      PostgreSQL error codes
 #
-# Copyright (c) 2003-2022, PostgreSQL Global Development Group
+# Copyright (c) 2003-2023, PostgreSQL Global Development Group
 #
 # This list serves as the basis for generating source files containing error
 # codes. It is kept in a common format to make sure all these source files have

data/ext/pg_binary_encoder.c

@@ -185,7 +185,7 @@ pg_bin_enc_timestamp(t_pg_coder *this, VALUE value, char *out, VALUE *intermedia
 		ts = rb_time_timespec(*intermediate);
 		/* PostgreSQL's timestamp is based on year 2000 and Ruby's time is based on 1970.
 			* Adjust the 30 years difference. */
-		timestamp = (ts.tv_sec - 10957L * 24L * 3600L) * 1000000 + (ts.tv_nsec / 1000);
+		timestamp = ((int64_t)ts.tv_sec - 10957L * 24L * 3600L) * 1000000 + ((int64_t)ts.tv_nsec / 1000);
 
 		if( this->flags & PG_CODER_TIMESTAMP_DB_LOCAL ) {
 			/* send as local time */

data/ext/pg_copy_coder.c

@@ -795,26 +795,26 @@ pg_bin_dec_copy_row(t_pg_coder *conv, const char *input_line, int len, int _tupl
 	cur_ptr = input_line;
 	line_end_ptr = input_line + len;
 
-	if (cur_ptr + 11 <= line_end_ptr && memcmp(cur_ptr, BinarySignature, 11) == 0){
+	if (line_end_ptr - cur_ptr >= 11 && memcmp(cur_ptr, BinarySignature, 11) == 0){
 		/* binary COPY header signature detected -> just drop it */
 		int ext_bytes;
 		cur_ptr += 11;
 
 		/* read flags */
-		if (cur_ptr + 4 > line_end_ptr) goto length_error;
+		if (line_end_ptr - cur_ptr < 4 ) goto length_error;
 		cur_ptr += 4;
 
 		/* read header extensions */
-		if (cur_ptr + 4 > line_end_ptr) goto length_error;
+		if (line_end_ptr - cur_ptr < 4 ) goto length_error;
 		ext_bytes = read_nbo32(cur_ptr);
 		if (ext_bytes < 0) goto length_error;
 		cur_ptr += 4;
-		if (cur_ptr + ext_bytes > line_end_ptr) goto length_error;
+		if (line_end_ptr - cur_ptr < ext_bytes ) goto length_error;
 		cur_ptr += ext_bytes;
 	}
 
 	/* read row header */
-	if (cur_ptr + 2 > line_end_ptr) goto length_error;
+	if (line_end_ptr - cur_ptr < 2 ) goto length_error;
 	nfields = read_nbo16(cur_ptr);
 	cur_ptr += 2;
 
@@ -830,7 +830,7 @@ pg_bin_dec_copy_row(t_pg_coder *conv, const char *input_line, int len, int _tupl
 			VALUE field_value;
 
 			/* read field size */
-			if (cur_ptr + 4 > line_end_ptr) goto length_error;
+			if (line_end_ptr - cur_ptr < 4 ) goto length_error;
 			input_len = read_nbo32(cur_ptr);
 			cur_ptr += 4;
 
@@ -839,7 +839,7 @@ pg_bin_dec_copy_row(t_pg_coder *conv, const char *input_line, int len, int _tupl
 				/* NULL indicator */
 				rb_ary_push(array, Qnil);
 			} else {
-				if (cur_ptr + input_len > line_end_ptr) goto length_error;
+				if (line_end_ptr - cur_ptr < input_len ) goto length_error;
 
 				/* copy input data to field_str */
 				PG_RB_STR_ENSURE_CAPA( field_str, input_len, output_ptr, end_capa_ptr );

data/lib/pg/version.rb

@@ -1,4 +1,4 @@
 module PG
 	# Library version
-	VERSION = '1.5.4'
+	VERSION = '1.5.5'
 end

data/pg.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{\A(?:test|spec|features)/}) }
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{\A(?:test|spec|features|translation)/}) }
   end
   spec.extensions    = ["ext/extconf.rb"]
   spec.require_paths = ["lib"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.5.5
 platform: ruby
 authors:
 - Michael Granger
@@ -30,7 +30,7 @@ cert_chain:
   ciK5Du2ZDhowmWzZwNzR7VvVmfAK6RQJlRB03VkkQRWGld5yApOrYDne6WbD8kE0
   uM8=
   -----END CERTIFICATE-----
-date: 2023-09-01 00:00:00.000000000 Z
+date: 2024-02-15 00:00:00.000000000 Z
 dependencies: []
 description: Pg is the Ruby interface to the PostgreSQL RDBMS. It works with PostgreSQL
   9.3 and later.
@@ -123,6 +123,7 @@ files:
 - Rakefile
 - Rakefile.cross
 - certs/ged.pem
+- certs/kanis@comcard.de.pem
 - certs/larskanis-2022.pem
 - certs/larskanis-2023.pem
 - ext/errorcodes.def
@@ -213,10 +214,6 @@ files:
 - sample/test_binary_values.rb
 - sample/wal_shipper.rb
 - sample/warehouse_partitions.rb
-- translation/.po4a-version
-- translation/po/all.pot
-- translation/po/ja.po
-- translation/po4a.cfg
 homepage: https://github.com/ged/ruby-pg
 licenses:
 - BSD-2-Clause
@@ -244,7 +241,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.15
+rubygems_version: 3.6.0.dev
 signing_key: 
 specification_version: 4
 summary: Pg is the Ruby interface to the PostgreSQL RDBMS

data/translation/.po4a-version

@@ -1,7 +0,0 @@
-po4a version 0.68.
-Written by Martin Quinson and Denis Barbier.
-
-Copyright © 2002-2022 Software in the Public Interest, Inc.
-This is free software; see source code for copying
-conditions. There is NO warranty; not even for
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.