From 2c21ecd513c6d5b87f8f3656a3ea154a878ec571 Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Tue, 13 Nov 2018 18:15:10 +0100
Subject: [PATCH] 1641100 - Retrieval of signing keys for plugin verification
 should use a server pool

---
 hplip-keyserver.patch | 12 ++++++++++++
 hplip.spec            | 11 ++++++++++-
 2 files changed, 22 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 be47dba..8b225c4 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
@@ -58,6 +58,9 @@ Patch36: hplip-qmsgbox-typos.patch
 # it cannot silently end the loop (as it was sometimes used) - use 'return'
 # instead of raising StopIteration exception
 Patch37: hplip-stopiteration.patch
+# pgp.mit.edu keyserver got bad connection, so we need to have pool of keyservers
+# to choose (Bz#1641100, launchpad#1799212)
+Patch38: hplip-keyserver.patch
 
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 Requires: python3-pillow
@@ -286,6 +289,9 @@ rm prnt/hpcups/ErnieFilter.{cpp,h} prnt/hpijs/ernieplatform.h
 # 1645815 - hp-check --runtime crashes involving FileNotFoundError
 %patch37 -p1 -b .stopiteration
 
+# have pool of keyservers to choose
+%patch38 -p1 -b .keyserver
+
 sed -i.duplex-constraints \
     -e 's,\(UIConstraints.* \*Duplex\),//\1,' \
     prnt/drv/hpcups.drv.in
@@ -571,6 +577,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 <zdohnal@redhat.com> - 3.18.6-11
+- 1641100 - Retrieval of signing keys for plugin verification should use a server pool
+
 * Mon Nov 12 2018 Zdenek Dohnal <zdohnal@redhat.com> - 3.18.6-10
 - 1645815 - hp-check --runtime crashes involving FileNotFoundError