3 changed files with 141 additions and 77 deletions
--- a/SOURCES/rubygem-mysql2-0.5.3-update-Mysql2_Result-spec.patch
+++ b/SOURCES/rubygem-mysql2-0.5.3-update-Mysql2_Result-spec.patch
@ -0,0 +1,38 @@
+From 4dce466f3ff1c90099d3dc1bf610bfab840d3631 Mon Sep 17 00:00:00 2001
+From: Jean Boussier <jean.boussier@gmail.com>
+Date: Fri, 26 Nov 2021 13:17:05 +0100
+Subject: [PATCH] Update Mysql2::Result spec for Ruby 3.1
+
+Ruby 3.1 immediately raise a TypeError if you try to
+instantiate a class that doesn't have an allocator,
+which is what we want anyways.
+---
+ spec/mysql2/result_spec.rb | 17 +++++++++++------
+ 1 file changed, 11 insertions(+), 6 deletions(-)
+
+diff --git a/spec/mysql2/result_spec.rb b/spec/mysql2/result_spec.rb
+index 47a4a6de..2af6e609 100644
+--- a/spec/mysql2/result_spec.rb
+++ b/spec/mysql2/result_spec.rb
+@@ -6,11 +6,16 @@
+   end
+ 
+   it "should raise a TypeError exception when it doesn't wrap a result set" do
+-    r = Mysql2::Result.new
+-    expect { r.count }.to raise_error(TypeError)
+-    expect { r.fields }.to raise_error(TypeError)
+-    expect { r.size }.to raise_error(TypeError)
+-    expect { r.each }.to raise_error(TypeError)
+    if RUBY_VERSION >= "3.1"
+      expect { Mysql2::Result.new }.to raise_error(TypeError)
+      expect { Mysql2::Result.allocate }.to raise_error(TypeError)
+    else
+      r = Mysql2::Result.new
+      expect { r.count }.to raise_error(TypeError)
+      expect { r.fields }.to raise_error(TypeError)
+      expect { r.size }.to raise_error(TypeError)
+      expect { r.each }.to raise_error(TypeError)
+    end
+   end
+ 
+   it "should have included Enumerable" do
--- a/SOURCES/rubygem-mysql2-0.5.4-use-ssl-pem-files-in-repo.patch
+++ b/SOURCES/rubygem-mysql2-0.5.4-use-ssl-pem-files-in-repo.patch
@ -0,0 +1,33 @@
+From 15607011344b4f38306befeeebae2fa906dc4860 Mon Sep 17 00:00:00 2001
+From: Jarek Prokop <jprokop@redhat.com>
+Date: Fri, 8 Mar 2024 12:36:46 +0100
+Subject: [PATCH] Backport "Use the SSL pem files in the Git repository." to
+ 0.5.3.
+
+Backport patch from Fedora
+<https://src.fedoraproject.org/rpms/rubygem-mysql2/c/c33b1cff596b301b49c76f4307ab87390c681f30>
+to resolve failing to start mariadb with SSL.
+---
+ spec/mysql2/client_spec.rb | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/spec/mysql2/client_spec.rb b/spec/mysql2/client_spec.rb
+index 5a3b8a2..f2f7bec 100644
+--- a/spec/mysql2/client_spec.rb
+++ b/spec/mysql2/client_spec.rb
+@@ -137,9 +137,9 @@ RSpec.describe Mysql2::Client do
+     ssl_client = nil
+     option_overrides = {
+       'host'     => 'mysql2gem.example.com', # must match the certificates
+-      :sslkey    => '/etc/mysql/client-key.pem',
+-      :sslcert   => '/etc/mysql/client-cert.pem',
+-      :sslca     => '/etc/mysql/ca-cert.pem',
+      :sslkey    => 'spec/ssl/client-key.pem',
+      :sslcert   => 'spec/ssl/client-cert.pem',
+      :sslca     => 'spec/ssl/ca-cert.pem',
+       :sslcipher => 'DHE-RSA-AES256-SHA',
+       :sslverify => true,
+     }
+-- 
+2.43.0
+
--- a/SPECS/rubygem-mysql2.spec
+++ b/SPECS/rubygem-mysql2.spec
@ -6,7 +6,7 @@

 Name: rubygem-%{gem_name}
 Version: 0.5.3
-Release: 11%{?dist}
+Release: 3%{?dist}
 Summary: A simple, fast Mysql library for Ruby, binding to libmysql
 License: MIT
 URL: https://github.com/brianmario/mysql2
@ -14,9 +14,18 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
 # git clone --no-checkout https://github.com/brianmario/mysql2.git
 # cd mysql2 && git archive -v -o mysql2-0.5.3-tests.txz 0.5.3 spec/
 Source1: %{gem_name}-%{version}-tests.txz
+# Ruby 3.1 immediately raises a TypeError if you try to instantiate a class
+# that doesn't have an allocator, which is desired behaviour anyways.
+# https://github.com/brianmario/mysql2/pull/1219
+# https://github.com/brianmario/mysql2/commit/62003225f3b25c36c221f01f7905658848895410
+# Modified to allow patch application.
+Patch1:  rubygem-mysql2-0.5.3-update-Mysql2_Result-spec.patch
 # Fix test assertion for mariadb-connector-c
 # https://github.com/brianmario/mysql2/commit/cca57b97ad6d1b1b985376be110b89d2b487dea6
 Patch2: rubygem-mysql2-0.5.3-fix-assertion-mariadb-connector-c.patch
+# Use the SSL pem files in the upstream repositry for the SSL tests.
+# https://github.com/brianmario/mysql2/pull/1293
+Patch3: rubygem-mysql2-0.5.4-use-ssl-pem-files-in-repo.patch

 # Required in lib/mysql2.rb
 Requires: rubygem(bigdecimal)
@ -31,6 +40,12 @@ BuildRequires: rubygem(rspec)
 # Used in mysql_install_db
 BuildRequires: %{_bindir}/hostname
 BuildRequires: rubygem(bigdecimal)
+# Used in spec/em/em_spec.rb
+# Comment out to prevent a build error by conflicting requests.
+# Nothing provides libruby.so.2.4()(64bit) needed by rubygem-eventmachine.
+#BuildRequires: rubygem(eventmachine)
+# Used in spec/ssl/gen_certs.sh
+BuildRequires: %{_bindir}/openssl
 %endif

 %description
@ -52,7 +67,9 @@ Documentation for %{name}
 %setup -q -n %{gem_name}-%{version} -b 1

 pushd %{_builddir}/spec
+%patch1 -p2
 %patch2 -p2
+%patch3 -p2
 popd

 %build
@ -69,8 +86,9 @@ mkdir -p %{buildroot}%{gem_dir}
 cp -pa .%{gem_dir}/* \
        %{buildroot}%{gem_dir}/

-mkdir -p %{buildroot}%{gem_extdir_mri}
-cp -a .%{gem_extdir_mri}/* %{buildroot}%{gem_extdir_mri}/
+mkdir -p %{buildroot}%{gem_extdir_mri}/%{gem_name}
+cp -a .%{gem_extdir_mri}/gem.build_complete %{buildroot}%{gem_extdir_mri}/
+cp -a .%{gem_extdir_mri}/%{gem_name}/*.so %{buildroot}%{gem_extdir_mri}/%{gem_name}

 # Prevent dangling symlink in -debuginfo.
 rm -rf %{buildroot}%{gem_instdir}/ext
@ -83,6 +101,24 @@ pushd .%{gem_instdir}
 ln -s %{_builddir}/spec spec

 TOP_DIR=$(pwd)
+
+# Regenerate the SSL certification files from the localhost, as we cannot set
+# the host mysql2gem.example.com required for the SSL tests.
+# https://github.com/brianmario/mysql2/pull/1296
+sed -i '/host/ s/mysql2gem\.example\.com/localhost/' spec/mysql2/client_spec.rb
+sed -i '/commonName_default/ s/mysql2gem\.example\.com/localhost/' spec/ssl/gen_certs.sh
+pushd spec/ssl
+bash gen_certs.sh
+popd
+
+# See https://github.com/brianmario/mysql2/blob/master/ci/ssl.sh
+echo "
+[mysqld]
+ssl-ca=${TOP_DIR}/spec/ssl/ca-cert.pem
+ssl-cert=${TOP_DIR}/spec/ssl/server-cert.pem
+ssl-key=${TOP_DIR}/spec/ssl/server-key.pem
+" > ~/.my.cnf
+
 # Use testing port because the standard mysqld port 3306 is occupied.
 # Assign a random port to consider a case of multi builds in parallel in a host.
 # https://src.fedoraproject.org/rpms/rubygem-pg/pull-request/3
@ -106,16 +142,23 @@ mysql_install_db \
  --port="${MYSQL_TEST_PORT}" \
  --ssl &

+conn_found=false
 for i in $(seq 10); do
+  echo "Waiting for the DB server to accept connections... ${i}"
  sleep 1
-  if grep -q 'ready for connections.' "${MYSQL_TEST_LOG}"; then
+  if grep -q 'ready for connections' "${MYSQL_TEST_LOG}"; then
+    conn_found=true
    break
  fi
-  echo "Waiting connections... ${i}"
 done
+if ! "${conn_found}"; then
+  echo "ERROR: Failed to connect the DB server."
+  cat "${MYSQL_TEST_LOG}"
+  exit 1
+fi

-# See https://github.com/brianmario/mysql2/blob/master/.travis_setup.sh
-mysql -u $MYSQL_TEST_USER \
+# See https://github.com/brianmario/mysql2/blob/master/ci/setup.sh
+mysql -u root \
  -e 'CREATE DATABASE /*M!50701 IF NOT EXISTS */ test' \
  -S "${MYSQL_TEST_SOCKET}" \
  -P "${MYSQL_TEST_PORT}"
@ -124,7 +167,7 @@ mysql -u $MYSQL_TEST_USER \
 cat <<EOF > spec/configuration.yml
 root:
  host: localhost
-  username: ${MYSQL_TEST_USER}
+  username: root
  password:
  database: test
  port: ${MYSQL_TEST_PORT}
@ -139,10 +182,6 @@ user:
  socket: ${MYSQL_TEST_SOCKET}
 EOF

-# This test would require changes in host configuration.
-sed -i '/^  it "should be able to connect via SSL options" do$/,/^  end$/ s/^/#/' \
-  spec/mysql2/client_spec.rb
-
 # performance_schema.session_account_connect_attrs is unexpectedly empty.
 # https://github.com/brianmario/mysql2/issues/965
 sed -i '/^  it "should set default program_name in connect_attrs" do$/,/^  end$/ s/^/#/' \
@ -150,16 +189,6 @@ sed -i '/^  it "should set default program_name in connect_attrs" do$/,/^  end$/
 sed -i '/^  it "should set custom connect_attrs" do$/,/^  end$/ s/^/#/' \
  spec/mysql2/client_spec.rb

-# This test was passing when going through `rescue` branch up to MariaDB 10.4.
-# It fails since MariaDB 10.5.2 instroduced Performance Schema.
-# https://github.com/brianmario/mysql2/issues/1152
-sed -i '/stmt_count/a\\    pending "Does not work with MariaDB"' \
-  spec/mysql2/statement_spec.rb
-
-# Since MariaDB 10.5. the return error message contains mangled input.
-# https://github.com/brianmario/mysql2/issues/1152
-sed -i '/expect(bad_err.message).to include/ s/^/#/' spec/mysql2/error_spec.rb
-
 rspec -Ilib:%{buildroot}%{gem_extdir_mri} -f d spec
 popd

@ -184,60 +213,24 @@ kill "$(cat "${MYSQL_TEST_PID_FILE}")"


 %changelog
-* Thu Feb 17 2022 Pavel Valena <pvalena@redhat.com> - 0.5.3-11
- Fix test assertion for mariadb-connector-c
-
-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 0.5.3-10
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Fri Jul 16 2021 Pavel Valena <pvalena@redhat.com> - 0.5.3-9
- Fix FTBFS: remove rubygem-eventmachine dependnecy
-  Resolves: rhbz#1982404
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.5.3-8
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Thu Feb 11 2021 Vít Ondruch <vondruch@redhat.com> - 0.5.3-7
- Fix FTBFS due to MariaDB 10.5+ incompatibilies.
-  Resolves: rhbz#1914515
-  Resolves: rhbz#1923277
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.3-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Thu Jan  7 03:21:32 CET 2021 Pavel Valena <pvalena@redhat.com> - 0.5.3-6
- Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_3.0
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.3-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Thu Jul  2 2020 Alex Chernyakhovsky <achernya@mit.edu> - 0.5.3-4
- Update tests to build and run on F32
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Fri Jan 17 2020 Vít Ondruch <vondruch@redhat.com> - 0.5.3-2
- Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.7
-
-* Mon Dec 02 2019 Jun Aruga <jaruga@redhat.com> - 0.5.3-1
- New upstream release 0.5.3
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Mon Jan 21 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.5.2-2
- F-30: rebuild against ruby26
-
-* Thu Jul 19 2018 Jun Aruga <jaruga@redhat.com> - 0.5.2-1
- New upstream release 0.5.2
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.10-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+* Fri Mar 08 2024 Jarek Prokop <jprokop@redhat.com> - 0.5.3-3
+- Fix SSL related test failure by backporting Fedora commit <c33b1cf>.
+  Related: RHEL-5584
+
+* Fri Apr 22 2022 Jarek Prokop <jprokop@redhat.com> 0.5.3-2
+- Update by merging Fedora rawhide branch (commit: 81e2cc9)
+- Fix Mysql2::Result test for Ruby 3.1.
+- Remove gem_make.out and mkmf.log files from the binary RPM package.
+- Fix test assertion for mariadb-connector-c.
+  Related: rhbz#2063772
+
+* Fri May 29 2020 Jun Aruga <jaruga@redhat.com> - 0.5.3-1
+- New upstream release 0.5.3 by merging Fedora master branch (commit: 674d475)
+  Resolves: rhbz#1817135
+
+* Tue Jun 11 2019 Jun Aruga <jaruga@redhat.com> - 0.5.2-1
+- New upstream release 0.5.2 by merging Fedora master branch (commit: cc15309)
+  Resolves: rhbz#1672575

 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.10-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild