Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package hplip for openSUSE:Factory checked in at 2025-05-09 18:39:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hplip (Old) and /work/SRC/openSUSE:Factory/.hplip.new.30101 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hplip" Fri May 9 18:39:34 2025 rev:161 rq:1275594 version:3.25.2 Changes: -------- --- /work/SRC/openSUSE:Factory/hplip/hplip.changes 2025-05-07 19:15:23.268506790 +0200 +++ /work/SRC/openSUSE:Factory/.hplip.new.30101/hplip.changes 2025-05-09 18:39:47.256084871 +0200 @@ -1,0 +2,46 @@ +Wed May 7 13:33:02 UTC 2025 - Martin Wilck <mwi...@suse.com> + +- Update to hplip 3.25.2 +- Added support for new printers: + * HP LaserJet Enterprise Flow MFP 8601z + * HP LaserJet Enterprise Flow MFP 8601z+ + * HP LaserJet Enterprise MFP 8601dn + * HP Color LaserJet Enterprise MFP 8801dn + * HP Color LaserJet Enterprise Flow MFP 8801z + * HP Color LaserJet Enterprise Flow MFP 8801z+ + * HP LaserJet Enterprise 8501dn + * HP LaserJet Enterprise 8501x + * HP LaserJet Enterprise 8501x+ + * DEX MFP D826 + * DEX MFP D82640 + * DEX MFP D82650 + * DEX MFP D82660 + * DEX D50145 + * DEX MFP D42540 + * DEX MFP D52645 + * DEX Color D55745 + * DEX Color MFP D57945 + * DEX Color MFP D677 + * DEX Color MFP D67755 + * DEX Color MFP D67765 + * DEX Color MFP D877 + * DEX Color MFP D87740 + * DEX Color MFP D87750 + * DEX Color MFP D87760 + * DEX Color MFP D87770 + * DEX Color MFP D786 + * DEX Colour MFP D78625 + * DEX Color MFP D78630 + * DEX Color MFP D78635 + * DEX MFP D731 + * DEX MFP D73130 + * DEX MFP D73135 + * DEX MFP D73140 + +- Fix plugin verification with sha256 (lp#2110100) + * add hplip-utils-Fix-plugin-verification-with-sha256.patch + +- Fix C++ compilation on SLE12 + * add hpcups-fix-compilation-on-SLE12.patch + +------------------------------------------------------------------- @@ -4,0 +51 @@ + (lp#2096650) Old: ---- hplip-3.24.4.tar.gz hplip-3.24.4.tar.gz.asc New: ---- hpcups-fix-compilation-on-SLE12.patch hplip-3.25.2.tar.gz hplip-3.25.2.tar.gz.asc hplip-utils-Fix-plugin-verification-with-sha256.patch BETA DEBUG BEGIN: New:- Fix C++ compilation on SLE12 * add hpcups-fix-compilation-on-SLE12.patch New:- Fix plugin verification with sha256 (lp#2110100) * add hplip-utils-Fix-plugin-verification-with-sha256.patch BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hplip.spec ++++++ --- /var/tmp/diff_new_pack.3OxIik/_old 2025-05-09 18:39:48.332129800 +0200 +++ /var/tmp/diff_new_pack.3OxIik/_new 2025-05-09 18:39:48.332129800 +0200 @@ -47,7 +47,7 @@ %endif Name: hplip -Version: 3.24.4 +Version: 3.25.2 Release: 0 Summary: HP's Printing, Scanning, and Faxing Software License: BSD-3-Clause AND GPL-2.0-or-later AND MIT @@ -116,10 +116,12 @@ Patch604: hplip-sclpml-strcasestr.patch Patch605: hplip-hpaio-gcc14.patch Patch606: hplip-base-fix-error-in-ConfigBase-handling.patch +Patch607: hplip-utils-Fix-plugin-verification-with-sha256.patch # PATCH-FIX-UPSTREAM https://bugs.launchpad.net/hplip/+bug/2096650 Patch651: hplip-3.24.4-gcc15.patch # Compatibility patches for old SUSE releases Patch700: hplip-base-replace-f-string-with-string.format-for-p.patch +Patch701: hpcups-fix-compilation-on-SLE12.patch %if %use_qt5 BuildRequires: %{pymod qt5-devel} @@ -385,10 +387,12 @@ %patch -P 604 -p1 %patch -P 605 -p1 %patch -P 606 -p1 +%patch -P 607 -p1 %patch -P 651 -p1 %if 0%{?suse_version} < 1500 # python2 compatibility %patch -P 700 -p1 +%patch -P 701 -p1 %endif # replace "env" shebang and "/usr/bin/python" with real executable ++++++ hpcups-fix-compilation-on-SLE12.patch ++++++ >From e95a9cb2e946bec33d7f0afa04850f93ae258477 Mon Sep 17 00:00:00 2001 From: Martin Wilck <mwi...@suse.com> Date: Wed, 7 May 2025 15:53:46 +0200 Subject: [PATCH] hpcups: fix compilation on SLE12 SLE12-SP5 is not using C++11 by default, thus nullptr is not defined. NULL is used elsewhere in the file, so we can just replace nullptr with NULL. --- prnt/hpcups/HPCupsFilter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prnt/hpcups/HPCupsFilter.cpp b/prnt/hpcups/HPCupsFilter.cpp index 6750684..7d397ed 100644 --- a/prnt/hpcups/HPCupsFilter.cpp +++ b/prnt/hpcups/HPCupsFilter.cpp @@ -435,7 +435,7 @@ DRIVER_ERROR HPCupsFilter::startPage (cups_page_header2_t *cups_header) if (m_JA.media_attributes.PageSizeName[0] == '\0') { // Copy the value of cups_header->cupsPageSizeName if it isnot null - if (cups_header->cupsPageSizeName != nullptr) { + if (cups_header->cupsPageSizeName != NULL) { strncpy(m_JA.media_attributes.PageSizeName, cups_header->cupsPageSizeName, sizeof(m_JA.media_attributes.PageSizeName)); } } -- 2.49.0 ++++++ hplip-3.24.4.tar.gz -> hplip-3.25.2.tar.gz ++++++ /work/SRC/openSUSE:Factory/hplip/hplip-3.24.4.tar.gz /work/SRC/openSUSE:Factory/.hplip.new.30101/hplip-3.25.2.tar.gz differ: char 14, line 1 ++++++ hplip-utils-Fix-plugin-verification-with-sha256.patch ++++++ >From 8d14912a48e589bee05e0c377c29218132083145 Mon Sep 17 00:00:00 2001 From: Martin Wilck <mwi...@suse.com> Date: Wed, 7 May 2025 15:23:17 +0200 Subject: [PATCH] hplip/utils: Fix plugin verification with sha256 https://bugs.launchpad.net/hplip/+bug/2110100 --- base/smart_install.py | 2 +- base/utils.py | 12 +++++++++++- installer/pluginhandler.py | 4 ++-- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/base/smart_install.py b/base/smart_install.py index cff5924..699f70f 100755 --- a/base/smart_install.py +++ b/base/smart_install.py @@ -155,7 +155,7 @@ def validate(mode, smart_install_run, smart_install_asc, req_checksum=''): calc_checksum = utils.get_checksum(open(smart_install_run, 'r').read()) log.debug("File checksum=%s" % calc_checksum) - if req_checksum and req_checksum != calc_checksum: + if utils.sha256_checksum(req_checksum) != calc_checksum: return ERROR_FILE_CHECKSUM, queryString(ERROR_CHECKSUM_ERROR, 0, plugin_file) #Validate Digital Signature diff --git a/base/utils.py b/base/utils.py index d5b3a49..f9de94e 100644 --- a/base/utils.py +++ b/base/utils.py @@ -72,8 +72,18 @@ import hashlib def get_checksum(s): return hashlib.sha256(s).hexdigest() +__sha1_sha256_map = { + "bd99405113d43447e7a37ed46d75187785774cff": + "9a2cf8d5661e846548dbbb595231a5448a5cb63729cc93df8d1f652dfd167a54" +} - +def sha256_checksum(s): + if not s: + return "" + elif s in __sha1_sha256_map: + return __sha1_sha256_map[s] + else: + return s # Local from .g import * diff --git a/installer/pluginhandler.py b/installer/pluginhandler.py index a37db39..26b0033 100755 --- a/installer/pluginhandler.py +++ b/installer/pluginhandler.py @@ -217,9 +217,9 @@ class PluginHandle(object): def __validatePlugin(self,plugin_file, digsig_file, req_checksum): #Validate Checksum - calc_checksum = get_checksum(open(plugin_file, 'rb').read()) + calc_checksum = utils.get_checksum(open(plugin_file, 'rb').read()) log.debug("D/L file checksum=%s" % calc_checksum) - if req_checksum and req_checksum != calc_checksum: + if utils.sha256_checksum(req_checksum) != calc_checksum: return ERROR_CHECKSUM_ERROR, queryString(ERROR_CHECKSUM_ERROR, 0, plugin_file) #Validate Digital Signatures -- 2.49.0
