From e9537739c60bb0777a03a2b54e69f4a8c6100bbba53e9e7d722a5b16926024a4 Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Tue, 14 Dec 2021 11:25:06 +0000 Subject: [PATCH 1/2] - Add build dependency on python-rpm-macros (bsc#1193718) - Replace pool.sks-keyservers.net by keys.openpgp.org (bsc#1193656) OBS-URL: https://build.opensuse.org/package/show/Printing/hplip?expand=0&rev=220 --- hplip-change-pgp-server.patch | 2 +- hplip.changes | 6 ++++++ hplip.spec | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/hplip-change-pgp-server.patch b/hplip-change-pgp-server.patch index 487b416..ef4ef50 100644 --- a/hplip-change-pgp-server.patch +++ b/hplip-change-pgp-server.patch @@ -7,7 +7,7 @@ Index: hplip-3.19.6/base/validation.py 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): ++ def __init__(self, pgp_site = 'keys.openpgp.org', key = 0x4ABA2F66DBD5A95894910E0673D770CDA59047B9): self.__pgp_site = pgp_site self.__key = key self.__gpg = utils.which('gpg',True) diff --git a/hplip.changes b/hplip.changes index 4d887ea..6f18d8f 100644 --- a/hplip.changes +++ b/hplip.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Dec 14 11:17:46 UTC 2021 - Martin Wilck + +- Add build dependency on python-rpm-macros (bsc#1193718) +- Replace pool.sks-keyservers.net by keys.openpgp.org (bsc#1193656) + ------------------------------------------------------------------- Sun Nov 7 15:43:43 UTC 2021 - Callum Farmer diff --git a/hplip.spec b/hplip.spec index 59d31f0..54b4392 100644 --- a/hplip.spec +++ b/hplip.spec @@ -104,6 +104,7 @@ BuildRequires: libtool BuildRequires: libusb-1_0-devel BuildRequires: net-snmp-devel BuildRequires: pkgconfig +BuildRequires: python-rpm-macros BuildRequires: readline-devel BuildRequires: sane-backends-devel BuildRequires: systemd-rpm-macros From eb72caee88bd9de6569e009b2cd51ea4b09158ab2b5e3cf1b6829e92d8038338 Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Tue, 14 Dec 2021 14:44:17 +0000 Subject: [PATCH 2/2] - Replace keys.openpgp.org with pgp.surf.nl (bsc#1193656) * gpg refuses to load the key from keys.openpgp.org. OBS-URL: https://build.opensuse.org/package/show/Printing/hplip?expand=0&rev=221 --- hplip-change-pgp-server.patch | 2 +- hplip.changes | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/hplip-change-pgp-server.patch b/hplip-change-pgp-server.patch index ef4ef50..e42254f 100644 --- a/hplip-change-pgp-server.patch +++ b/hplip-change-pgp-server.patch @@ -7,7 +7,7 @@ Index: hplip-3.19.6/base/validation.py class GPG_Verification(DigiSign_Verification): - def __init__(self, pgp_site = 'pgp.mit.edu', key = 0x4ABA2F66DBD5A95894910E0673D770CDA59047B9): -+ def __init__(self, pgp_site = 'keys.openpgp.org', key = 0x4ABA2F66DBD5A95894910E0673D770CDA59047B9): ++ def __init__(self, pgp_site = 'pgp.surf.nl', key = 0x4ABA2F66DBD5A95894910E0673D770CDA59047B9): self.__pgp_site = pgp_site self.__key = key self.__gpg = utils.which('gpg',True) diff --git a/hplip.changes b/hplip.changes index 6f18d8f..72d0d24 100644 --- a/hplip.changes +++ b/hplip.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Dec 14 14:43:11 UTC 2021 - Martin Wilck + +- Replace keys.openpgp.org with pgp.surf.nl (bsc#1193656) + * gpg refuses to load the key from keys.openpgp.org. + ------------------------------------------------------------------- Tue Dec 14 11:17:46 UTC 2021 - Martin Wilck