From b6541818a7b5889bc512c91e1f3a9bb61bb9b199 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 13 Nov 2018 18:48:17 +0100 Subject: [PATCH 1/3] 1641100 - Retrieval of signing keys for plugin verification should use a server pool instead of specific server --- hplip-keyserver.patch | 12 ++++++++++++ hplip.spec | 9 ++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 hplip-keyserver.patch diff --git a/hplip-keyserver.patch b/hplip-keyserver.patch new file mode 100644 index 0000000..b734dea --- /dev/null +++ b/hplip-keyserver.patch @@ -0,0 +1,12 @@ +diff -up hplip-3.18.6/base/validation.py.keyserver hplip-3.18.6/base/validation.py +--- hplip-3.18.6/base/validation.py.keyserver 2018-11-13 17:35:38.085322569 +0100 ++++ hplip-3.18.6/base/validation.py 2018-11-13 17:36:18.026991983 +0100 +@@ -42,7 +42,7 @@ class DigiSign_Verification(object): + + + class GPG_Verification(DigiSign_Verification): +- def __init__(self, pgp_site = 'pgp.mit.edu', key = 0x4ABA2F66DBD5A95894910E0673D770CDA59047B9): ++ def __init__(self, pgp_site = 'pool.sks-keyservers.net', key = 0x4ABA2F66DBD5A95894910E0673D770CDA59047B9): + self.__pgp_site = pgp_site + self.__key = key + self.__gpg = utils.which('gpg',True) diff --git a/hplip.spec b/hplip.spec index 2ad10db..2de1267 100644 --- a/hplip.spec +++ b/hplip.spec @@ -7,7 +7,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.18.6 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2+ and MIT and BSD and IJG and Public Domain and GPLv2+ with exceptions and ISC Url: https://developers.hp.com/hp-linux-imaging-and-printing @@ -53,6 +53,7 @@ Patch33: hplip-error-print.patch Patch34: hplip-hpfax-importerror-print.patch Patch35: hplip-wifisetup.patch Patch36: hplip-qmsgbox-typos.patch +Patch37: hplip-keyserver.patch Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: python3-pillow @@ -278,6 +279,9 @@ rm prnt/hpcups/ErnieFilter.{cpp,h} prnt/hpijs/ernieplatform.h # this patch fixes more of those typos %patch36 -p1 -b .qmsgbox-typos-fix +# 1641100 - Retrieval of signing keys for plugin verification should use a server pool instead of specific server +%patch37 -p1 -b .keyserver + sed -i.duplex-constraints \ -e 's,\(UIConstraints.* \*Duplex\),//\1,' \ prnt/drv/hpcups.drv.in @@ -563,6 +567,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop %config(noreplace) %{_sysconfdir}/sane.d/dll.d/hpaio %changelog +* Tue Nov 13 2018 Zdenek Dohnal - 3.18.6-10 +- 1641100 - Retrieval of signing keys for plugin verification should use a server pool instead of specific server + * Mon Oct 01 2018 Tomas Korbar - 3.18.6-9 - 1594602 - Fix typos in QMessageBox constructor calls From 8a700d4efb2cdee9e8a1a356e1bbdc593162b706 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 3 Dec 2018 12:50:40 +0100 Subject: [PATCH 2/3] Built with new net-snmp --- hplip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hplip.spec b/hplip.spec index 2de1267..f73d3bd 100644 --- a/hplip.spec +++ b/hplip.spec @@ -7,7 +7,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.18.6 -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv2+ and MIT and BSD and IJG and Public Domain and GPLv2+ with exceptions and ISC Url: https://developers.hp.com/hp-linux-imaging-and-printing @@ -567,6 +567,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop %config(noreplace) %{_sysconfdir}/sane.d/dll.d/hpaio %changelog +* Mon Dec 03 2018 Zdenek Dohnal - 3.18.6-11 +- Built with new net-snmp + * Tue Nov 13 2018 Zdenek Dohnal - 3.18.6-10 - 1641100 - Retrieval of signing keys for plugin verification should use a server pool instead of specific server From 4e48d6b1e4b572155a7a9c6999de1791c38cc99b Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 2 Jan 2019 11:53:18 +0100 Subject: [PATCH 3/3] 1661922 - new net-snmp is not in stable yet, but new hplip is - build with with old net-snmp for now --- hplip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hplip.spec b/hplip.spec index f73d3bd..48064b5 100644 --- a/hplip.spec +++ b/hplip.spec @@ -7,7 +7,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.18.6 -Release: 11%{?dist} +Release: 12%{?dist} License: GPLv2+ and MIT and BSD and IJG and Public Domain and GPLv2+ with exceptions and ISC Url: https://developers.hp.com/hp-linux-imaging-and-printing @@ -567,6 +567,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop %config(noreplace) %{_sysconfdir}/sane.d/dll.d/hpaio %changelog +* Wed Jan 02 2019 Zdenek Dohnal - 3.18.6-12 +- 1661922 - new net-snmp is not in stable yet, but new hplip is - build with with old net-snmp for now + * Mon Dec 03 2018 Zdenek Dohnal - 3.18.6-11 - Built with new net-snmp