Import rpm: c0692f8bdd7df946e8a4bacf9faa15a2985f2399

2023-02-20 02:14:00 -05:00 · 2023-02-20 02:14:00 -05:00 · feac2d5702
commit feac2d5702
5 changed files with 287 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1 @@
+SOURCES/mysql2-0.5.2.gem
--- a/rubygem-mysql2-0.4.10-mariadb-connector-c-3.0.2-fix-wrong-local-infile-on-big-endian.patch
+++ b/rubygem-mysql2-0.4.10-mariadb-connector-c-3.0.2-fix-wrong-local-infile-on-big-endian.patch
@ -0,0 +1,15 @@
+diff --git a/ext/mysql2/client.c b/ext/mysql2/client.c
+index 665147a2..482f1877 100644
+--- a/ext/mysql2/client.c
+++ b/ext/mysql2/client.c
+@@ -872,8 +872,8 @@ static VALUE _mysql_client_options(VALUE self, int opt, VALUE value) {
+       break;
+ 
+     case MYSQL_OPT_LOCAL_INFILE:
+-      intval = (value == Qfalse ? 0 : 1);
+-      retval = &intval;
+      boolval = (value == Qfalse ? 0 : 1);
+      retval = &boolval;
+       break;
+ 
+     case MYSQL_OPT_RECONNECT:
--- a/rubygem-mysql2-0.5.3-fix-assertion-mariadb-connector-c.patch
+++ b/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
--- a/rubygem-mysql2.spec
+++ b/rubygem-mysql2.spec
@ -0,0 +1,248 @@
+# 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.2
+Release: 1%{?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
+# Fix a client option local_infile not enabled
+# with mariadb-connector-c 3.0.2 on big endian environment.
+# Temporary patch until mariadb-connector-c version 3.0.3 released.
+# https://github.com/brianmario/mysql2/pull/914
+# https://github.com/MariaDB/mariadb-connector-c/commit/434b67e
+Patch0: rubygem-mysql2-0.4.10-mariadb-connector-c-3.0.2-fix-wrong-local-infile-on-big-endian.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
+gem unpack %{SOURCE0}
+
+%setup -q -D -T -n  %{gem_name}-%{version}
+
+%patch0 -p1
+
+gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
+
+%build
+# Create the gem as gem install only works on a gem file
+gem build %{gem_name}.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}
+cp -a .%{gem_extdir_mri}/* %{buildroot}%{gem_extdir_mri}/
+
+# Prevent dangling symlink in -debuginfo.
+rm -rf %{buildroot}%{gem_instdir}/ext
+
+
+%if %{with tests}
+%check
+pushd .%{gem_instdir}
+
+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 <<EOF > 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
+%{gem_instdir}/examples
+%{gem_instdir}/spec
+
+
+%changelog
+* 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
+
+* Sat Jan 20 2018 Björn Esser <besser82@fedoraproject.org> - 0.4.10-3
+- Rebuilt for switch to libxcrypt
+
+* Thu Jan 04 2018 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.4.10-2
+- F-28: rebuild for ruby25
+
+* Thu Nov 23 2017 Jun Aruga <jaruga@redhat.com> - 0.4.10-1
+- New upstream release 0.4.10
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.8-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Thu Jul 13 2017 Adam Williamson <awilliam@redhat.com> - 0.4.8-1
+- New upstream release 0.4.8 (builds against MariaDB 10.2)
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Wed Jan 11 2017 Vít Ondruch <vondruch@redhat.com> - 0.4.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.4
+
+* Thu Jun 09 2016 Miroslav Suchý <msuchy@redhat.com> - 0.4.4-1
+- New upstream release 0.4.4
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Mon Jan 11 2016 Vít Ondruch <vondruch@redhat.com> - 0.4.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.3
+
+* Tue Sep  8 2015 Miroslav Suchý <msuchy@redhat.com> 0.4.0-1
+- rebase to mysql2-0.4.0
+
+* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.16-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Fri Jan 16 2015 Vít Ondruch <vondruch@redhat.com> - 0.3.16-4
+- Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.2
+
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.16-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.16-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Mon May 26 2014 Miroslav Suchý <msuchy@redhat.com> 0.3.16-1
+- rebase to mysql2-0.3.16
+
+* Tue Apr 15 2014 Vít Ondruch <vondruch@redhat.com> - 0.3.15-3
+- Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.1
+
+* Tue Feb 11 2014 Miroslav Suchý <msuchy@redhat.com> 0.3.15-2
+- rebase to mysql2-0.3.15
+
+* Wed Sep 11 2013 Alexander Chernyakhovsky <achernya@mit.edu> - 0.3.13-1
+- Initial package
--- a/1
+++ b/1
@ -0,0 +1 @@
+SHA1 (mysql2-0.5.2.gem) = d6967bc3a34d2dfc683047aee33f8c050ca10722
				`@ -0,0 +1 @@`
				`SHA1 (mysql2-0.5.2.gem) = d6967bc3a34d2dfc683047aee33f8c050ca10722`