rpms/hplip
6
0
Fork 0
Code Issues Pull Requests Releases Activity

add keyserver.ubuntu.com too (1821469)

Browse Source
This commit is contained in:
Zdenek Dohnal 2020-04-07 08:48:11 +02:00
parent 5cb03441e9
commit 16f1c5dbc9
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hplip-keyserver.patch
View File

@ -1,6 +1,6 @@
diff -up hplip-3.20.3/base/tui.py.keyserver hplip-3.20.3/base/tui.py diff -up hplip-3.20.3/base/tui.py.keyserver hplip-3.20.3/base/tui.py
--- hplip-3.20.3/base/tui.py.keyserver 2020-04-07 07:31:12.747293360 +0200 --- hplip-3.20.3/base/tui.py.keyserver 2020-03-10 09:01:53.000000000 +0100
+++ hplip-3.20.3/base/tui.py 2020-04-07 07:31:32.180113572 +0200 +++ hplip-3.20.3/base/tui.py 2020-04-07 08:44:44.319710001 +0200
@@ -241,6 +241,7 @@ class ProgressMeter(object): @@ -241,6 +241,7 @@ class ProgressMeter(object):
sys.stdout.write(y) sys.stdout.write(y)
@ -11,27 +11,28 @@ diff -up hplip-3.20.3/base/tui.py.keyserver hplip-3.20.3/base/tui.py
diff -up hplip-3.20.3/base/validation.py.keyserver hplip-3.20.3/base/validation.py diff -up hplip-3.20.3/base/validation.py.keyserver hplip-3.20.3/base/validation.py
--- hplip-3.20.3/base/validation.py.keyserver 2020-03-10 09:01:53.000000000 +0100 --- hplip-3.20.3/base/validation.py.keyserver 2020-03-10 09:01:53.000000000 +0100
+++ hplip-3.20.3/base/validation.py 2020-04-07 07:34:30.896467229 +0200 +++ hplip-3.20.3/base/validation.py 2020-04-07 08:45:46.657132415 +0200
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-#!/usr/bin/env python -#!/usr/bin/env python
+#!/usr/bin/python3 +#!/usr/bin/python3
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# #
# (c) Copyright 2015 HP Development Company, L.P. # (c) Copyright 2015 HP Development Company, L.P.
@@ -42,8 +42,10 @@ class DigiSign_Verification(object): @@ -42,8 +42,11 @@ class DigiSign_Verification(object):
class GPG_Verification(DigiSign_Verification): class GPG_Verification(DigiSign_Verification):
- def __init__(self, pgp_site = 'pgp.mit.edu', key = 0x4ABA2F66DBD5A95894910E0673D770CDA59047B9): - def __init__(self, pgp_site = 'pgp.mit.edu', key = 0x4ABA2F66DBD5A95894910E0673D770CDA59047B9):
- self.__pgp_site = pgp_site - self.__pgp_site = pgp_site
+ def __init__(self, keyservers = ['pgp.mit.edu', 'sks-keyservers.net', + def __init__(self, keyservers = ['pgp.mit.edu', 'sks-keyservers.net',
+ 'pool.sks-keyservers.net'], + 'pool.sks-keyservers.net',
+ 'keyserver.ubuntu.com'],
+ key = 0x4ABA2F66DBD5A95894910E0673D770CDA59047B9): + key = 0x4ABA2F66DBD5A95894910E0673D770CDA59047B9):
+ self.__keyservers = keyservers + self.__keyservers = keyservers
self.__key = key self.__key = key
self.__gpg = utils.which('gpg',True) self.__gpg = utils.which('gpg',True)
@@ -82,13 +84,18 @@ class GPG_Verification(DigiSign_Verifica @@ -82,13 +85,18 @@ class GPG_Verification(DigiSign_Verifica
def __acquire_gpg_key(self): def __acquire_gpg_key(self):

5
hplip.spec
View File

@ -7,7 +7,7 @@
Summary: HP Linux Imaging and Printing Project Summary: HP Linux Imaging and Printing Project
Name: hplip Name: hplip
Version: 3.20.3 Version: 3.20.3
Release: 3%{?dist} Release: 4%{?dist}
License: GPLv2+ and MIT and BSD and IJG and Public Domain and GPLv2+ with exceptions and ISC 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 Url: https://developers.hp.com/hp-linux-imaging-and-printing
@ -699,6 +699,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
%config(noreplace) %{_sysconfdir}/sane.d/dll.d/hpaio %config(noreplace) %{_sysconfdir}/sane.d/dll.d/hpaio
%changelog %changelog
* Tue Apr 07 2020 Zdenek Dohnal <zdohnal@redhat.com> - 3.20.3-4
- add keyserver.ubuntu.com too (1821469)
* Tue Apr 07 2020 Zdenek Dohnal <zdohnal@redhat.com> - 3.20.3-3 * Tue Apr 07 2020 Zdenek Dohnal <zdohnal@redhat.com> - 3.20.3-3
- 1821469 - use list of keyservers when trying to download gpg keys - 1821469 - use list of keyservers when trying to download gpg keys