commit 7dce6c0006631d899b7b9b5836bf2aa321a24603 Author: CentOS Sources Date: Tue Nov 8 01:50:27 2022 -0500 import rubygem-mysql2-0.5.3-2.module+el8.7.0+15051+29b42f0c diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9ed7b6d --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +SOURCES/mysql2-0.5.3-tests.txz +SOURCES/mysql2-0.5.3.gem diff --git a/.rubygem-mysql2.metadata b/.rubygem-mysql2.metadata new file mode 100644 index 0000000..7dec311 --- /dev/null +++ b/.rubygem-mysql2.metadata @@ -0,0 +1,2 @@ +efae18a40b17065bff7f04732e8165d64393531c SOURCES/mysql2-0.5.3-tests.txz +75e6935c4d9a2b1c047d9e9b69c4c6d4c7e0faef SOURCES/mysql2-0.5.3.gem diff --git a/SOURCES/rubygem-mysql2-0.5.3-fix-assertion-mariadb-connector-c.patch b/SOURCES/rubygem-mysql2-0.5.3-fix-assertion-mariadb-connector-c.patch new file mode 100644 index 0000000..7707d01 --- /dev/null +++ b/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 +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 diff --git a/SOURCES/rubygem-mysql2-0.5.3-update-Mysql2_Result-spec.patch b/SOURCES/rubygem-mysql2-0.5.3-update-Mysql2_Result-spec.patch new file mode 100644 index 0000000..594a146 --- /dev/null +++ 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 +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 diff --git a/SPECS/rubygem-mysql2.spec b/SPECS/rubygem-mysql2.spec new file mode 100644 index 0000000..eab5e7b --- /dev/null +++ b/SPECS/rubygem-mysql2.spec @@ -0,0 +1,265 @@ +# build 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.3 +Release: 2%{?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.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 + +# Required in lib/mysql2.rb +Requires: rubygem(bigdecimal) +BuildRequires: ruby(release) +BuildRequires: rubygems-devel +BuildRequires: ruby-devel +BuildRequires: gcc +BuildRequires: mariadb-connector-c-devel +%if %{with tests} +BuildRequires: mariadb-server +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) +%endif + +%description +The Mysql2 gem is meant to serve the extremely common use-case of +connecting, querying and iterating on results. Some database libraries +out there serve as direct 1:1 mappings of the already complex C API\'s +available. This one is not. + + +%package doc +Summary: Documentation for %{name} +Requires: %{name} = %{version}-%{release} +BuildArch: noarch + +%description doc +Documentation for %{name} + +%prep +%setup -q -n %{gem_name}-%{version} -b 1 + +pushd %{_builddir}/spec +%patch1 -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 + + +%install +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} + +# Prevent dangling symlink in -debuginfo. +rm -rf %{buildroot}%{gem_instdir}/ext + + +%if %{with tests} +%check +pushd .%{gem_instdir} +# Move the tests into place +ln -s %{_builddir}/spec spec + +TOP_DIR=$(pwd) +# 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 +MYSQL_TEST_PORT="$((13306 + ${RANDOM} % 1000))" +MYSQL_TEST_USER=$(id -un) +MYSQL_TEST_DATA_DIR="${TOP_DIR}/data" +MYSQL_TEST_SOCKET="${TOP_DIR}/mysql.sock" +MYSQL_TEST_LOG="${TOP_DIR}/mysql.log" +MYSQL_TEST_PID_FILE="${TOP_DIR}/mysql.pid" + +mkdir "${MYSQL_TEST_DATA_DIR}" +mysql_install_db \ + --datadir="${MYSQL_TEST_DATA_DIR}" \ + --log-error="${MYSQL_TEST_LOG}" + +%{_libexecdir}/mysqld \ + --datadir="${MYSQL_TEST_DATA_DIR}" \ + --log-error="${MYSQL_TEST_LOG}" \ + --socket="${MYSQL_TEST_SOCKET}" \ + --pid-file="${MYSQL_TEST_PID_FILE}" \ + --port="${MYSQL_TEST_PORT}" \ + --ssl & + +for i in $(seq 10); do + sleep 1 + if grep -q 'ready for connections.' "${MYSQL_TEST_LOG}"; then + break + fi + echo "Waiting connections... ${i}" +done + +# 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}" \ + -P "${MYSQL_TEST_PORT}" + +# See https://github.com/brianmario/mysql2/blob/master/tasks/rspec.rake +cat < spec/configuration.yml +root: + host: localhost + username: root + password: + database: test + port: ${MYSQL_TEST_PORT} + socket: ${MYSQL_TEST_SOCKET} + +user: + host: localhost + username: ${MYSQL_TEST_USER} + password: + database: mysql2_test + port: ${MYSQL_TEST_PORT} + 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 + +rspec -Ilib:%{buildroot}%{gem_extdir_mri} -f d spec +popd + +# Clean up +kill "$(cat "${MYSQL_TEST_PID_FILE}")" + +%endif + +%files +%dir %{gem_instdir} +%{gem_libdir} +%{gem_extdir_mri} +%exclude %{gem_cache} +%{gem_spec} +%exclude %{gem_instdir}/support +%license %{gem_instdir}/LICENSE + +%files doc +%doc %{gem_docdir} +%doc %{gem_instdir}/README.md +%doc %{gem_instdir}/CHANGELOG.md + + +%changelog +* Fri Apr 22 2022 Jarek Prokop 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 - 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 - 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 - 0.4.10-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Sat Jan 20 2018 Björn Esser - 0.4.10-3 +- Rebuilt for switch to libxcrypt + +* Thu Jan 04 2018 Mamoru TASAKA - 0.4.10-2 +- F-28: rebuild for ruby25 + +* Thu Nov 23 2017 Jun Aruga - 0.4.10-1 +- New upstream release 0.4.10 + +* Thu Aug 03 2017 Fedora Release Engineering - 0.4.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 0.4.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Thu Jul 13 2017 Adam Williamson - 0.4.8-1 +- New upstream release 0.4.8 (builds against MariaDB 10.2) + +* Sat Feb 11 2017 Fedora Release Engineering - 0.4.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Jan 11 2017 Vít Ondruch - 0.4.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.4 + +* Thu Jun 09 2016 Miroslav Suchý - 0.4.4-1 +- New upstream release 0.4.4 + +* Thu Feb 04 2016 Fedora Release Engineering - 0.4.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Mon Jan 11 2016 Vít Ondruch - 0.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.3 + +* Tue Sep 8 2015 Miroslav Suchý 0.4.0-1 +- rebase to mysql2-0.4.0 + +* Thu Jun 18 2015 Fedora Release Engineering - 0.3.16-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Fri Jan 16 2015 Vít Ondruch - 0.3.16-4 +- Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.2 + +* Mon Aug 18 2014 Fedora Release Engineering - 0.3.16-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sun Jun 08 2014 Fedora Release Engineering - 0.3.16-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Mon May 26 2014 Miroslav Suchý 0.3.16-1 +- rebase to mysql2-0.3.16 + +* Tue Apr 15 2014 Vít Ondruch - 0.3.15-3 +- Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.1 + +* Tue Feb 11 2014 Miroslav Suchý 0.3.15-2 +- rebase to mysql2-0.3.15 + +* Wed Sep 11 2013 Alexander Chernyakhovsky - 0.3.13-1 +- Initial package