Package: release.debian.org
Severity: normal
Tags: buster
User: release.debian....@packages.debian.org
Usertags: pu
X-Debbugs-Cc: Debian Ruby Team
<pkg-ruby-extras-maintain...@lists.alioth.debian.org>
* d/start_mysqld_and_run.sh: allow LOAD DATA LOCAL INFILE
* Add patch to make mysql2 client allow local_infile
(Closes: #988028)
Test-only FTBFS fix (the local_infile changes are not in files that
end up in the binary package).
Additionally, there are some harmless Standards-Version/salsa-ci.yml
packaging changes.
diff -Nru ruby-riddle-2.3.1/debian/changelog ruby-riddle-2.3.1/debian/changelog
--- ruby-riddle-2.3.1/debian/changelog 2019-01-18 14:26:07.000000000 +0200
+++ ruby-riddle-2.3.1/debian/changelog 2022-08-26 20:27:26.000000000 +0300
@@ -1,3 +1,24 @@
+ruby-riddle (2.3.1-2~deb10u1) buster; urgency=medium
+
+ * Non-maintainer upload.
+ * Rebuild for buster. (Closes: #988028)
+
+ -- Adrian Bunk <b...@debian.org> Fri, 26 Aug 2022 20:27:26 +0300
+
+ruby-riddle (2.3.1-2) unstable; urgency=medium
+
+ * Team upload.
+
+ [ Utkarsh Gupta ]
+ * Add salsa-ci.yml
+
+ [ Lucas Kanashiro ]
+ * d/start_mysqld_and_run.sh: allow LOAD DATA LOCAL INFILE
+ * Add patch to make mysql2 client allow local_infile
+ * Declare compliance with Debian Policy 4.4.1
+
+ -- Lucas Kanashiro <lucas.kanash...@canonical.com> Thu, 05 Dec 2019 09:04:01
-0300
+
ruby-riddle (2.3.1-1) unstable; urgency=medium
* Team upload.
diff -Nru ruby-riddle-2.3.1/debian/control ruby-riddle-2.3.1/debian/control
--- ruby-riddle-2.3.1/debian/control 2019-01-18 14:26:07.000000000 +0200
+++ ruby-riddle-2.3.1/debian/control 2019-12-05 14:04:01.000000000 +0200
@@ -12,7 +12,7 @@
ruby-mysql2,
ruby-rspec,
sphinxsearch
-Standards-Version: 4.3.0
+Standards-Version: 4.4.1
Vcs-Git: https://salsa.debian.org/ruby-team/ruby-riddle.git
Vcs-Browser: https://salsa.debian.org/ruby-team/ruby-riddle
Homepage: https://pat.github.io/riddle/
diff -Nru
ruby-riddle-2.3.1/debian/patches/0002-Make-mysql2-client-allow-local_infile.patch
ruby-riddle-2.3.1/debian/patches/0002-Make-mysql2-client-allow-local_infile.patch
---
ruby-riddle-2.3.1/debian/patches/0002-Make-mysql2-client-allow-local_infile.patch
1970-01-01 02:00:00.000000000 +0200
+++
ruby-riddle-2.3.1/debian/patches/0002-Make-mysql2-client-allow-local_infile.patch
2019-12-05 14:04:01.000000000 +0200
@@ -0,0 +1,23 @@
+From: Lucas Kanashiro <lucas.kanash...@canonical.com>
+Date: Thu, 5 Dec 2019 08:56:44 -0300
+Subject: Make mysql2 client allow local_infile
+
+This is needed to use the LOAD DATA LOCAL INFILE fixture command.
+---
+ spec/support/mri_client.rb | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/spec/support/mri_client.rb b/spec/support/mri_client.rb
+index 5906d81..4bd8580 100644
+--- a/spec/support/mri_client.rb
++++ b/spec/support/mri_client.rb
+@@ -5,7 +5,8 @@ class MRIClient
+ @client = Mysql2::Client.new(
+ :host => host,
+ :username => username,
+- :password => password
++ :password => password,
++ :local_infile => true
+ )
+ end
+
diff -Nru ruby-riddle-2.3.1/debian/patches/series
ruby-riddle-2.3.1/debian/patches/series
--- ruby-riddle-2.3.1/debian/patches/series 2019-01-18 14:26:07.000000000
+0200
+++ ruby-riddle-2.3.1/debian/patches/series 2019-12-05 14:04:01.000000000
+0200
@@ -1 +1,2 @@
0001-Remove-bundler-and-relative-paths-from-specs.patch
+0002-Make-mysql2-client-allow-local_infile.patch
diff -Nru ruby-riddle-2.3.1/debian/salsa-ci.yml
ruby-riddle-2.3.1/debian/salsa-ci.yml
--- ruby-riddle-2.3.1/debian/salsa-ci.yml 1970-01-01 02:00:00.000000000
+0200
+++ ruby-riddle-2.3.1/debian/salsa-ci.yml 2019-12-05 14:04:01.000000000
+0200
@@ -0,0 +1,4 @@
+---
+include:
+ - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
+ -
https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
diff -Nru ruby-riddle-2.3.1/debian/start_mysqld_and_run.sh
ruby-riddle-2.3.1/debian/start_mysqld_and_run.sh
--- ruby-riddle-2.3.1/debian/start_mysqld_and_run.sh 2019-01-18
14:26:07.000000000 +0200
+++ ruby-riddle-2.3.1/debian/start_mysqld_and_run.sh 2019-12-05
14:04:01.000000000 +0200
@@ -18,7 +18,7 @@
DO_MYSQL_DATABASE=/${DO_MYSQL_DBNAME}
mysql_install_db --no-defaults --datadir=${MYTEMP_DIR} --force
--skip-name-resolve --user=${DO_MYSQL_USER}
-/usr/sbin/mysqld --no-defaults --user=${DO_MYSQL_USER}
--socket=${MYSQL_UNIX_PORT} --datadir=${MYTEMP_DIR} --skip-networking
--skip-grant &
+/usr/sbin/mysqld --no-defaults --user=${DO_MYSQL_USER}
--socket=${MYSQL_UNIX_PORT} --datadir=${MYTEMP_DIR} --skip-networking
--local-infile=1 --skip-grant &
echo -n pinging mysqld.
attempts=0
while ! /usr/bin/mysqladmin --socket=${MYSQL_UNIX_PORT} ping ; do
