.gitignore

@@ -1,2 +1 @@
-SOURCES/pg-1.5.4-spec.tar.gz
-SOURCES/pg-1.5.4.gem
+SOURCES/pg-1.2.3.gem

.rubygem-pg.metadata

@@ -1,2 +1 @@
-9802fe4e66ed86f5881692181a48d48ec137eb93 SOURCES/pg-1.5.4-spec.tar.gz
-b4ff1dfd1a5b2c269d402d1c21380074c25afa6a SOURCES/pg-1.5.4.gem
+8d6059a2769035768d7b9f2ac60e12eb3093b6fe SOURCES/pg-1.2.3.gem

SOURCES/rubygem-pg-0.17.1-remove-rpath.patch

@@ -0,0 +1,17 @@
+diff --git a/ext/extconf.rb b/ext/extconf.rb
+--- a/ext/extconf.rb
++++ b/ext/extconf.rb
+@@ -33,13 +33,6 @@
+ 		incdir = `"#{pgconfig}" --includedir`.chomp
+ 		libdir = `"#{pgconfig}" --libdir`.chomp
+ 		dir_config 'pg', incdir, libdir
+-
+-		# Try to use runtime path linker option, even if RbConfig doesn't know about it.
+-		# The rpath option is usually set implicit by dir_config(), but so far not
+-		# on MacOS-X.
+-		if RbConfig::CONFIG["RPATHFLAG"].to_s.empty? && try_link('int main() {return 0;}', " -Wl,-rpath,#{libdir}")
+-			$LDFLAGS << " -Wl,-rpath,#{libdir}"
+-		end
+ 	else
+ 		$stderr.puts "No pg_config... trying anyway. If building fails, please try again with",
+ 			" --with-pg-config=/path/to/pg_config"

SOURCES/rubygem-pg-1.3.0-remove-rpath.patch

@@ -1,17 +0,0 @@
-diff --git a/ext/extconf.rb b/ext/extconf.rb
---- a/ext/extconf.rb
-+++ b/ext/extconf.rb
-@@ -54,13 +54,6 @@ else
- 		dlldir = libdir
- 	end
- 
--	# Try to use runtime path linker option, even if RbConfig doesn't know about it.
--	# The rpath option is usually set implicit by dir_config(), but so far not
--	# on MacOS-X.
--	if dlldir && RbConfig::CONFIG["RPATHFLAG"].to_s.empty?
--		append_ldflags "-Wl,-rpath,#{dlldir.quote}"
--	end
--
- 	if /mswin/ =~ RUBY_PLATFORM
- 		$libs = append_library($libs, 'ws2_32')
- 	end

SOURCES/rubygem-pg-1.5.4-Explicitly-retype-timespec-fields-to-int64_t.patch

@@ -1,33 +0,0 @@
-From 110665fa55292027e835f9d6bdfb3ed608b0a6ca Mon Sep 17 00:00:00 2001
-From: Jarek Prokop <jprokop@redhat.com>
-Date: Fri, 20 Oct 2023 17:52:11 +0200
-Subject: [PATCH] Explicitly retype timespec fields to int64_t to fix
- compatibility with 32bit arches.
-
-Timespec fields' time_t type is not guaranteed to be any particular integer.
-Tests with binary timestamp conversion are failing on 32bit arches (e.g. intel x86)
-until they are retyped into int64_t, which fixes the issue with encoding the Time instances.
-
-Decoder doesn't need adjusting. It returns the correct time from the encoded binary representation.
-
-Resolves: https://github.com/ged/ruby-pg/issues/545
----
- ext/pg_binary_encoder.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ext/pg_binary_encoder.c b/ext/pg_binary_encoder.c
-index e074a85..df45676 100644
---- a/ext/pg_binary_encoder.c
-+++ b/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 */
--- 
-2.42.0
-

SOURCES/rubygem-pg-1.5.4-Fix-possible-buffer-overflows-on-32-bit-systems.patch

@@ -1,75 +0,0 @@
-From fb3fba9eac65291b20f22eb956f02490d62de3ec Mon Sep 17 00:00:00 2001
-From: Lars Kanis <kanis@comcard.de>
-Date: Thu, 19 Oct 2023 18:32:31 +0200
-Subject: [PATCH] Fix possible buffer overflows on 32 bit systems
-
-Comparing pointers after adding lengths is dangerous, since the length can overflow the pointer, so that the comparison leads to wrong results.
-Comparing lengths only fixes this issue.
-
-This lead to segfault in the following spec on x86:
-
-	it "should raise an error at grabage COPY format" do
-		expect{ decoder.decode("123\t \0\\\t\\") }
-			.to raise_error(ArgumentError, /premature.*at position: 7$/)
-	end
----
- ext/pg_copy_coder.c | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/ext/pg_copy_coder.c b/ext/pg_copy_coder.c
-index 16d5c15..f2fe029 100644
---- a/ext/pg_copy_coder.c
-+++ b/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 );
--- 
-2.42.0
-

SPECS/rubygem-pg.spec

@@ -2,35 +2,22 @@
 %global gem_name pg
 
 Name: rubygem-%{gem_name}
-Version: 1.5.4
-Release: 4%{?dist}
+Version: 1.2.3
+Release: 7%{?dist}
 Summary: A Ruby interface to the PostgreSQL RDBMS
-License: (BSD-2-Clause OR Ruby) AND PostgreSQL
+# Upstream license clarification (https://bitbucket.org/ged/ruby-pg/issue/72/)
+#
+# The portions of the code that are BSD-licensed are licensed under
+# the BSD 3-Clause license; the contents of the BSD file are incorrect.
+#
+License: (BSD or Ruby) and PostgreSQL
 URL: https://github.com/ged/ruby-pg
 Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
-# git clone --no-checkout https://github.com/ged/ruby-pg.git
-# git -C ruby-pg archive -v -o pg-1.5.4-spec.tar.gz v1.5.4 spec/
-Source1: %{gem_name}-%{version}-spec.tar.gz
 # Disable RPATH.
-# https://github.com/ged/ruby-pg/issues/183
-Patch0: rubygem-pg-1.3.0-remove-rpath.patch
-# Fix integer arithmetic on timespec struct fields on 32bit systems.
-# The time_t type that is the type of timespec struct fields is not guaranteed
-# to be any particular size or type. Therefore we need to explicitly retype
-# to avoid buffer {over,under}flow.
-# See `man 3 timespec` and `man 3 time_t` for further reference.
-# https://github.com/ged/ruby-pg/issues/545
-# https://github.com/ged/ruby-pg/pull/547
-Patch1: rubygem-pg-1.5.4-Explicitly-retype-timespec-fields-to-int64_t.patch
-# Fix possible buffer overflows.
-# Found when upstream was investigating the following issue:
-# https://github.com/ged/ruby-pg/issues/545
-# https://github.com/ged/ruby-pg/pull/548
-Patch2: rubygem-pg-1.5.4-Fix-possible-buffer-overflows-on-32-bit-systems.patch
-# ext/pg_text_decoder.c
+# https://bitbucket.org/ged/ruby-pg/issue/183
+Patch0: rubygem-pg-0.17.1-remove-rpath.patch
+# Required in ext/pg_text_decoder.c
 Requires: rubygem(bigdecimal)
-# lib/pg/text_{de,en}coder.rb
-Requires: rubygem(json)
 BuildRequires: ruby(release)
 BuildRequires: rubygems-devel
 BuildRequires: ruby-devel
@@ -44,7 +31,7 @@ BuildRequires: rubygem(rspec)
 
 %description
 This is the extension library to access a PostgreSQL database from Ruby.
-This library works with PostgreSQL 9.3 and later.
+This library works with PostgreSQL 9.1 and later.
 
 
 %package doc
@@ -56,11 +43,9 @@ BuildArch: noarch
 Documentation for %{name}.
 
 %prep
-%setup -q -n %{gem_name}-%{version} -b 1
+%setup -q -n %{gem_name}-%{version}
 
-%patch 0 -p1
-%patch 1 -p1
-%patch 2 -p1
+%patch0 -p1
 
 %build
 # Create the gem as gem install only works on a gem file
@@ -81,11 +66,18 @@ cp -a .%{gem_extdir_mri}/{gem.build_complete,*.so} %{buildroot}%{gem_extdir_mri}
 # Prevent dangling symlink in -debuginfo (rhbz#878863).
 rm -rf %{buildroot}%{gem_instdir}/ext/
 
+# Remove useless shebangs.
+sed -i -e '/^#!\/usr\/bin\/env/d' %{buildroot}%{gem_instdir}/Rakefile
+sed -i -e '/^#!\/usr\/bin\/env/d' %{buildroot}%{gem_instdir}/Rakefile.cross
+
+# Files under %%{gem_libdir} are not executable.
+for file in `find %{buildroot}%{gem_libdir} -type f -name "*.rb"`; do
+    sed -i '/^#!\/usr\/bin\/env/ d' $file \
+    && chmod -v 644 $file
+done
 
 %check
 pushd .%{gem_instdir}
-ln -s %{_builddir}/spec .
-
 # Set --verbose to show detail log by $VERBOSE.
 # See https://github.com/ged/ruby-pg/blob/master/spec/helpers.rb $VERBOSE
 # Assign a random port to consider a case of multi builds in parallel in a host.
@@ -102,86 +94,34 @@ popd
 %files
 %dir %{gem_instdir}
 %{gem_extdir_mri}
-%exclude %{gem_instdir}/.*
+%exclude %{gem_instdir}/.gemtest
 %license %{gem_instdir}/BSDL
-%license %{gem_instdir}/LICENSE
 %license %{gem_instdir}/POSTGRES
+%license %{gem_instdir}/LICENSE
 %{gem_libdir}
 %exclude %{gem_cache}
 %{gem_spec}
 
 %files doc
 %doc %{gem_docdir}
+%doc %{gem_instdir}/ChangeLog
 %doc %{gem_instdir}/Contributors.rdoc
-%{gem_instdir}/Gemfile
-%doc %{gem_instdir}/History.md
+%doc %{gem_instdir}/History.rdoc
 %doc %{gem_instdir}/Manifest.txt
 %doc %{gem_instdir}/README-OS_X.rdoc
 %doc %{gem_instdir}/README-Windows.rdoc
-%lang(ja) %doc %{gem_instdir}/README.ja.md
-%doc %{gem_instdir}/README.md
+%doc %{gem_instdir}/README.ja.rdoc
+%doc %{gem_instdir}/README.rdoc
 %{gem_instdir}/Rakefile*
-%{gem_instdir}/rakelib/*
-%{gem_instdir}/certs
-%{gem_instdir}/misc
-%{gem_instdir}/pg.gemspec
-%{gem_instdir}/sample
-# The translations are only related to README and the readme is already in
-# japanese (AFAICT) when we build an RPM from the gem, so we shouldn't need
-# this directory at all.
-# https://github.com/ged/ruby-pg/pull/549
-%exclude %{gem_instdir}/translation
+%{gem_instdir}/spec
 
 %changelog
-* Tue Nov 26 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 1.5.4-4
-- Rebuilt for MSVSphere 10
-
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.5.4-4
-- Bump release for June 2024 mass rebuild
-
-* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.4-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Wed Jan 03 2024 Vít Ondruch <vondruch@redhat.com> - 1.5.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_3.3
-
-* Mon Oct 23 2023 Jarek Prokop <jprokop@redhat.com> - 1.5.4-1
-- Upgrade to pg 1.5.4.
-  Resolves: rhbz#2173399
-
-* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.5-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.5-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Tue Jan 03 2023 Vít Ondruch <vondruch@redhat.com> - 1.4.5-2
-- Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_3.2
-
-* Thu Dec 15 2022 Vít Ondruch <vondruch@redhat.com> - 1.4.5-1
-- Update to pg 1.4.5.
-  Resolves: rhbz#2099059
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.5-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Thu May 12 2022 Jarek Prokop <jprokop@redhat.com> - 1.3.5-1
-- Update to pg 1.3.5.
-  Resolves: rhbz#1814862
-
-* Thu Feb 17 2022 Pavel Valena <pvalena@redhat.com> - 1.3.2-1
-- Update to pg 1.3.2.
-  Resolves: rhbz#1814862
-
-* Fri Jan 28 2022 Vít Ondruch <vondruch@redhat.com> - 1.3.0-1
-- Update to pg 1.3.0.
-  Resolves: rhbz#1814862
-
-* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.3-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1.2.3-7
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
 
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.3-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.2.3-6
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
 
 * Mon Feb 08 2021 Pavel Raiskup <praiskup@redhat.com> - 1.2.3-5
 - rebuild for libpq ABI fix rhbz#1908268