From 6b444af7d201695dbcdf56b6a649fb063b45cbbf Mon Sep 17 00:00:00 2001
From: Robert Scheck <robert@fedoraproject.org>
Date: Sun, 2 Oct 2022 21:56:03 +0200
Subject: [PATCH] Switch to keys.openpgp.org

---
 .gitignore                               |   1 -
 D2CB120AB45957B721CD9596F4554567B91DE934 | 127 +++++++++++++++++++++++
 ethtool.spec                             |   5 +-
 sources                                  |   1 -
 4 files changed, 130 insertions(+), 4 deletions(-)
 create mode 100644 D2CB120AB45957B721CD9596F4554567B91DE934

diff --git a/.gitignore b/.gitignore
index 41f68fc..0a96ffa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/gpgkey-D2CB120AB45957B721CD9596F4554567B91DE934.gpg
 /ethtool-*.tar.*
diff --git a/D2CB120AB45957B721CD9596F4554567B91DE934 b/D2CB120AB45957B721CD9596F4554567B91DE934
new file mode 100644
index 0000000..dd488bf
--- /dev/null
+++ b/D2CB120AB45957B721CD9596F4554567B91DE934
@@ -0,0 +1,127 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+xsFNBF69o70BEADQ5d4FWhqMjvj6EKA5yqj8PPIMjpL+JIGLaWcx6EiZVYR9Eoow
+LdCbprkWejsBdHkRaUtsxCoc9LI9cBLSjAEm3MfKLyBLiW+53VXDsH/Yx7f87sza
+kTIz1w/l8dXYKqcUOaeJ9qOY0jqyFsKVqaIMN0dkhJOYM4tyOxaut1ykfu3Dwe1L
+L71fhakLSmdujX/O5MMFxZQdN2RYxgpWovmetkxsnFx6hI6sA1spQxYuJXXde6i1
+6A/iLgUygwg6uy0lMJNY02okTv5uMzq/j24iNedD5+CM8fC5OY+dr2xkFgn35qP7
+OTgWwGLsmseSJTfjKZssn3HTYIZpuv5Y/E5W5jg0oowQQZ7l7DUTDNsm2n0Xwvwl
+L5AzOet+01PJKoXXBftHLSov8l80YXPDOX8VXwWtA8oG97/pJDPG0WGODlaQTKiy
+susPG45e3jjy0ahtHP25T2Ubs0xp3p8eKRQ8J8NcrJDGDIyycN/JDRpwzfEHRIxo
+J+Fvtt+L8PVXvEHwxfA1Xs/e8mOKE3cmHhvFK47hEnLtqUWVu9jw1XSCtfns/h1s
+ifrMy3qm1AmL1dRWINpnzVa5V5snbEzA0Hti/J7aJyPcoNQw3Bi97XSUylT/X8T2
+2+bLtGa1HIjHlSfTn8B9skanBt9cH/DxaQVtOYLUvssS+h1ans4ReSFHxwARAQAB
+zR9NaWNoYWwgS3ViZWNlayA8bWlrZUBtay1zeXMuY3o+wsGOBBMBCAA4FiEE0ssS
+CrRZV7chzZWW9FVFZ7kd6TQFAl69pLACGwEFCwkIBwIGFQoJCAsCBBYCAwECHgEC
+F4AACgkQ9FVFZ7kd6TQNCg//a9OAoDsNPNeQcFgLxM7I+nG94HEUgH3FNqSHBsaR
+gVExA1tQC1YzSPyA4GsgPkZherabcJL5awZ9XZsAsQW9zn0nHLqz50SS0cTWnBUq
+/W64L3NdDtucqGXOqqqvBUljY8z/N0FnfOF4PP03mvm1uuxDAE2bEI6PMz+UjbFT
+L1/TfvIPayTC5gBM7KpakYVDnxDj1+uItmErKBMLyz8qgKeRIPC89h7tcrqalFwl
+kahNGFEi5f67kVI1ZR+5sCr4LXJ0ANqRw/g79Kk/ADXAx++ep766n1dkG+VkdaKY
+jhdnjZlR60WMulqDzrF4unFSbGoNgCiLcN3a+kP5lm0MRlRtXLllrDGPaR0ujO72
+221m+0+0SopVO1awUJRoD0TY48lL3hyjNy+tdCooFEyjCmvv4FiLfveDnSDDT67O
+75RONfM1w1kwcDZY5fKHKucTBN8ZLlZgLj15kAVUqoikS2z7NkxavE4dxjVFfh1G
+pFUK79b2kI9WGwGwUPrlzxGjh6RTTyCUL664EKXG28gIq3nmZfnEjxoqx4CbGsLI
+gHF6RoWPg86isl4uwSBUJjQBlUbutGPyWU5MD+KP6dStKlcZH/9ND7qMCfOrPsIy
+qkRP0YamCp+/1ZD6yjrJUgVvt5H67P0y9QLlbtQV4uusOoSqbnOaccp5wmCH5ojy
+c63NIk1pY2hhbCBLdWJlY2VrIDxta3ViZWNla0BzdXNlLmNvbT7CwY4EEwEIADgW
+IQTSyxIKtFlXtyHNlZb0VUVnuR3pNAUCXr2lJAIbAQULCQgHAgYVCgkICwIEFgID
+AQIeAQIXgAAKCRD0VUVnuR3pNNZgEACT8w5n2KcDvvkR7ePyu2654TApe3I8xsBD
+bU8okW8PIKGUmI2KX5La6+uSYkJ1tCaBK1TWEa4eqdWp1ZZW5fQ53l5ofBowxOVZ
+qieoKCoEJ8MoT8lCq77TJKwnKQ2QNhxcjLGjOrbaLrjrvZb4rpw263R/djo2AwPY
+yrye8dmfEHsysk7+0mtKhBRw2guJe9xkoyCDDvlvkPORBh23vP/rERHh68pw2G4R
+Zmx01G7WOHotaJneItaqbLI3B7IEma92N5Ql9WlWQKxYnDSmJ867uZh83hn5PMLH
+V8mbGhz4pcxtoALwe9DUCcFQi7vZP+QhdB6aGn9cOa5J8VqvYSvMRmQcW7HoP4bb
+yjHe7PFTsjtWPCLPKrPj8Om3g2psB8ll0lGVq7r4CWoCcxbmDusbQbUgNN0J7/pt
+P3mz6yucMxO/RqIIJacfhedpkYlbSe47K2dQgxHj7KQ9if23WVdwVKl6xknwyPHF
+2JoH3t+Dd5LGQpAs6lzcmjolyzQlV1DLqfaiZNDtPMWaELNLyFDq4HY0S6jOsX5h
+saZF5qW6ghj1T84RzpeIO/DJ4Pnm8Ii5iOpzqkjJx3gLwAlo7RPUVVPiiSfLs7V4
+UASEPKlBYZvw1ceYXt8i4y+87z0qopwHtA4L4QvSEgCa6vykYYw/JQTj8OvW+V+P
+b71D1lR3Ic0hTWljaGFsIEt1YmVjZWsgPG1rdWJlY2VrQHN1c2UuY3o+wsGRBBMB
+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
+fhGy2vPIn3wuZuneEjTLeTR7SA==
+=T0xz
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/ethtool.spec b/ethtool.spec
index 791cb5d..6b1700e 100644
--- a/ethtool.spec
+++ b/ethtool.spec
@@ -3,11 +3,12 @@ Name:           ethtool
 Epoch:          2
 Version:        5.19
 Release:        1%{?dist}
-License:        GPLv2
+# {json_print,qsfp,sff-common}.{c,h} are GPL-2.0-or-later, rest is GPL-2.0-only
+License:        GPL-2.0-only AND GPL-2.0-or-later
 URL:            https://www.kernel.org/pub/software/network/%{name}/
 Source0:        https://www.kernel.org/pub/software/network/%{name}/%{name}-%{version}.tar.xz
 Source1:        https://www.kernel.org/pub/software/network/%{name}/%{name}-%{version}.tar.sign
-Source2:        gpgkey-D2CB120AB45957B721CD9596F4554567B91DE934.gpg
+Source2:        https://keys.openpgp.org/vks/v1/by-fingerprint/D2CB120AB45957B721CD9596F4554567B91DE934
 BuildRequires:  gnupg2, xz
 BuildRequires:  gcc
 BuildRequires:  libmnl-devel
diff --git a/sources b/sources
index fe93983..91f1397 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
-SHA512 (gpgkey-D2CB120AB45957B721CD9596F4554567B91DE934.gpg) = e580d255c5e3f0dfc4f7af22dd5917e2cde47cabd85ae39372195d24c70f7e3bfea105c84e459320a070293ded4941b6dd8f6d8cd501dc2779774ea949665d7b
 SHA512 (ethtool-5.19.tar.xz) = 71103c6856a889161ef2bf81eadec69b2f3a84c94aa776d545f889dc1c55b91d566d3b7394dbd2cb70ed92ac19d5f26967b1f829c204f23831d1fb81a0464972
 SHA512 (ethtool-5.19.tar.sign) = 698d6406c771dd1e3b7c42bb656f0927a94fdffc861c3995db46517f5971f29eedb201130e8ac4446a3c5d824109f95b5f7d545b184e1106272d6d470f3318b7