Bug#992041: unblock: ruby-rqrcode-rails3/0.1.7-2
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package ruby-rqrcode-rails3
This includes an rc bug fix #992040. Gitlab 2FA authentication
was tested with rqrcode 0.7.0 and also with the ruby-rqrcode-rails3/0.1.7-2
and working in both cases.
diff -Nru ruby-rqrcode-rails3-0.1.7/debian/changelog ruby-rqrcode-rails3-0.1.7/debian/changelog
--- ruby-rqrcode-rails3-0.1.7/debian/changelog 2021-01-05 20:52:02.000000000 +0530
+++ ruby-rqrcode-rails3-0.1.7/debian/changelog 2021-08-09 23:17:47.000000000 +0530
@@ -1,9 +1,28 @@
-ruby-rqrcode-rails3 (0.1.7-1.1) unstable; urgency=medium
+ruby-rqrcode-rails3 (0.1.7-2) unstable; urgency=medium
- * Non maintainer upload by the Reproducible Builds team.
- * No source change upload to rebuild on buildd with .buildinfo files.
+ * Team upload
- -- Holger Levsen <holger@debian.org> Tue, 05 Jan 2021 16:22:02 +0100
+ [ Cédric Boutillier ]
+ * Bump debhelper compatibility level to 9
+ * Use https:// in Vcs-* fields
+ * Bump Standards-Version to 3.9.7 (no changes needed)
+
+ [ Utkarsh Gupta ]
+ * Add salsa-ci.yml
+
+ [ Debian Janitor ]
+ * Use secure copyright file specification URI.
+ * Use secure URI in Homepage field.
+ * Set upstream metadata fields: Bug-Database, Bug-Submit.
+ * Update Vcs-* headers from URL redirect.
+ * Use canonical URL in Vcs-Git.
+
+ [ Pirate Praveen ]
+ * Fix for ruby-rqrcode 1.0 compatibility (Thanks to Florence Foo)
+ (Closes: #992040)
+ * Bump Standards-Version to 4.5.1 (no changes needed)
+
+ -- Pirate Praveen <praveen@debian.org> Mon, 09 Aug 2021 23:17:47 +0530
ruby-rqrcode-rails3 (0.1.7-1) unstable; urgency=medium
diff -Nru ruby-rqrcode-rails3-0.1.7/debian/compat ruby-rqrcode-rails3-0.1.7/debian/compat
--- ruby-rqrcode-rails3-0.1.7/debian/compat 2015-07-06 13:27:56.000000000 +0530
+++ ruby-rqrcode-rails3-0.1.7/debian/compat 2021-08-09 23:17:47.000000000 +0530
@@ -1 +1 @@
-7
+9
diff -Nru ruby-rqrcode-rails3-0.1.7/debian/control ruby-rqrcode-rails3-0.1.7/debian/control
--- ruby-rqrcode-rails3-0.1.7/debian/control 2015-07-06 13:27:56.000000000 +0530
+++ ruby-rqrcode-rails3-0.1.7/debian/control 2021-08-09 23:17:47.000000000 +0530
@@ -1,16 +1,16 @@
Source: ruby-rqrcode-rails3
Section: ruby
Priority: optional
-Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers@lists.alioth.debian.org>
+Maintainer: Debian Ruby Team <pkg-ruby-extras-maintainers@lists.alioth.debian.org>
Uploaders: Balasankar C <balasankarc@autistici.org>
-Build-Depends: debhelper (>= 7.0.50~),
+Build-Depends: debhelper (>= 9~),
gem2deb,
rake,
ruby-rqrcode (>= 0.4.2)
-Standards-Version: 3.9.6
-Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-rqrcode-rails3.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ruby-extras/ruby-rqrcode-rails3.git
-Homepage: http://github.com/samvincent/rqrcode-rails3
+Standards-Version: 4.5.1
+Vcs-Git: https://salsa.debian.org/ruby-team/ruby-rqrcode-rails3.git
+Vcs-Browser: https://salsa.debian.org/ruby-team/ruby-rqrcode-rails3
+Homepage: https://github.com/samvincent/rqrcode-rails3
Testsuite: autopkgtest-pkg-ruby
XS-Ruby-Versions: all
diff -Nru ruby-rqrcode-rails3-0.1.7/debian/copyright ruby-rqrcode-rails3-0.1.7/debian/copyright
--- ruby-rqrcode-rails3-0.1.7/debian/copyright 2015-07-06 13:27:56.000000000 +0530
+++ ruby-rqrcode-rails3-0.1.7/debian/copyright 2021-08-09 23:17:47.000000000 +0530
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: rqrcode-rails3
Source: https://github.com/samvincent/rqrcode-rails3
diff -Nru ruby-rqrcode-rails3-0.1.7/debian/patches/rqrcode-1.x-compat.patch ruby-rqrcode-rails3-0.1.7/debian/patches/rqrcode-1.x-compat.patch
--- ruby-rqrcode-rails3-0.1.7/debian/patches/rqrcode-1.x-compat.patch 1970-01-01 05:30:00.000000000 +0530
+++ ruby-rqrcode-rails3-0.1.7/debian/patches/rqrcode-1.x-compat.patch 2021-08-09 23:17:47.000000000 +0530
@@ -0,0 +1,36 @@
+https://github.com/samvincent/rqrcode-rails3/compare/master...pandamouse:rqrcode-core-0.1.1.patch
+
+From bc86ea646010ab0e6d089d80f1533b7836315776 Mon Sep 17 00:00:00 2001
+From: Florence Foo <florence@kwelasolutions.com>
+Date: Thu, 2 Jan 2020 17:07:55 +1100
+Subject: [PATCH 1/2] RQRCode.render_qrcode raises NoMethodError #21
+
+- use RQRCodeCore
+ - is_dark? -> dark?
+---
+ lib/rqrcode-rails3.rb | 2 +-
+ lib/rqrcode-rails3/renderers/svg.rb | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/lib/rqrcode-rails3.rb
++++ b/lib/rqrcode-rails3.rb
+@@ -15,7 +15,7 @@
+ size = options[:size] || RQRCode.minimum_qr_size_from_string(string)
+ level = options[:level] || :h
+
+- qrcode = RQRCode::QRCode.new(string, :size => size, :level => level)
++ qrcode = RQRCodeCore::QRCode.new(string, :size => size, :level => level)
+ svg = RQRCode::Renderers::SVG::render(qrcode, options)
+
+ if format && format == :svg
+--- a/lib/rqrcode-rails3/renderers/svg.rb
++++ b/lib/rqrcode-rails3/renderers/svg.rb
+@@ -28,7 +28,7 @@
+ y = c*unit + offset
+ x = r*unit + offset
+
+- next unless qrcode.is_dark(c, r)
++ next unless qrcode.checked?(c, r)
+ tmp << %{<rect width="#{unit}" height="#{unit}" x="#{x}" y="#{y}" style="fill:##{color}"/>}
+ end
+ result << tmp.join
diff -Nru ruby-rqrcode-rails3-0.1.7/debian/patches/series ruby-rqrcode-rails3-0.1.7/debian/patches/series
--- ruby-rqrcode-rails3-0.1.7/debian/patches/series 1970-01-01 05:30:00.000000000 +0530
+++ ruby-rqrcode-rails3-0.1.7/debian/patches/series 2021-08-09 23:17:47.000000000 +0530
@@ -0,0 +1 @@
+rqrcode-1.x-compat.patch
diff -Nru ruby-rqrcode-rails3-0.1.7/debian/upstream/metadata ruby-rqrcode-rails3-0.1.7/debian/upstream/metadata
--- ruby-rqrcode-rails3-0.1.7/debian/upstream/metadata 1970-01-01 05:30:00.000000000 +0530
+++ ruby-rqrcode-rails3-0.1.7/debian/upstream/metadata 2021-08-09 23:17:47.000000000 +0530
@@ -0,0 +1,2 @@
+Bug-Database: https://github.com/samvincent/rqrcode-rails3/issues
+Bug-Submit: https://github.com/samvincent/rqrcode-rails3/issues/new
unblock ruby-rqrcode-rails3/0.1.7-2
-- System Information:
Debian Release: 10.7
APT prefers stable-updates
APT policy: (500, 'stable-updates'), (500, 'stable')
Architecture: amd64 (x86_64)
Kernel: Linux 4.19.0-10-amd64 (SMP w/2 CPU cores)
Kernel taint flags: TAINT_WARN
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE=en_IN:en (charmap=UTF-8)
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
Reply to: