Processed: Re: Bug#989161: [pre-approval] unblock: cups/2.3.3op2-3+deb11u1
Processing control commands: > tags -1 -moreinfo Bug #989161 [release.debian.org] [pre-approval] unblock: cups/2.3.3op2-3+deb11u1 Removed tag(s) moreinfo. -- 989161: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=989161 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems
Bug#989161: [pre-approval] unblock: cups/2.3.3op2-3+deb11u1
Control: tags -1 -moreinfo Le vendredi, 28 mai 2021, 23.21:56 h CEST Sebastian Ramacher a écrit : > On 2021-05-27 09:03:49 +0200, Didier 'OdyX' Raboud wrote: > > unblock cups/2.3.3op2-3+deb11u1 > > ACK, please remove the moreinfo tag once the new version is available in > unstable. Got the "Accepted cups 2.3.3op2-3+deb11u1 (source) into unstable" email, removing the tag. Thanks for your work! -- OdyX signature.asc Description: This is a digitally signed message part.
Bug#989161: [pre-approval] unblock: cups/2.3.3op2-3+deb11u1
Control: tags -1 confirmed moreinfo
On 2021-05-27 09:03:49 +0200, Didier 'OdyX' Raboud wrote:
> Package: release.debian.org
> Severity: normal
> User: release.debian@packages.debian.org
> Usertags: unblock
> X-Debbugs-Cc: c...@packages.debian.org
>
> Please approve the following update for src:cups
>
> [ Reason ]
> Mikko Rapeli reported a USB printing regression in #989073, which, lukily
> enough, was already reported and fixed upstream. It matters for Bullseye's
> quality to ensure smooth USB printing.
>
> [ Impact ]
> Failure to print without comprehensible error messages nor configurable ways
> to fix USB printing.
>
> [ Tests ]
> There are none, but as you'll see, these patches merely extend timeouts; also,
> they have been reviewed and merged upstream, by the long-term upstream author,
> Michael Sweet.
>
> [ Risks ]
> Given the trivialness of the patches as well as the extended review, I
> consider the risks to be negligible.
>
> [ Checklist ]
> [x] all changes are documented in the d/changelog
> [x] I reviewed all changes and I approve them
> [x] attach debdiff against the package in testing
>
> [ Other info ]
> I'm also attaching the "direct" patches, as my use of git debrebase produces a
> noisy debdiff. I have also picked the 2.3.3op2-3+deb11u1 version, as
> 2.3.3op2-4 was already uploaded in experimental; please advise if a change is
> needed.
>
> Many thanks for your work!
>
> unblock cups/2.3.3op2-3+deb11u1
ACK, please remove the moreinfo tag once the new version is available in
unstable.
Cheers
> From: Zdenek Dohnal
> Date: Tue, 13 Apr 2021 15:44:14 +0200
> Subject: backend/usb-libusb.c: Use 60s timeout for reading at backchannel
>
> Some older models malfunction if timeout is too short.
>
> Origin: upstream, https://github.com/OpenPrinting/cups/pull/174
> Bug: https://github.com/OpenPrinting/cups/issues/160
> Bug-Debian: https://bugs.debian.org/989073
> ---
> backend/usb-libusb.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/backend/usb-libusb.c b/backend/usb-libusb.c
> index d6b0eb4..fbb0d9d 100644
> --- a/backend/usb-libusb.c
> +++ b/backend/usb-libusb.c
> @@ -1704,7 +1704,7 @@ static void *read_thread(void *reference)
> readstatus = libusb_bulk_transfer(g.printer->handle,
> g.printer->read_endp,
> readbuffer, rbytes,
> - , 250);
> + , 6);
> if (readstatus == LIBUSB_SUCCESS && rbytes > 0)
> {
>fprintf(stderr, "DEBUG: Read %d bytes of back-channel data...\n",
> (int)rbytes);
> From: Zdenek Dohnal
> Date: Tue, 13 Apr 2021 15:47:37 +0200
> Subject: backend/usb-libusb.c: Revert enforcing read limits
>
> This commit reverts the change introduced by 2.2.12 [1] - its
> implementation caused a regression with Lexmark filters.
>
> [1]
> https://github.com/apple/cups/commit/35e927f83529cd9b4bc37bcd418c50e307fced35
>
> Origin: upstream, https://github.com/OpenPrinting/cups/pull/174
> Bug: https://github.com/OpenPrinting/cups/issues/72
> ---
> backend/usb-libusb.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/backend/usb-libusb.c b/backend/usb-libusb.c
> index fbb0d9d..89b5182 100644
> --- a/backend/usb-libusb.c
> +++ b/backend/usb-libusb.c
> @@ -1721,7 +1721,8 @@ static void *read_thread(void *reference)
> * Make sure this loop executes no more than once every 250 miliseconds...
> */
>
> -if ((g.wait_eof || !g.read_thread_stop))
> +if ((readstatus != LIBUSB_SUCCESS || rbytes == 0) &&
> + (g.wait_eof || !g.read_thread_stop))
>usleep(25);
>}
>while (g.wait_eof || !g.read_thread_stop);
> diff -Nru cups-2.3.3op2/debian/changelog cups-2.3.3op2/debian/changelog
> --- cups-2.3.3op2/debian/changelog2021-02-12 14:09:29.0 +0100
> +++ cups-2.3.3op2/debian/changelog2021-05-27 08:49:36.0 +0200
> @@ -1,3 +1,12 @@
> +cups (2.3.3op2-3+deb11u1) unstable; urgency=medium
> +
> + * Backport 2 upstream USB backend fixes:
> +- Revert enforcing read limits (caused a regression with Lexmark filters)
> +- Use 60s timeout (instead of 250ms) for reading at backchannel, as some
> + older models malfunction if timeout is too short (Closes: #989073)
> +
> + -- Didier Raboud Thu, 27 May 2021 08:49:36 +0200
> +
> cups (2.3.3op2-3) unstable; urgency=medium
>
>[ Helge Kreutzmann ]
> diff -Nru
> cups-2.3.3op2/debian/patches/0001-backend-usb-libusb.c-Use-60s-timeout-for-reading-at-.patch
>
> cups-2.3.3op2/debian/patches/0001-backend-usb-libusb.c-Use-60s-timeout-for-reading-at-.patch
> ---
> cups-2.3.3op2/debian/patches/0001-backend-usb-libusb.c-Use-60s-timeout-for-reading-at-.patch
> 1970-01-01 01:00:00.0 +0100
> +++
> cups-2.3.3op2/debian/patches/0001-backend-usb-libusb.c-Use-60s-timeout-for-reading-at-.patch
> 2021-05-27 08:49:36.0 +0200
> @@ -0,0 +1,26
Processed: Re: Bug#989161: [pre-approval] unblock: cups/2.3.3op2-3+deb11u1
Processing control commands: > tags -1 confirmed moreinfo Bug #989161 [release.debian.org] [pre-approval] unblock: cups/2.3.3op2-3+deb11u1 Added tag(s) confirmed and moreinfo. -- 989161: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=989161 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems
Bug#989161: [pre-approval] unblock: cups/2.3.3op2-3+deb11u1
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: c...@packages.debian.org
Please approve the following update for src:cups
[ Reason ]
Mikko Rapeli reported a USB printing regression in #989073, which, lukily
enough, was already reported and fixed upstream. It matters for Bullseye's
quality to ensure smooth USB printing.
[ Impact ]
Failure to print without comprehensible error messages nor configurable ways
to fix USB printing.
[ Tests ]
There are none, but as you'll see, these patches merely extend timeouts; also,
they have been reviewed and merged upstream, by the long-term upstream author,
Michael Sweet.
[ Risks ]
Given the trivialness of the patches as well as the extended review, I
consider the risks to be negligible.
[ Checklist ]
[x] all changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in testing
[ Other info ]
I'm also attaching the "direct" patches, as my use of git debrebase produces a
noisy debdiff. I have also picked the 2.3.3op2-3+deb11u1 version, as
2.3.3op2-4 was already uploaded in experimental; please advise if a change is
needed.
Many thanks for your work!
unblock cups/2.3.3op2-3+deb11u1
From: Zdenek Dohnal
Date: Tue, 13 Apr 2021 15:44:14 +0200
Subject: backend/usb-libusb.c: Use 60s timeout for reading at backchannel
Some older models malfunction if timeout is too short.
Origin: upstream, https://github.com/OpenPrinting/cups/pull/174
Bug: https://github.com/OpenPrinting/cups/issues/160
Bug-Debian: https://bugs.debian.org/989073
---
backend/usb-libusb.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/backend/usb-libusb.c b/backend/usb-libusb.c
index d6b0eb4..fbb0d9d 100644
--- a/backend/usb-libusb.c
+++ b/backend/usb-libusb.c
@@ -1704,7 +1704,7 @@ static void *read_thread(void *reference)
readstatus = libusb_bulk_transfer(g.printer->handle,
g.printer->read_endp,
readbuffer, rbytes,
- , 250);
+ , 6);
if (readstatus == LIBUSB_SUCCESS && rbytes > 0)
{
fprintf(stderr, "DEBUG: Read %d bytes of back-channel data...\n",
(int)rbytes);
From: Zdenek Dohnal
Date: Tue, 13 Apr 2021 15:47:37 +0200
Subject: backend/usb-libusb.c: Revert enforcing read limits
This commit reverts the change introduced by 2.2.12 [1] - its
implementation caused a regression with Lexmark filters.
[1]
https://github.com/apple/cups/commit/35e927f83529cd9b4bc37bcd418c50e307fced35
Origin: upstream, https://github.com/OpenPrinting/cups/pull/174
Bug: https://github.com/OpenPrinting/cups/issues/72
---
backend/usb-libusb.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/backend/usb-libusb.c b/backend/usb-libusb.c
index fbb0d9d..89b5182 100644
--- a/backend/usb-libusb.c
+++ b/backend/usb-libusb.c
@@ -1721,7 +1721,8 @@ static void *read_thread(void *reference)
* Make sure this loop executes no more than once every 250 miliseconds...
*/
-if ((g.wait_eof || !g.read_thread_stop))
+if ((readstatus != LIBUSB_SUCCESS || rbytes == 0) &&
+(g.wait_eof || !g.read_thread_stop))
usleep(25);
}
while (g.wait_eof || !g.read_thread_stop);
diff -Nru cups-2.3.3op2/debian/changelog cups-2.3.3op2/debian/changelog
--- cups-2.3.3op2/debian/changelog 2021-02-12 14:09:29.0 +0100
+++ cups-2.3.3op2/debian/changelog 2021-05-27 08:49:36.0 +0200
@@ -1,3 +1,12 @@
+cups (2.3.3op2-3+deb11u1) unstable; urgency=medium
+
+ * Backport 2 upstream USB backend fixes:
+- Revert enforcing read limits (caused a regression with Lexmark filters)
+- Use 60s timeout (instead of 250ms) for reading at backchannel, as some
+ older models malfunction if timeout is too short (Closes: #989073)
+
+ -- Didier Raboud Thu, 27 May 2021 08:49:36 +0200
+
cups (2.3.3op2-3) unstable; urgency=medium
[ Helge Kreutzmann ]
diff -Nru
cups-2.3.3op2/debian/patches/0001-backend-usb-libusb.c-Use-60s-timeout-for-reading-at-.patch
cups-2.3.3op2/debian/patches/0001-backend-usb-libusb.c-Use-60s-timeout-for-reading-at-.patch
---
cups-2.3.3op2/debian/patches/0001-backend-usb-libusb.c-Use-60s-timeout-for-reading-at-.patch
1970-01-01 01:00:00.0 +0100
+++
cups-2.3.3op2/debian/patches/0001-backend-usb-libusb.c-Use-60s-timeout-for-reading-at-.patch
2021-05-27 08:49:36.0 +0200
@@ -0,0 +1,26 @@
+From: Zdenek Dohnal
+Date: Tue, 13 Apr 2021 15:44:14 +0200
+Subject: backend/usb-libusb.c: Use 60s timeout for reading at backchannel
+
+Some older models malfunction if timeout is too short.
+
+Origin: upstream, https://github.com/OpenPrinting/cups/pull/174
+Bug: https://github.com/OpenPrinting/cups/issues/160
+Bug-Debian: https://bugs.debian.org/989073
+---
+ backend/usb-libusb.c | 2 +-
+ 1 file changed, 1
