RHEL-49445 Rebase ipp-usb to 0.9.26

Resolves: RHEL-49445
side-tag: c10s-build-side-3417-stack-gate
This commit is contained in:
Zdenek Dohnal 2024-07-22 17:08:10 +02:00
parent 1160f81c49
commit f9b780d91d
4 changed files with 10 additions and 25 deletions

1
.gitignore vendored
View File

@ -9,3 +9,4 @@
/ipp-usb-0.9.22.tar.gz
/ipp-usb-0.9.23.tar.gz
/ipp-usb-0.9.24.tar.gz
/ipp-usb-0.9.26.tar.gz

View File

@ -3,8 +3,8 @@
# https://github.com/OpenPrinting/ipp-usb
%global goipath github.com/OpenPrinting/ipp-usb
Version: 0.9.24
%global tag 0.9.24
Version: 0.9.26
%global tag 0.9.26
%gometa
@ -24,7 +24,7 @@ Requires: pkgconfig(libusb-1.0) >= 1.0
}
Name: %{goname}
Release: 5%{?dist}
Release: 1%{?dist}
Summary: HTTP reverse proxy, backed by IPP-over-USB connection to device
# Upstream license specification: BSD-2-Clause
@ -32,11 +32,6 @@ License: BSD-2-Clause
URL: %{gourl}
Source0: %{gosource}
# reverting the change which introduced support for Pantum printers, which
# broke conformation to IPP standards and has security implications
# https://lore.kernel.org/printing-architecture/b2c6c270-4933-4bde-a299-52802e6e8d88@shentel.net/T/#u
Patch001: pantum-support-revert.patch
# needed for registering device on localhost
BuildRequires: pkgconfig(avahi-client) >= 0.7
# implements IPP protocol used in ipp-usb
@ -66,7 +61,8 @@ Requires: systemd-udev
%prep
%goprep
%autopatch
rm -rf vendor
%build
%gobuild -o %{gobuilddir}/bin/ipp-usb %{goipath}
@ -120,6 +116,9 @@ install -m 0644 -vp ipp-usb-quirks/* %{buildroot}%{_datadir}/ipp-usb/quirks
%gopkgfiles
%changelog
* Mon Jul 22 2024 Zdenek Dohnal <zdohnal@redhat.com> - 0.9.26-1
- RHEL-49445 Rebase ipp-usb to 0.9.26
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 0.9.24-5
- Bump release for June 2024 mass rebuild

View File

@ -1,15 +0,0 @@
diff --git a/ipp.go b/ipp.go
index e707665..c9bffcb 100644
--- a/ipp.go
+++ b/ipp.go
@@ -168,9 +168,7 @@ func ippGetPrinterAttributes(log *LogMessage, c *http.Client,
return
}
- err = msg.DecodeBytesEx(respData,
- goipp.DecoderOptions{EnableWorkarounds: true})
-
+ err = msg.DecodeBytes(respData)
if err != nil {
log.Debug(' ', "Failed to decode IPP message: %s", err)
log.HexDump(LogTraceIPP, ' ', respData)

View File

@ -1 +1 @@
SHA512 (ipp-usb-0.9.24.tar.gz) = 72c05ae3c4f98775142b3349fc3dee14882d7f348feec2e43fc5976497b90771e073e069becb5936c82036b696b4f9c830a796fb88f40cdd56219cb968e62a6e
SHA512 (ipp-usb-0.9.26.tar.gz) = 66cb93afea73413612328ba9bbca7c30a9c37a1eb970f9975d35c05b405a5da8e227f5816cfbb99034e1ebf1353a0255b63ad8458481236264a913203ebfb120