Control: tags 982243 + patch
Control: tags 982243 + pending
Control: tags 988343 + patch
Control: tags 988343 + pending
Dear maintainer,
I've prepared an NMU for sane-backends (versioned as 1.0.31-4.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I should cancel it.
cu
Adrian
diff -Nru sane-backends-1.0.31/debian/changelog sane-backends-1.0.31/debian/changelog
--- sane-backends-1.0.31/debian/changelog 2020-12-04 18:08:57.000000000 +0200
+++ sane-backends-1.0.31/debian/changelog 2021-07-25 20:15:13.000000000 +0300
@@ -1,3 +1,14 @@
+sane-backends (1.0.31-4.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Backport fixes from 1.0.32:
+ - plustek-usbhw: Work around discovery problem for CanoScan N650U
+ with 1ms sleep, thanks to Kai von Krbek. (Closes: #982243)
+ - hp4200: Fix crashes caused by incorrectly sized memset,
+ thanks to Hauke Mehrtens. (Closes: #988343)
+
+ -- Adrian Bunk <b...@debian.org> Sun, 25 Jul 2021 20:15:13 +0300
+
sane-backends (1.0.31-4) unstable; urgency=medium
* debian/rules:
diff -Nru sane-backends-1.0.31/debian/patches/0001-hp4200-memset-incorrectly-sized.-registro-0-is-point.patch sane-backends-1.0.31/debian/patches/0001-hp4200-memset-incorrectly-sized.-registro-0-is-point.patch
--- sane-backends-1.0.31/debian/patches/0001-hp4200-memset-incorrectly-sized.-registro-0-is-point.patch 1970-01-01 02:00:00.000000000 +0200
+++ sane-backends-1.0.31/debian/patches/0001-hp4200-memset-incorrectly-sized.-registro-0-is-point.patch 2021-07-25 20:14:16.000000000 +0300
@@ -0,0 +1,25 @@
+From acc5ca499f67ed1c8c42242fcf87358e7968e71d Mon Sep 17 00:00:00 2001
+From: Ralph Little <skelb...@gmail.com>
+Date: Sat, 13 Mar 2021 17:05:13 -0800
+Subject: hp4200: memset incorrectly sized. registro[0] is pointer not int.
+
+---
+ backend/hp4200.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/backend/hp4200.c b/backend/hp4200.c
+index c080fcbcc..3d8e6a88b 100644
+--- a/backend/hp4200.c
++++ b/backend/hp4200.c
+@@ -1497,7 +1497,7 @@ do_fine_calibration (HP4200_Scanner * s, struct coarse_t *coarse)
+ int i;
+ for (i = 0; i < 12; i++)
+ {
+- memset (registro[i], 0, 5460 * 3 * sizeof(registro[0]));
++ memset (registro[i], 0, 5460 * 3 * sizeof(int));
+ }
+ }
+
+--
+2.20.1
+
diff -Nru sane-backends-1.0.31/debian/patches/0001-plustek-usbhw.c-Add-1ms-sleep-before-writing-to-regi.patch sane-backends-1.0.31/debian/patches/0001-plustek-usbhw.c-Add-1ms-sleep-before-writing-to-regi.patch
--- sane-backends-1.0.31/debian/patches/0001-plustek-usbhw.c-Add-1ms-sleep-before-writing-to-regi.patch 1970-01-01 02:00:00.000000000 +0200
+++ sane-backends-1.0.31/debian/patches/0001-plustek-usbhw.c-Add-1ms-sleep-before-writing-to-regi.patch 2021-07-25 20:15:03.000000000 +0300
@@ -0,0 +1,32 @@
+From 6af85ec669f7a201360f3dcc48f6b47a06812914 Mon Sep 17 00:00:00 2001
+From: Zdenek Dohnal <zdoh...@redhat.com>
+Date: Fri, 9 Oct 2020 08:55:41 +0200
+Subject: plustek-usbhw.c: Add 1ms sleep before writing to register 0x59
+
+Works around discovery problem for CanoScan N650U, fixes #137.
+---
+ backend/plustek-usbhw.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/backend/plustek-usbhw.c b/backend/plustek-usbhw.c
+index 05d3cc75c..28cbd52a4 100644
+--- a/backend/plustek-usbhw.c
++++ b/backend/plustek-usbhw.c
+@@ -1451,6 +1451,14 @@ usb_ResetRegisters( Plustek_Device *dev )
+ * CanoScan devices to work properly after power-up
+ */
+ sanei_lm983x_write_byte( dev->fd, 0x5b, regs[0x5b] );
++
++ /* At least CanoScan N650U can have a problem with writing
++ * to register 0x59 due XHCI USB controller is too
++ * fast for him. Simulate EHCI USB controller's
++ * behavior here - wait 1ms.
++ */
++ usleep(1000);
++
+ sanei_lm983x_write_byte( dev->fd, 0x59, regs[0x59] );
+ sanei_lm983x_write_byte( dev->fd, 0x5a, regs[0x5a] );
+ } else {
+--
+2.20.1
+
diff -Nru sane-backends-1.0.31/debian/patches/series sane-backends-1.0.31/debian/patches/series
--- sane-backends-1.0.31/debian/patches/series 2020-10-08 11:13:18.000000000 +0300
+++ sane-backends-1.0.31/debian/patches/series 2021-07-25 20:15:13.000000000 +0300
@@ -15,3 +15,5 @@
0060-cross.patch
0165-respect_local_only_parameter.patch
0170-return_empty_list_when_local_devices_requested.patch
+0001-plustek-usbhw.c-Add-1ms-sleep-before-writing-to-regi.patch
+0001-hp4200-memset-incorrectly-sized.-registro-0-is-point.patch
