%s
(%s)
") %(self.device_uri, QString(e[0]))) -+ FailureUI(self, self.__tr("Error opening device:%s
(%s)
") %(self.device_uri, QString(e.msg))) - - if self.dev is not None: - self.dev.close() -@@ -834,7 +834,7 @@ class WifiSetupDialog(QDialog, Ui_Dialog): - - - def showIOError(self, e): -- FailureUI(self, self.__tr("An I/O error occurred.Please check the USB connection to your printer and try again.
(%s)" % QString(e[0]))) -+ FailureUI(self, self.__tr("An I/O error occurred.Please check the USB connection to your printer and try again.
(%s)" % QString(e.msg))) - - if self.dev is not None: - self.dev.close() -diff --git a/ui5/wifisetupdialog.py b/ui5/wifisetupdialog.py -index e0c7aee..74cc0ef 100644 ---- a/ui5/wifisetupdialog.py -+++ b/ui5/wifisetupdialog.py -@@ -259,7 +259,7 @@ class WifiSetupDialog(QDialog, Ui_Dialog): - try: - self.dev = device.Device(self.device_uri) - except Error as e: -- FailureUI(self, self.__tr("Error opening device:%s
(%s)
") %(self.device_uri, str(e[0]))) -+ FailureUI(self, self.__tr("Error opening device:%s
(%s)
") %(self.device_uri, str(e.msg))) - - if self.dev is not None: - self.dev.close() -@@ -840,7 +840,7 @@ class WifiSetupDialog(QDialog, Ui_Dialog): - - - def showIOError(self, e): -- FailureUI(self, self.__tr("An I/O error occurred.Please check the USB connection to your printer and try again.
(%s)" % str(e[0]))) -+ FailureUI(self, self.__tr("An I/O error occurred.Please check the USB connection to your printer and try again.
(%s)" % str(e.msg))) - - if self.dev is not None: - self.dev.close() diff --git a/hplip-snprintf-format.patch b/hplip-snprintf-format.patch new file mode 100644 index 0000000..221f1d1 --- /dev/null +++ b/hplip-snprintf-format.patch @@ -0,0 +1,50 @@ +diff --git a/protocol/hp_ipp.c b/protocol/hp_ipp.c +index 97d827d..af25b3e 100644 +--- a/protocol/hp_ipp.c ++++ b/protocol/hp_ipp.c +@@ -110,9 +110,9 @@ int addCupsPrinter(char *name, char *device_uri, char *location, char *ppd_file, + } + + if ( info == NULL ) +- snprintf( info,sizeof(info), name ); ++ info = name; + +- sprintf( printer_uri, "ipp://localhost/printers/%s", name ); ++ snprintf( printer_uri, sizeof(printer_uri), "ipp://localhost/printers/%s", name); + + cupsSetUser ("root"); + /* Connect to the HTTP server */ +@@ -511,27 +511,27 @@ int __parsePrinterAttributes(ipp_t *response, printer_t **printer_list) + + if ( strcmp(attr_name, "printer-name") == 0 && + val_tag == IPP_TAG_NAME ) { +- snprintf(t_printer->name, sizeof(t_printer->name),ippGetString(attr, 0, NULL) ); ++ snprintf(t_printer->name, sizeof(t_printer->name), "%s", ippGetString(attr, 0, NULL)); + } + else if ( strcmp(attr_name, "device-uri") == 0 && + val_tag == IPP_TAG_URI ) { +- snprintf(t_printer->device_uri,sizeof(t_printer->device_uri), ippGetString(attr, 0, NULL) ); ++ snprintf(t_printer->device_uri, sizeof(t_printer->device_uri), "%s", ippGetString(attr, 0, NULL)); + } + else if ( strcmp(attr_name, "printer-uri-supported") == 0 && + val_tag == IPP_TAG_URI ) { +- snprintf(t_printer->printer_uri,sizeof(t_printer->printer_uri), ippGetString(attr, 0, NULL) ); ++ snprintf(t_printer->printer_uri, sizeof(t_printer->printer_uri), "%s", ippGetString(attr, 0, NULL)); + } + else if ( strcmp(attr_name, "printer-info") == 0 && + val_tag == IPP_TAG_TEXT ) { +- snprintf(t_printer->info,sizeof(t_printer->info), ippGetString(attr, 0, NULL) ); ++ snprintf(t_printer->info, sizeof(t_printer->info), "%s", ippGetString(attr, 0, NULL)); + } + else if ( strcmp(attr_name, "printer-location") == 0 && + val_tag == IPP_TAG_TEXT ) { +- snprintf(t_printer->location,sizeof(t_printer->location),ippGetString(attr, 0, NULL) ); ++ snprintf(t_printer->location, sizeof(t_printer->location), "%s", ippGetString(attr, 0, NULL)); + } + else if ( strcmp(attr_name, "printer-make-and-model") == 0 && + val_tag == IPP_TAG_TEXT ) { +- snprintf(t_printer->make_model,sizeof(t_printer->make_model),ippGetString(attr, 0, NULL) ); ++ snprintf(t_printer->make_model, sizeof(t_printer->make_model), "%s", ippGetString(attr, 0, NULL)); + } + else if ( strcmp(attr_name, "printer-state") == 0 && + val_tag == IPP_TAG_ENUM ) { diff --git a/hplip.spec b/hplip.spec index ff04eab..a76a870 100644 --- a/hplip.spec +++ b/hplip.spec @@ -6,8 +6,8 @@ Summary: HP Linux Imaging and Printing Project Name: hplip -Version: 3.22.4 -Release: 2%{?dist} +Version: 3.22.6 +Release: 1%{?dist} License: GPLv2+ and MIT and BSD and IJG and GPLv2+ with exceptions and ISC Url: https://developers.hp.com/hp-linux-imaging-and-printing @@ -198,6 +198,9 @@ Patch60: hplip-osname-mismatch.patch # removed # - /lib64/libm.so is not symlink but ld script, which cannot be used in dlopen() Patch61: hplip-no-libhpmud-libm-warnings.patch +# hplip 3.22.6 doesn't use the correct arguments for snprintf +# reported as https://bugs.launchpad.net/hplip/+bug/1982185 +Patch62: hplip-snprintf-format.patch %if 0%{?fedora} || 0%{?rhel} <= 8 # mention hplip-gui if you want to have GUI @@ -514,6 +517,8 @@ done %patch60 -p1 -b .osname-mismatch # 2080235 - Misleading errors about missing shared libraries when scanning %patch61 -p1 -b .no-libm-libhpmud-warn +# hplip 3.22.6 doesn't use proper arguments for snprintf +%patch62 -p1 -b .snprintf-format %if 0%{?fedora} || 0%{?rhel} <= 8 # mention hplip-gui should be installed if you want GUI @@ -869,6 +874,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop %config(noreplace) %{_sysconfdir}/sane.d/dll.d/hpaio %changelog +* Tue Jul 19 2022 Zdenek Dohnal