SOURCES/rubygem-mysql2-0.5.3-fix-assertion-mariadb-connector-c.patch

@@ -1,22 +0,0 @@
-From cca57b97ad6d1b1b985376be110b89d2b487dea6 Mon Sep 17 00:00:00 2001
-From: Aaron Patterson <tenderlove@ruby-lang.org>
-Date: Tue, 30 Nov 2021 12:59:43 -0800
-Subject: [PATCH] fix assertion on maria
-
-downgrade psych
----
- spec/mysql2/client_spec.rb | 2 +-
-
-diff --git a/spec/mysql2/client_spec.rb b/spec/mysql2/client_spec.rb
-index 1519e0f5d..41fb834bf 100644
---- a/spec/mysql2/client_spec.rb
-+++ b/spec/mysql2/client_spec.rb
-@@ -573,7 +573,7 @@ def run_gc
-       end
-       expect do
-         @client.query("SELECT SLEEP(1)")
--      end.to raise_error(Mysql2::Error, /Lost connection to MySQL server/)
-+      end.to raise_error(Mysql2::Error, /Lost connection/)
- 
-       if RUBY_PLATFORM !~ /mingw|mswin/
-         expect do

SOURCES/rubygem-mysql2-0.5.3-update-Mysql2_Result-spec.patch

@@ -1,38 +0,0 @@
-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

SOURCES/rubygem-mysql2-0.5.4-use-ssl-pem-files-in-repo.patch

@@ -1,33 +0,0 @@
-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
-

SPECS/rubygem-mysql2.spec

@@ -6,7 +6,7 @@
 
 Name: rubygem-%{gem_name}
 Version: 0.5.3
-Release: 3%{?dist}
+Release: 1%{?dist}
 Summary: A simple, fast Mysql library for Ruby, binding to libmysql
 License: MIT
 URL: https://github.com/brianmario/mysql2
@@ -14,18 +14,6 @@ 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)
@@ -44,8 +32,6 @@ BuildRequires: rubygem(bigdecimal)
 # 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
@@ -66,11 +52,6 @@ Documentation for %{name}
 %prep
 %setup -q -n %{gem_name}-%{version} -b 1
 
-pushd %{_builddir}/spec
-%patch1 -p2
-%patch2 -p2
-%patch3 -p2
-popd
 
 %build
 # Create the gem as gem install only works on a gem file
@@ -86,9 +67,8 @@ mkdir -p %{buildroot}%{gem_dir}
 cp -pa .%{gem_dir}/* \
         %{buildroot}%{gem_dir}/
 
-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}
+mkdir -p %{buildroot}%{gem_extdir_mri}
+cp -a .%{gem_extdir_mri}/* %{buildroot}%{gem_extdir_mri}/
 
 # Prevent dangling symlink in -debuginfo.
 rm -rf %{buildroot}%{gem_instdir}/ext
@@ -101,24 +81,6 @@ 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
@@ -142,22 +104,15 @@ 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
-    conn_found=true
+  if grep -q 'ready for connections.' "${MYSQL_TEST_LOG}"; then
     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/ci/setup.sh
+# See https://github.com/brianmario/mysql2/blob/master/.travis_setup.sh
 mysql -u root \
   -e 'CREATE DATABASE /*M!50701 IF NOT EXISTS */ test' \
   -S "${MYSQL_TEST_SOCKET}" \
@@ -182,6 +137,10 @@ 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/^/#/' \
@@ -213,17 +172,6 @@ kill "$(cat "${MYSQL_TEST_PID_FILE}")"
 
 
 %changelog
-* 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