.gitignore

@@ -1,2 +1,2 @@
-SOURCES/mysql2-0.5.5-tests.txz
+SOURCES/mysql2-0.5.3-tests.txz
-SOURCES/mysql2-0.5.5.gem
+SOURCES/mysql2-0.5.3.gem

.rubygem-mysql2.metadata

@@ -1,2 +1,2 @@
-e1f5106dda376545c654f64f0ea7b8609f03a220 SOURCES/mysql2-0.5.5-tests.txz
+efae18a40b17065bff7f04732e8165d64393531c SOURCES/mysql2-0.5.3-tests.txz
-40bb98b39e2d8f3521c6a4350a66a3c0ac9e2dd9 SOURCES/mysql2-0.5.5.gem
+75e6935c4d9a2b1c047d9e9b69c4c6d4c7e0faef SOURCES/mysql2-0.5.3.gem

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

@@ -0,0 +1,22 @@
+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.4-use-ssl-pem-files-in-repo.patch

@@ -1,29 +0,0 @@
-From 06512d47dc1491bf5686b2bd89a8555de9f2acc9 Mon Sep 17 00:00:00 2001
-From: Jun Aruga <jaruga@redhat.com>
-Date: Thu, 22 Dec 2022 16:14:39 +0100
-Subject: [PATCH] Use the SSL pem files in the Git repository.
-
----
- 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 5861882..3f5cda8 100644
---- a/spec/mysql2/client_spec.rb
-+++ b/spec/mysql2/client_spec.rb
-@@ -154,9 +154,9 @@ RSpec.describe Mysql2::Client do # rubocop:disable Metrics/BlockLength
-     let(:option_overrides) do
-       {
-         '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.38.1
-

SPECS/rubygem-mysql2.spec

@@ -1,22 +1,22 @@
 # build with tests?
-%bcond_with tests
+%bcond_without tests
 
 # Generated from mysql2-0.3.11.gem by gem2rpm -*- rpm-spec -*-
 %global gem_name mysql2
 
 Name: rubygem-%{gem_name}
-Version: 0.5.5
+Version: 0.5.3
-Release: 1%{?dist}
+Release: 11%{?dist}
 Summary: A simple, fast Mysql library for Ruby, binding to libmysql
 License: MIT
 URL: https://github.com/brianmario/mysql2
 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.5-tests.txz 0.5.5 spec/
+# cd mysql2 && git archive -v -o mysql2-0.5.3-tests.txz 0.5.3 spec/
 Source1: %{gem_name}-%{version}-tests.txz
-# Use the SSL pem files in the upstream repositry for the SSL tests.
+# Fix test assertion for mariadb-connector-c
-# https://github.com/brianmario/mysql2/pull/1293
+# https://github.com/brianmario/mysql2/commit/cca57b97ad6d1b1b985376be110b89d2b487dea6
-Patch0: rubygem-mysql2-0.5.4-use-ssl-pem-files-in-repo.patch
+Patch2: rubygem-mysql2-0.5.3-fix-assertion-mariadb-connector-c.patch
 
 # Required in lib/mysql2.rb
 Requires: rubygem(bigdecimal)
@@ -31,12 +31,6 @@ 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 unsatisfiable dependencies.
-# No matching package to install: 'rubygem(eventmachine)'
-#BuildRequires: rubygem(eventmachine)
-# Used in spec/ssl/gen_certs.sh
-BuildRequires: %{_bindir}/openssl
 %endif
 
 %description
@@ -58,11 +52,15 @@ Documentation for %{name}
 %setup -q -n %{gem_name}-%{version} -b 1
 
 pushd %{_builddir}/spec
-%patch -P 0 -p2
+%patch2 -p2
 popd
 
 %build
+# Create the gem as gem install only works on a gem file
 gem build ../%{gem_name}-%{version}.gemspec
+
+# %%gem_install compiles any C extensions and installs the gem into ./%%gem_dir
+# by default, so that we can move it into the buildroot in %%install
 %gem_install
 
 
@@ -71,9 +69,8 @@ mkdir -p %{buildroot}%{gem_dir}
 cp -pa .%{gem_dir}/* \
         %{buildroot}%{gem_dir}/
 
-mkdir -p %{buildroot}%{gem_extdir_mri}/%{gem_name}
+mkdir -p %{buildroot}%{gem_extdir_mri}
-cp -a .%{gem_extdir_mri}/gem.build_complete %{buildroot}%{gem_extdir_mri}/
+cp -a .%{gem_extdir_mri}/* %{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
@@ -86,24 +83,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
@@ -127,30 +106,16 @@ 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
 
-# Reset password for the root user due to MariaDB 10.4 authentication change.
+# See https://github.com/brianmario/mysql2/blob/master/.travis_setup.sh
-# See https://mariadb.com/kb/en/authentication-from-mariadb-104/#altering-the-user-account-to-revert-to-the-previous-authentication-method
+mysql -u $MYSQL_TEST_USER \
-mysql -u ${MYSQL_TEST_USER} \
-  -e "ALTER USER 'root'@'localhost' IDENTIFIED VIA mysql_native_password USING PASSWORD('')" \
-  -S "${MYSQL_TEST_SOCKET}" \
-  -P "${MYSQL_TEST_PORT}"
-
-# 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}"
@@ -159,7 +124,7 @@ mysql -u root \
 cat <<EOF > spec/configuration.yml
 root:
   host: localhost
-  username: root
+  username: ${MYSQL_TEST_USER}
   password:
   database: test
   port: ${MYSQL_TEST_PORT}
@@ -174,6 +139,27 @@ 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/^/#/' \
+  spec/mysql2/client_spec.rb
+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
 
@@ -198,24 +184,60 @@ kill "$(cat "${MYSQL_TEST_PID_FILE}")"
 
 
 %changelog
-* Tue Apr 02 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 0.5.5-1
+* Thu Feb 17 2022 Pavel Valena <pvalena@redhat.com> - 0.5.3-11
-- Rebuilt for MSVSphere 9.4 beta
+- 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
 
-* Fri Jan 19 2024 Jarek Prokop <jprokop@redhat.com> - 0.5.5-1
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.2-3
-- Upgrade to mysql2 0.5.5.
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-  Related: RHEL-17089
 
-* Mon May 23 2022 Jarek Prokop <jprokop@redhat.com> - 0.5.4-1
+* Mon Jan 21 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.5.2-2
-- New upstream release 0.5.4 by merging Fedora rawhide branch (commit: e21b5b9)
+- F-30: rebuild against ruby26
-  Resolves: rhbz#2063773
 
-* Fri May 29 2020 Jun Aruga <jaruga@redhat.com> - 0.5.3-1
+* Thu Jul 19 2018 Jun Aruga <jaruga@redhat.com> - 0.5.2-1
-- New upstream release 0.5.3 by merging Fedora master branch (commit: 674d475)
+- New upstream release 0.5.2
-  Resolves: rhbz#1817135
 
-* Tue Jun 11 2019 Jun Aruga <jaruga@redhat.com> - 0.5.2-1
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.10-5
-- New upstream release 0.5.2 by merging Fedora master branch (commit: cc15309)
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-  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