pg 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c220f1cc5cfd8e07690949fcf30a96abd8f710bc64f0c358eb6452288966a5b4
-  data.tar.gz: cd5f28d3098e2537e04dc218c8809b83308cb541e6b17891220559d33e2ada82
+  metadata.gz: 40f704970acf17f5fc3514de1e25454441776d1a5ae7b267c791d2bc59bfdb82
+  data.tar.gz: f727c84142cc8d5a576b974c4cbf866e3d69d15004815c088461fef5c1f76190
 SHA512:
-  metadata.gz: f5de3fb30c6da95937d6c8913c9e172a348fa376edc6f06cc9333669c908a25cb2af85853aafbdc6839407f6b4aea93ca97e3b5b53f7182732664ecd6cd81e33
-  data.tar.gz: 00f5c6e8c359e81bf7c9145b7322583e511d440f681d32192430d9ce96772f1d71f8abce35e12ccf126d96a552205e799efee2533c54a84c623fa0aeee5c1c3c
+  metadata.gz: 2d3df7542a3b3b001709d59b9e75a0ed3bf734db3b3b5cc2fa293278920720a4443fa4e13365926cfca3df08862137bc89f6bc5b13167607c935c1d95f55c848
+  data.tar.gz: fb5d5d62930e3dba1ef983c0201fcd86b2c46eacd920f22372372b34b5e628333d0090d2b10f75f0075eba189df24e964a8cdf27b8bf2ff396d7d9bae7adf5dd

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## v1.6.2 [2025-09-02] Lars Kanis <lars@greiz-reinsdorf.de>
+
+- Remove several absolute paths from native binaries which pointed to build directories. [#668](https://github.com/ged/ruby-pg/pull/668)
+- Fix bad fallback path to `pg_service.conf`. [#666](https://github.com/ged/ruby-pg/pull/666)
+- Use `rbpg_` prefix for `base64_*` functions to avoid name clashes with functions provided by other libraries like Heimdal on Macos. [#667](https://github.com/ged/ruby-pg/pull/667)
+- Raise a more descriptive error message in case of `pg_ext` LoadError. [#664](https://github.com/ged/ruby-pg/pull/664)
+- Freeze some constants to make them available in a Ractor context. [#660](https://github.com/ged/ruby-pg/pull/660)
+- Several documentation improvements.
+- Update native binary gems to OpenSSL-3.5.2, krb5-1.22.1 and PostgreSQL-17.6.
+
+
 ## v1.6.1 [2025-08-03] Lars Kanis <lars@greiz-reinsdorf.de>
 
 - Add binary gems for platforms `aarch64-linux-musl` and `x86_64-linux-musl` without the need to install package `gcompat`. [#657](https://github.com/ged/ruby-pg/pull/657).

data/Gemfile

@@ -13,7 +13,7 @@ end
 group :test do
   gem "bundler", ">= 1.16", "< 3.0"
   gem "rake-compiler", "~> 1.0"
-  gem "rake-compiler-dock", "~> 1.9.1"
+  gem "rake-compiler-dock", "~> 1.9.1", git: "https://github.com/rake-compiler/rake-compiler-dock"
   gem "rspec", "~> 3.5"
   # "bigdecimal" is a gem on ruby-3.4+ and it's optional for ruby-pg.
   # Specs should succeed without it, but 4 examples are then excluded.

data/README.md

@@ -57,9 +57,7 @@ This installs the binary gem, specific to the running platform by default.
 The binary gems don't depend on the libpq package on the running system.
 They have libpq builtin.
 
-The gems for platform `x86_64-linux` and `aarch64-linux` run on Alpine Linux, but require the package `gcompat` there as long as we don't provide a native gem for platform `x86_64-linux-musl`. Install this package like so:
-
-    apk add gcompat
+The gems for platform `x86_64-linux` and `aarch64-linux` run on Alpine Linux, but require the package `gcompat`, while the native gems for platform `*-linux-musl` work without that dependency.
 
 There is one use case the binary gems don't support: Retrieval of connection [options from LDAP](https://www.postgresql.org/docs/current/libpq-ldap.html). To support this `libldap` would be necessary, but it has a lot of dependencies. It doesn't seem to be a widely used feature and that it's worth to support it. If it's necessary, the source gem can be forced.
 
@@ -67,6 +65,7 @@ There is one use case the binary gems don't support: Retrieval of connection [op
 
 The source gem can be forced by:
 
+    gem uninstall pg --all
     gem install pg --platform ruby
 
 You may need to specify the path to the 'pg_config' program installed with
@@ -148,7 +147,7 @@ Very basic type casting can be enabled by:
 But Pg's type casting is highly customizable. That's why it's divided into
 2 layers:
 
-### Encoders / Decoders (ext/pg_*coder.c, lib/pg/*coder.rb)
+### Encoders / Decoders (ext/pg_\*coder.c, lib/pg/\*coder.rb)
 
 This is the lower layer, containing encoding classes that convert Ruby
 objects for transmission to the DBMS and decoding classes to convert
@@ -190,9 +189,9 @@ The following text and binary formats can also be encoded although they are not
 * Literal for insertion into SQL string: [TE](rdoc-ref:PG::TextEncoder::QuotedLiteral)
 * SQL-Identifier: [TE](rdoc-ref:PG::TextEncoder::Identifier), [TD](rdoc-ref:PG::TextDecoder::Identifier)
 
-### PG::TypeMap and derivations (ext/pg_type_map*.c, lib/pg/type_map*.rb)
+### TypeMap and derivations (ext/pg_type_map\*.c, lib/pg/type_map\*.rb)
 
-A TypeMap defines which value will be converted by which encoder/decoder.
+A PG::TypeMap defines which value will be converted by which encoder/decoder.
 There are different type map strategies, implemented by several derivations
 of this class. They can be chosen and configured according to the particular
 needs for type casting. The default type map is PG::TypeMapAllStrings.

data/Rakefile

@@ -74,7 +74,7 @@ Rake::ExtensionTask.new do |ext|
 	# Activate current cross compiled platform only.
 	# This is to work around the issue that `linux` platform is selected in `linux-musl` image.
 	ext.cross_platform = CrossLibraries.map(&:platform).select do |pl|
-		m = ENV["RCD_IMAGE"]&.match(/:(?<ruby_ver>[\d\.]+)-mri-(?<platform>[-\w]+)$/)
+		m = ENV["RCD_IMAGE"]&.match(/:(?<ruby_ver>[\w\.]+)-mri-(?<platform>[-\w]+)$/)
 		m && m[:platform] == pl
 	end
 
@@ -106,7 +106,7 @@ task 'gem:native:prepare' do
 	# Copy gem signing key and certs to be accessible from the docker container
 	mkdir_p 'build/gem'
 	sh "cp ~/.gem/gem-*.pem build/gem/ || true"
-	sh "bundle package"
+	sh "bundle package --all"
 	begin
 		OpenSSL::PKey.read(File.read(File.expand_path("~/.gem/gem-private_key.pem")), ENV["GEM_PRIVATE_KEY_PASSPHRASE"] || "")
 	rescue OpenSSL::PKey::PKeyError
@@ -141,7 +141,7 @@ CrossLibraries.each do |xlib|
 			bundle install --local &&
 			#{ "rake install_darwin_mig[__arm64__]" if platform =~ /arm64-darwin/ }
 			#{ "rake install_darwin_mig[__x86_64__]" if platform =~ /x86_64-darwin/ }
-			rake native:#{platform} pkg/#{$gem_spec.full_name}-#{platform}.gem MAKEOPTS=-j`nproc` RUBY_CC_VERSION=#{RakeCompilerDock.ruby_cc_version("~>2.7", "~>3.0")}
+			rake native:#{platform} pkg/#{$gem_spec.full_name}-#{platform}.gem MAKEFLAGS="-j`nproc` V=1" RUBY_CC_VERSION=#{RakeCompilerDock.ruby_cc_version("~>2.7", "~>3.0")}
 		EOT
 	end
 	desc "Build the native binary gems"

data/ext/extconf.rb

@@ -27,13 +27,13 @@ if gem_platform=with_config("cross-build")
 	gem 'mini_portile2', '~>2.1'
 	require 'mini_portile2'
 
-	OPENSSL_VERSION = ENV['OPENSSL_VERSION'] || '3.5.1'
+	OPENSSL_VERSION = ENV['OPENSSL_VERSION'] || '3.5.2'
 	OPENSSL_SOURCE_URI = "http://www.openssl.org/source/openssl-#{OPENSSL_VERSION}.tar.gz"
 
-	KRB5_VERSION = ENV['KRB5_VERSION'] || '1.21.3'
+	KRB5_VERSION = ENV['KRB5_VERSION'] || '1.22.1'
 	KRB5_SOURCE_URI = "http://kerberos.org/dist/krb5/#{KRB5_VERSION[/^(\d+\.\d+)/]}/krb5-#{KRB5_VERSION}.tar.gz"
 
-	POSTGRESQL_VERSION = ENV['POSTGRESQL_VERSION'] || '17.5'
+	POSTGRESQL_VERSION = ENV['POSTGRESQL_VERSION'] || '17.6'
 	POSTGRESQL_SOURCE_URI = "http://ftp.postgresql.org/pub/source/v#{POSTGRESQL_VERSION}/postgresql-#{POSTGRESQL_VERSION}.tar.bz2"
 
 	class BuildRecipe < MiniPortile
@@ -49,6 +49,12 @@ if gem_platform=with_config("cross-build")
 			"#{target}/#{RUBY_PLATFORM}"
 		end
 
+		# Add "--prefix=/", to avoid our actual build install path compiled into the binary.
+		# Instead use DESTDIR variable of make to set our install path.
+		def configure_prefix
+			"--prefix="
+		end
+
 		def cook_and_activate
 			checkpoint = File.join(self.target, "#{self.name}-#{self.version}-#{RUBY_PLATFORM}.installed")
 			unless File.exist?(checkpoint)
@@ -70,13 +76,13 @@ if gem_platform=with_config("cross-build")
 				envs = []
 				envs << "CFLAGS=-DDSO_WIN32 -DOPENSSL_THREADS" if RUBY_PLATFORM =~ /mingw|mswin/
 				envs << "CFLAGS=-fPIC -DOPENSSL_THREADS" if RUBY_PLATFORM =~ /linux|darwin/
-				execute('configure', ['env', *envs, "./Configure", openssl_platform, "threads", "-static", "CROSS_COMPILE=#{host}-", configure_prefix], altlog: "config.log")
+				execute('configure', ['env', *envs, "./Configure", openssl_platform, "threads", "-static", "CROSS_COMPILE=#{host}-", "--prefix=/"], altlog: "config.log")
 			end
 			def compile
 				execute('compile', "#{make_cmd} build_libs")
 			end
 			def install
-				execute('install', "#{make_cmd} install_dev")
+				execute('install', "#{make_cmd} install_dev DESTDIR=#{path}")
 			end
 		end
 
@@ -104,6 +110,9 @@ if gem_platform=with_config("cross-build")
 					end
 					super
 				end
+				def install
+					execute('install', "#{make_cmd} install DESTDIR=#{path}")
+				end
 			end
 			# We specify -fcommon to get around duplicate definition errors in recent gcc.
 			# See https://github.com/cockroachdb/cockroach/issues/49734
@@ -112,6 +121,7 @@ if gem_platform=with_config("cross-build")
 			recipe.configure_options << "--without-keyutils"
 			recipe.configure_options << "--disable-nls"
 			recipe.configure_options << "--disable-silent-rules"
+			recipe.configure_options << "--disable-rpath"
 			recipe.configure_options << "--without-system-verto"
 			recipe.configure_options << "krb5_cv_attr_constructor_destructor=yes"
 			recipe.configure_options << "ac_cv_func_regcomp=yes"
@@ -146,12 +156,13 @@ if gem_platform=with_config("cross-build")
 					'--without-zlib',
 					'--without-icu',
 					'--without-readline',
+					'--disable-rpath',
 					'ac_cv_search_gss_store_cred_into=',
 				]
 			end
 			def compile
-				execute 'compile include', "#{make_cmd} -C src/include install"
-				execute 'compile interfaces', "#{make_cmd} -C src/interfaces install"
+				execute 'compile include', "#{make_cmd} -C src/include install DESTDIR=#{path}"
+				execute 'compile interfaces', "#{make_cmd} -C src/interfaces install DESTDIR=#{path}"
 			end
 			def install
 			end
@@ -169,6 +180,9 @@ if gem_platform=with_config("cross-build")
 	# Use our own library name for libpq to avoid loading of system libpq by accident.
 	FileUtils.ln_sf File.join(postgresql_recipe.port_path, "lib/#{libpq_orig}"),
 			File.join(postgresql_recipe.port_path, "lib/#{libpq_rubypg}")
+	# Link to libpq_rubypg in our ports directory without adding it as rpath (like dir_config does)
+	$CFLAGS << " -I#{postgresql_recipe.path}/include"
+	$LDFLAGS << " -L#{postgresql_recipe.path}/lib"
 	# Avoid dependency to external libgcc.dll on x86-mingw32
 	$LDFLAGS << " -static-libgcc" if RUBY_PLATFORM =~ /mingw|mswin/
 	# Avoid: "libpq.so: undefined reference to `dlopen'" in cross-ruby-2.7.8
@@ -176,8 +190,6 @@ if gem_platform=with_config("cross-build")
 	# Find libpq in the ports directory coming from lib/3.x
 	# It is shared between all compiled ruby versions.
 	$LDFLAGS << " '-Wl,-rpath=$$ORIGIN/../../ports/#{gem_platform}/lib'" if RUBY_PLATFORM =~ /linux/
-	# Don't use pg_config for cross build, but --with-pg-* path options
-	dir_config('pg', "#{postgresql_recipe.path}/include", "#{postgresql_recipe.path}/lib")
 
 	$defs.push( "-DPG_IS_BINARY_GEM")
 else
@@ -318,3 +330,20 @@ end
 create_header()
 create_makefile( "pg_ext" )
 
+if gem_platform
+	# exercise the strip command on native binary gems
+	# This approach borrowed from
+	# https://github.com/rake-compiler/rake-compiler-dock/blob/38066d479050f4fdb3956469255b35a05e5949ef/test/rcd_test/ext/mri/extconf.rb#L97C1-L110C42
+	strip_tool = RbConfig::CONFIG['STRIP']
+	strip_tool += ' -x' if RUBY_PLATFORM =~ /darwin/
+		File.open('Makefile.new', 'w') do |o|
+		o.puts 'hijack: all strip'
+		o.puts
+		o.write(File.read('Makefile'))
+		o.puts
+		o.puts 'strip: $(DLLIB)'
+		o.puts "\t$(ECHO) Stripping $(DLLIB)"
+		o.puts "\t$(Q) #{strip_tool} $(DLLIB)"
+	end
+	File.rename('Makefile.new', 'Makefile')
+end

data/ext/pg_binary_decoder.c

@@ -117,7 +117,7 @@ pg_bin_dec_to_base64(t_pg_coder *conv, const char *val, int len, int tuple, int
 	/* create a buffer of the encoded length */
 	VALUE out_value = rb_str_new(NULL, encoded_len);
 
-	base64_encode( RSTRING_PTR(out_value), val, len );
+	rbpg_base64_encode( RSTRING_PTR(out_value), val, len );
 
 	/* Is it a pure String conversion? Then we can directly send out_value to the user. */
 	if( this->comp.format == 0 && dec_func == pg_text_dec_string ){

data/ext/pg_binary_encoder.c

@@ -524,7 +524,7 @@ pg_bin_enc_from_base64(t_pg_coder *conv, VALUE value, char *out, VALUE *intermed
 	if(out){
 		/* Second encoder pass, if required */
 		strlen = enc_func(this->elem, value, out, intermediate, enc_idx);
-		strlen = base64_decode( out, out, strlen );
+		strlen = rbpg_base64_decode( out, out, strlen );
 
 		return strlen;
 	} else {
@@ -538,7 +538,7 @@ pg_bin_enc_from_base64(t_pg_coder *conv, VALUE value, char *out, VALUE *intermed
 			strlen = RSTRING_LENINT(subint);
 			out_str = rb_str_new(NULL, BASE64_DECODED_SIZE(strlen));
 
-			strlen = base64_decode( RSTRING_PTR(out_str), RSTRING_PTR(subint), strlen);
+			strlen = rbpg_base64_decode( RSTRING_PTR(out_str), RSTRING_PTR(subint), strlen);
 			rb_str_set_len( out_str, strlen );
 			*intermediate = out_str;
 

data/ext/pg_result.c

@@ -617,7 +617,7 @@ pgresult_error_message(VALUE self)
  * call-seq:
  *    res.verbose_error_message( verbosity, show_context ) -> String
  *
- * Returns a reformatted version of the error message associated with a PGresult object.
+ * Returns a reformatted version of the error message associated with the PG::Result object.
  *
  */
 static VALUE
@@ -734,9 +734,9 @@ pgresult_nfields(VALUE self)
  * call-seq:
  *    res.binary_tuples() -> Integer
  *
- * Returns 1 if the PGresult contains binary data and 0 if it contains text data.
+ * Returns 1 if the PG::Result contains binary data and 0 if it contains text data.
  *
- * This function is deprecated (except for its use in connection with COPY), because it is possible for a single PGresult to contain text data in some columns and binary data in others.
+ * This function is deprecated (except for its use in connection with COPY), because it is possible for a single PG::Result to contain text data in some columns and binary data in others.
  * Result#fformat is preferred. binary_tuples returns 1 only if all columns of the result are binary (format 1).
  */
 static VALUE
@@ -1402,7 +1402,7 @@ pgresult_fields(VALUE self)
  * call-seq:
  *    res.type_map = typemap
  *
- * Set the TypeMap that is used for type casts of result values to ruby objects.
+ * Set the PG::TypeMap that is used for type casts of result values to ruby objects.
  *
  * All value retrieval methods will respect the type map and will do the
  * type casts from PostgreSQL's wire format to Ruby objects on the fly,
@@ -1432,7 +1432,7 @@ pgresult_type_map_set(VALUE self, VALUE typemap)
  * call-seq:
  *    res.type_map -> value
  *
- * Returns the TypeMap that is currently set for type casts of result values to ruby objects.
+ * Returns the PG::TypeMap that is currently set for type casts of result values to ruby objects.
  *
  */
 static VALUE
@@ -1572,8 +1572,8 @@ pgresult_stream_any(VALUE self, int (*yielder)(VALUE, int, int, void*), void* da
  * wrapping each row into a dedicated result object, it delivers data in nearly
  * the same speed as with ordinary results.
  *
- * The base result must be in status PGRES_SINGLE_TUPLE or PGRES_TUPLES_CHUNK.
- * It iterates over all tuples until the status changes to PGRES_TUPLES_OK.
+ * The base result must be in status +PGRES_SINGLE_TUPLE+ or +PGRES_TUPLES_CHUNK+.
+ * It iterates over all tuples until the status changes to +PGRES_TUPLES_OK+.
  * A PG::Error is raised for any errors from the server.
  *
  * Row description data does not change while the iteration. All value retrieval

data/ext/pg_text_decoder.c

@@ -579,7 +579,7 @@ pg_text_dec_from_base64(t_pg_coder *conv, const char *val, int len, int tuple, i
 	/* create a buffer of the expected decoded length */
 	VALUE out_value = rb_str_new(NULL, BASE64_DECODED_SIZE(len));
 
-	decoded_len = base64_decode( RSTRING_PTR(out_value), val, len );
+	decoded_len = rbpg_base64_decode( RSTRING_PTR(out_value), val, len );
 	rb_str_set_len(out_value, decoded_len);
 
 	/* Is it a pure String conversion? Then we can directly send out_value to the user. */

data/ext/pg_text_encoder.c

@@ -784,7 +784,7 @@ pg_text_enc_to_base64(t_pg_coder *conv, VALUE value, char *out, VALUE *intermedi
 	if(out){
 		/* Second encoder pass, if required */
 		strlen = enc_func(this->elem, value, out, intermediate, enc_idx);
-		base64_encode( out, out, strlen );
+		rbpg_base64_encode( out, out, strlen );
 
 		return BASE64_ENCODED_SIZE(strlen);
 	} else {
@@ -799,7 +799,7 @@ pg_text_enc_to_base64(t_pg_coder *conv, VALUE value, char *out, VALUE *intermedi
 			out_str = rb_str_new(NULL, BASE64_ENCODED_SIZE(strlen));
 			PG_ENCODING_SET_NOCHECK(out_str, enc_idx);
 
-			base64_encode( RSTRING_PTR(out_str), RSTRING_PTR(subint), strlen);
+			rbpg_base64_encode( RSTRING_PTR(out_str), RSTRING_PTR(subint), strlen);
 			*intermediate = out_str;
 
 			return -1;

data/ext/pg_tuple.c

@@ -242,10 +242,10 @@ pg_tuple_materialize(VALUE self)
  * An integer +key+ is interpreted as column index.
  * Negative values of index count from the end of the array.
  *
- * Depending on Result#field_name_type= a string or symbol +key+ is interpreted as column name.
+ * Depending on PG::Result#field_name_type= a string or symbol +key+ is interpreted as column name.
  *
  * If the key can't be found, there are several options:
- * With no other arguments, it will raise a IndexError exception;
+ * With no other arguments, it will raise a +IndexError+ exception;
  * if default is given, then that will be returned;
  * if the optional code block is specified, then that will be run and its result returned.
  */
@@ -302,7 +302,7 @@ pg_tuple_fetch(int argc, VALUE *argv, VALUE self)
  * An integer +key+ is interpreted as column index.
  * Negative values of index count from the end of the array.
  *
- * Depending on Result#field_name_type= a string or symbol +key+ is interpreted as column name.
+ * Depending on PG::Result#field_name_type= a string or symbol +key+ is interpreted as column name.
  *
  * If the key can't be found, it returns +nil+ .
  */
@@ -405,7 +405,7 @@ pg_tuple_each_value(VALUE self)
  *    tup.values  -> Array
  *
  * Returns the values of this tuple as Array.
- * +res.tuple(i).values+ is equal to +res.tuple_values(i)+ .
+ * <tt>res.tuple(i).values</tt> is equal to <tt>res.tuple_values(i)</tt> .
  */
 static VALUE
 pg_tuple_values(VALUE self)
@@ -474,7 +474,7 @@ pg_tuple_dump(VALUE self)
 	values = rb_ary_new4(this->num_fields, &this->values[0]);
 	a = rb_ary_new3(2, field_names, values);
 
-        rb_copy_generic_ivar(a, self);
+	rb_copy_generic_ivar(a, self);
 
 	return a;
 }

data/ext/pg_type_map.c

@@ -187,7 +187,9 @@ init_pg_type_map(void)
 	 *
 	 * This is the base class for type maps.
 	 * See derived classes for implementations of different type cast strategies
-	 * ( PG::TypeMapByColumn, PG::TypeMapByOid ).
+	 * ( PG::TypeMapByColumn, PG::TypeMapByOid, etc.).
+	 *
+	 * Find more type maps in the {README}[rdoc-ref:README.md@Type+Casts].
 	 *
 	 */
 	rb_cTypeMap = rb_define_class_under( rb_mPG, "TypeMap", rb_cObject );

data/ext/pg_util.c

@@ -15,7 +15,7 @@ static const char base64_encode_table[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijk
  * in-place (with _out_ == _in_).
  */
 void
-base64_encode( char *out, const char *in, int len)
+rbpg_base64_encode( char *out, const char *in, int len)
 {
 	const unsigned char *in_ptr = (const unsigned char *)in + len;
 	char *out_ptr = out + BASE64_ENCODED_SIZE(len);
@@ -72,7 +72,7 @@ static const unsigned char base64_decode_table[] =
  * It is possible to decode a string in-place (with _out_ == _in_).
  */
 int
-base64_decode( char *out, const char *in, unsigned int len)
+rbpg_base64_decode( char *out, const char *in, unsigned int len)
 {
 	unsigned char a, b, c, d;
 	const unsigned char *in_ptr = (const unsigned char *)in;

data/ext/pg_util.h

@@ -57,8 +57,8 @@
 #define BASE64_ENCODED_SIZE(strlen) (((strlen) + 2) / 3 * 4)
 #define BASE64_DECODED_SIZE(base64len) (((base64len) + 3) / 4 * 3)
 
-void base64_encode( char *out, const char *in, int len);
-int base64_decode( char *out, const char *in, unsigned int len);
+void rbpg_base64_encode( char *out, const char *in, int len);
+int rbpg_base64_decode( char *out, const char *in, unsigned int len);
 
 int rbpg_strncasecmp(const char *s1, const char *s2, size_t n);
 

data/lib/pg/version.rb

@@ -1,4 +1,5 @@
+# frozen_string_literal: true
 module PG
 	# Library version
-	VERSION = '1.6.1'
+	VERSION = '1.6.2'
 end

data/lib/pg.rb

@@ -5,140 +5,161 @@
 # The top-level PG namespace.
 module PG
 
-	# Is this file part of a fat binary gem with bundled libpq?
-	# This path must be enabled by add_dll_directory on Windows.
-	gplat = Gem::Platform.local
-	bundled_libpq_path = Dir[File.expand_path("../ports/#{gplat.cpu}-#{gplat.os}*/lib", __dir__)].first
-	if bundled_libpq_path
-		POSTGRESQL_LIB_PATH = bundled_libpq_path
-	else
-		# Try to load libpq path as found by extconf.rb
-		begin
-			require "pg/postgresql_lib_path"
-		rescue LoadError
-			# rake-compiler doesn't use regular "make install", but uses it's own install tasks.
-			# It therefore doesn't copy pg/postgresql_lib_path.rb in case of "rake compile".
-			POSTGRESQL_LIB_PATH = false
-		end
-	end
-
-	add_dll_path = proc do |path, &block|
-		if RUBY_PLATFORM =~/(mswin|mingw)/i && path
-			BUNDLED_LIBPQ_WITH_UNIXSOCKET = false
-			begin
-				require 'ruby_installer/runtime'
-				RubyInstaller::Runtime.add_dll_directory(path, &block)
-			rescue LoadError
-				old_path = ENV['PATH']
-				ENV['PATH'] = "#{path};#{old_path}"
-				block.call
-				ENV['PATH'] = old_path
-			end
-		else
-			# libpq is found by a relative rpath in the cross compiled extension dll
-			# or by the system library loader
-			block.call
-			BUNDLED_LIBPQ_WITH_UNIXSOCKET = RUBY_PLATFORM=~/linux/i && PG::IS_BINARY_GEM
-		end
-	end
-
-	# Add a load path to the one retrieved from pg_config
-	add_dll_path.call(POSTGRESQL_LIB_PATH) do
-		begin
-			# Try the <major>.<minor> subdirectory for fat binary gems
-			major_minor = RUBY_VERSION[ /^(\d+\.\d+)/ ] or
-				raise "Oops, can't extract the major/minor version from #{RUBY_VERSION.dump}"
-			require "#{major_minor}/pg_ext"
-		rescue LoadError
-			require 'pg_ext'
-		end
-	end
-
-	# Get the PG library version.
-	#
-	# +include_buildnum+ is no longer used and any value passed will be ignored.
-	def self.version_string( include_buildnum=nil )
-		"%s %s" % [ self.name, VERSION ]
-	end
-
-
-	### Convenience alias for PG::Connection.new.
-	def self.connect( *args, &block )
-		Connection.new( *args, &block )
-	end
-
-	if defined?(Ractor.make_shareable)
-		def self.make_shareable(obj)
-			Ractor.make_shareable(obj)
-		end
-	else
-		def self.make_shareable(obj)
-			obj.freeze
-		end
-	end
-
-	module BinaryDecoder
-		%i[ TimestampUtc TimestampUtcToLocal TimestampLocal ].each do |klass|
-			autoload klass, 'pg/binary_decoder/timestamp'
-		end
-		autoload :Date, 'pg/binary_decoder/date'
-	end
-	module BinaryEncoder
-		%i[ TimestampUtc TimestampLocal ].each do |klass|
-			autoload klass, 'pg/binary_encoder/timestamp'
-		end
-	end
-	module TextDecoder
-		%i[ TimestampUtc TimestampUtcToLocal TimestampLocal TimestampWithoutTimeZone TimestampWithTimeZone ].each do |klass|
-			autoload klass, 'pg/text_decoder/timestamp'
-		end
-		autoload :Date, 'pg/text_decoder/date'
-		autoload :Inet, 'pg/text_decoder/inet'
-		autoload :JSON, 'pg/text_decoder/json'
-		autoload :Numeric, 'pg/text_decoder/numeric'
-	end
-	module TextEncoder
-		%i[ TimestampUtc TimestampWithoutTimeZone TimestampWithTimeZone ].each do |klass|
-			autoload klass, 'pg/text_encoder/timestamp'
-		end
-		autoload :Date, 'pg/text_encoder/date'
-		autoload :Inet, 'pg/text_encoder/inet'
-		autoload :JSON, 'pg/text_encoder/json'
-		autoload :Numeric, 'pg/text_encoder/numeric'
-	end
-
-	autoload :BasicTypeMapBasedOnResult, 'pg/basic_type_map_based_on_result'
-	autoload :BasicTypeMapForQueries, 'pg/basic_type_map_for_queries'
-	autoload :BasicTypeMapForResults, 'pg/basic_type_map_for_results'
-	autoload :BasicTypeRegistry, 'pg/basic_type_registry'
-	require 'pg/exceptions'
-	require 'pg/coder'
-	require 'pg/type_map_by_column'
-	require 'pg/connection'
-	require 'pg/cancel_connection'
-	require 'pg/result'
-	require 'pg/tuple'
-	autoload :VERSION, 'pg/version'
-
-
-	# Avoid "uninitialized constant Truffle::WarningOperations" on Truffleruby up to 22.3.1
-	if RUBY_ENGINE=="truffleruby" && !defined?(Truffle::WarningOperations)
-		module TruffleFixWarn
-			def warn(str, category=nil)
-				super(str)
-			end
-		end
-		Warning.extend(TruffleFixWarn)
-	end
-
-	# Ruby-3.4+ prints a warning, if bigdecimal is required but not in the Gemfile.
-	# But it's a false positive, since we enable bigdecimal depending features only if it's available.
-	# And most people don't need these features.
-	def self.require_bigdecimal_without_warning
-		oldverb, $VERBOSE = $VERBOSE, nil
-		require "bigdecimal"
-	ensure
-		$VERBOSE = oldverb
-	end
+  # Is this file part of a fat binary gem with bundled libpq?
+  # This path must be enabled by add_dll_directory on Windows.
+  gplat = Gem::Platform.local
+  bundled_libpq_path = Dir[File.expand_path("../ports/#{gplat.cpu}-#{gplat.os}*/lib", __dir__)].first
+  if bundled_libpq_path
+    POSTGRESQL_LIB_PATH = bundled_libpq_path
+  else
+    # Try to load libpq path as found by extconf.rb
+    begin
+      require "pg/postgresql_lib_path"
+    rescue LoadError
+      # rake-compiler doesn't use regular "make install", but uses it's own install tasks.
+      # It therefore doesn't copy pg/postgresql_lib_path.rb in case of "rake compile".
+      POSTGRESQL_LIB_PATH = false
+    end
+  end
+  POSTGRESQL_LIB_PATH.freeze
+
+  add_dll_path = proc do |path, &block|
+    if RUBY_PLATFORM =~/(mswin|mingw)/i && path
+      BUNDLED_LIBPQ_WITH_UNIXSOCKET = false
+      begin
+        require 'ruby_installer/runtime'
+        RubyInstaller::Runtime.add_dll_directory(path, &block)
+      rescue LoadError
+        old_path = ENV['PATH']
+        ENV['PATH'] = "#{path};#{old_path}"
+        block.call
+        ENV['PATH'] = old_path
+      end
+    else
+      # libpq is found by a relative rpath in the cross compiled extension dll
+      # or by the system library loader
+      block.call
+      BUNDLED_LIBPQ_WITH_UNIXSOCKET = RUBY_PLATFORM=~/linux/i && PG::IS_BINARY_GEM
+    end
+  end
+
+  # Add a load path to the one retrieved from pg_config
+  add_dll_path.call(POSTGRESQL_LIB_PATH) do
+    begin
+      # Try the <major>.<minor> subdirectory for fat binary gems
+      major_minor = RUBY_VERSION[ /^(\d+\.\d+)/ ] or
+        raise "Oops, can't extract the major/minor version from #{RUBY_VERSION.dump}"
+      require "#{major_minor}/pg_ext"
+    rescue LoadError => error1
+      begin
+        require 'pg_ext'
+      rescue LoadError => error2
+        msg = <<~EOT
+          pg's C extension failed to load:
+            #{error1}
+            #{error2}
+        EOT
+        if msg =~ /GLIBC/
+          msg += <<~EOT
+
+            The GLIBC version of this system seems too old. Please use the source version of pg:
+                gem uninstall pg --all
+                gem install pg --platform ruby
+            or in your Gemfile:
+                gem "pg", force_ruby_platform: true
+            See also: https://deveiate.org/code/pg/README_md.html#label-Source+gem
+          EOT
+        end
+        raise error2, msg
+      end
+    end
+  end
+
+  # Get the PG library version.
+  #
+  # +include_buildnum+ is no longer used and any value passed will be ignored.
+  def self.version_string( include_buildnum=nil )
+    "%s %s" % [ self.name, VERSION ]
+  end
+
+
+  ### Convenience alias for PG::Connection.new.
+  def self.connect( *args, &block )
+    Connection.new( *args, &block )
+  end
+
+  if defined?(Ractor.make_shareable)
+    def self.make_shareable(obj)
+      Ractor.make_shareable(obj)
+    end
+  else
+    def self.make_shareable(obj)
+      obj.freeze
+    end
+  end
+
+  module BinaryDecoder
+    %i[ TimestampUtc TimestampUtcToLocal TimestampLocal ].each do |klass|
+      autoload klass, 'pg/binary_decoder/timestamp'
+    end
+    autoload :Date, 'pg/binary_decoder/date'
+  end
+  module BinaryEncoder
+    %i[ TimestampUtc TimestampLocal ].each do |klass|
+      autoload klass, 'pg/binary_encoder/timestamp'
+    end
+  end
+  module TextDecoder
+    %i[ TimestampUtc TimestampUtcToLocal TimestampLocal TimestampWithoutTimeZone TimestampWithTimeZone ].each do |klass|
+      autoload klass, 'pg/text_decoder/timestamp'
+    end
+    autoload :Date, 'pg/text_decoder/date'
+    autoload :Inet, 'pg/text_decoder/inet'
+    autoload :JSON, 'pg/text_decoder/json'
+    autoload :Numeric, 'pg/text_decoder/numeric'
+  end
+  module TextEncoder
+    %i[ TimestampUtc TimestampWithoutTimeZone TimestampWithTimeZone ].each do |klass|
+      autoload klass, 'pg/text_encoder/timestamp'
+    end
+    autoload :Date, 'pg/text_encoder/date'
+    autoload :Inet, 'pg/text_encoder/inet'
+    autoload :JSON, 'pg/text_encoder/json'
+    autoload :Numeric, 'pg/text_encoder/numeric'
+  end
+
+  autoload :BasicTypeMapBasedOnResult, 'pg/basic_type_map_based_on_result'
+  autoload :BasicTypeMapForQueries, 'pg/basic_type_map_for_queries'
+  autoload :BasicTypeMapForResults, 'pg/basic_type_map_for_results'
+  autoload :BasicTypeRegistry, 'pg/basic_type_registry'
+  require 'pg/exceptions'
+  require 'pg/coder'
+  require 'pg/type_map_by_column'
+  require 'pg/connection'
+  require 'pg/cancel_connection'
+  require 'pg/result'
+  require 'pg/tuple'
+  autoload :VERSION, 'pg/version'
+
+
+  # Avoid "uninitialized constant Truffle::WarningOperations" on Truffleruby up to 22.3.1
+  if RUBY_ENGINE=="truffleruby" && !defined?(Truffle::WarningOperations)
+    module TruffleFixWarn
+      def warn(str, category=nil)
+        super(str)
+      end
+    end
+    Warning.extend(TruffleFixWarn)
+  end
+
+  # Ruby-3.4+ prints a warning, if bigdecimal is required but not in the Gemfile.
+  # But it's a false positive, since we enable bigdecimal depending features only if it's available.
+  # And most people don't need these features.
+  def self.require_bigdecimal_without_warning
+    oldverb, $VERBOSE = $VERBOSE, nil
+    require "bigdecimal"
+  ensure
+    $VERBOSE = oldverb
+  end
 
 end # module PG

data/misc/glibc/Dockerfile

@@ -0,0 +1,20 @@
+FROM debian:10.13
+
+WORKDIR /pg
+
+# Debian 10.13 is EOL now:
+RUN sed -i s/deb.debian.org/archive.debian.org/g /etc/apt/sources.list
+
+RUN apt-get update && apt-get install ruby git wget gcc make libz-dev libffi-dev libreadline-dev libyaml-dev libssl-dev -y
+
+ENV RBENV_ROOT=/usr/local/rbenv
+
+RUN git clone https://github.com/rbenv/rbenv.git      ${RBENV_ROOT} && \
+    git clone https://github.com/rbenv/ruby-build.git ${RBENV_ROOT}/plugins/ruby-build && \
+    $RBENV_ROOT/bin/rbenv init
+
+RUN $RBENV_ROOT/bin/rbenv install 3.3.9 -- --disable-install-doc
+RUN /usr/local/rbenv/versions/3.3.9/bin/gem inst rspec
+
+CMD /usr/local/rbenv/versions/3.3.9/bin/gem inst --local pg-*.gem && \
+    /usr/local/rbenv/versions/3.3.9/bin/rspec glibc_spec.rb

data/misc/glibc/docker-compose.yml

@@ -0,0 +1,9 @@
+services:
+  pg:
+    build:
+      context: .
+      args:
+        - http_proxy
+        - https_proxy
+    volumes:
+      - .:/pg

data/misc/glibc/glibc_spec.rb

@@ -0,0 +1,5 @@
+RSpec.describe "require 'pg'" do
+  it "gives a descriptive error message when GLIBC is too old" do
+    expect { require "pg" }.to raise_error(/GLIBC.*gem install pg --platform ruby/m)
+  end
+end

data/ports/patches/krb5/1.22.1/0002-unknown-command-line-option-on-clang.patch

@@ -0,0 +1,12 @@
+diff --git a/src/lib/krb5/krb/deltat.c b/src/lib/krb5/krb/deltat.c
+index 03145c854..34cdf969e 100644
+--- a/lib/krb5/krb/deltat.c
++++ b/lib/krb5/krb/deltat.c
+@@ -44,7 +44,6 @@
+ #ifdef __GNUC__
+ #pragma GCC diagnostic push
+ #pragma GCC diagnostic ignored "-Wuninitialized"
+-#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
+ #endif
+
+ #include "k5-int.h"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - Michael Granger
@@ -176,6 +176,9 @@ files:
 - lib/pg/tuple.rb
 - lib/pg/type_map_by_column.rb
 - lib/pg/version.rb
+- misc/glibc/Dockerfile
+- misc/glibc/docker-compose.yml
+- misc/glibc/glibc_spec.rb
 - misc/openssl-pg-segfault.rb
 - misc/postgres/History.txt
 - misc/postgres/Manifest.txt
@@ -191,10 +194,11 @@ files:
 - misc/yugabyte/docker-compose.yml
 - misc/yugabyte/pg-test.rb
 - pg.gemspec
-- ports/patches/krb5/1.21.3/0001-Allow-static-linking-krb5-library.patch
-- ports/patches/openssl/3.5.1/0001-aarch64-mingw.patch
-- ports/patches/postgresql/17.5/0001-Use-workaround-of-__builtin_setjmp-only-on-MINGW-on-.patch
-- ports/patches/postgresql/17.5/0001-libpq-Process-buffered-SSL-read-bytes-to-support-rec.patch
+- ports/patches/krb5/1.22.1/0001-Allow-static-linking-krb5-library.patch
+- ports/patches/krb5/1.22.1/0002-unknown-command-line-option-on-clang.patch
+- ports/patches/openssl/3.5.2/0001-aarch64-mingw.patch
+- ports/patches/postgresql/17.6/0001-Use-workaround-of-__builtin_setjmp-only-on-MINGW-on-.patch
+- ports/patches/postgresql/17.6/0001-libpq-Process-buffered-SSL-read-bytes-to-support-rec.patch
 - rakelib/pg_gem_helper.rb
 - rakelib/task_extension.rb
 - sample/array_insert.rb
@@ -243,7 +247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.1
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Pg is the Ruby interface to the PostgreSQL RDBMS
 test_files: []