From 70e06afd07c26765c67db0fe46be098b26afaa6e Mon Sep 17 00:00:00 2001 From: Josef Schlehofer Date: Sat, 10 Jul 2021 16:33:08 +0200 Subject: [PATCH] lxc: add patch to switch GPG server By default, there was used sks-keyservers.net pool, which has invalid SSL certificate and they also announced that their service is deprecate and no longer maintained. Use the same GPG server as LXC is using by default in the newer releases. Signed-off-by: Josef Schlehofer --- utils/lxc/Makefile | 2 +- utils/lxc/patches/040-gpg.patch | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 utils/lxc/patches/040-gpg.patch diff --git a/utils/lxc/Makefile b/utils/lxc/Makefile index 7cdc8abe2..2713eaf26 100644 --- a/utils/lxc/Makefile +++ b/utils/lxc/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lxc PKG_VERSION:=4.0.5 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://linuxcontainers.org/downloads/lxc/ diff --git a/utils/lxc/patches/040-gpg.patch b/utils/lxc/patches/040-gpg.patch new file mode 100644 index 000000000..a08c8b8b0 --- /dev/null +++ b/utils/lxc/patches/040-gpg.patch @@ -0,0 +1,29 @@ +From 3efa0cf3455cbe330b4e79a647a57ad8e9cf3476 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?St=C3=A9phane=20Graber?= +Date: Sun, 27 Jun 2021 23:42:52 -0400 +Subject: [PATCH] lxc-download: Switch GPG server +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Stéphane Graber +--- + templates/lxc-download.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/templates/lxc-download.in ++++ b/templates/lxc-download.in +@@ -55,11 +55,11 @@ LXC_PATH= + LXC_ROOTFS= + + if [ -z "${DOWNLOAD_KEYSERVER:-}" ]; then +- DOWNLOAD_KEYSERVER="hkp://pool.sks-keyservers.net" ++ DOWNLOAD_KEYSERVER="hkp://keyserver.ubuntu.com" + + # Deal with GPG over http proxy + if [ -n "${http_proxy:-}" ]; then +- DOWNLOAD_KEYSERVER="hkp://p80.pool.sks-keyservers.net:80" ++ DOWNLOAD_KEYSERVER="hkp://keyserver.ubuntu.com:80" + DOWNLOAD_GPG_PROXY="--keyserver-options http-proxy=\"${http_proxy}\"" + fi + fi