Hello community, here is the log from the commit of package lxc for openSUSE:Factory checked in at 2020-08-20 22:28:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lxc (Old) and /work/SRC/openSUSE:Factory/.lxc.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lxc" Thu Aug 20 22:28:01 2020 rev:95 rq:827667 version:4.0.2 Changes: -------- --- /work/SRC/openSUSE:Factory/lxc/lxc.changes 2020-05-13 22:56:00.995001313 +0200 +++ /work/SRC/openSUSE:Factory/.lxc.new.3399/lxc.changes 2020-08-20 22:28:06.171960950 +0200 @@ -1,0 +2,8 @@ +Wed Jul 8 18:37:19 UTC 2020 - Johannes Kastl <[email protected]> + +- add patches from upstream: + * 0001-templates-lxc-download.in-fix-wrong-if-condition-use.patch + * 0002-templates-lxc-download.in-make-shellcheck-happy.patch + * 0003-templates-lxc-download.in-use-GPG-option-receive-key.patch + +------------------------------------------------------------------- New: ---- 0001-templates-lxc-download.in-fix-wrong-if-condition-use.patch 0002-templates-lxc-download.in-make-shellcheck-happy.patch 0003-templates-lxc-download.in-use-GPG-option-receive-key.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lxc.spec ++++++ --- /var/tmp/diff_new_pack.SLLGAp/_old 2020-08-20 22:28:07.359961506 +0200 +++ /var/tmp/diff_new_pack.SLLGAp/_new 2020-08-20 22:28:07.363961508 +0200 @@ -74,6 +74,10 @@ Recommends: build Recommends: criu >= 2.0 +Patch1: 0001-templates-lxc-download.in-fix-wrong-if-condition-use.patch +Patch2: 0002-templates-lxc-download.in-make-shellcheck-happy.patch +Patch3: 0003-templates-lxc-download.in-use-GPG-option-receive-key.patch + %description LXC is the well-known and heavily tested low-level Linux container runtime. @@ -130,6 +134,10 @@ %prep %setup +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 + %build ./autogen.sh %configure \ ++++++ 0001-templates-lxc-download.in-fix-wrong-if-condition-use.patch ++++++ >From 18e18d4c31d39f12c87044db6d2d2f03163c8171 Mon Sep 17 00:00:00 2001 From: Johannes Kastl <[email protected]> Date: Tue, 30 Jun 2020 18:51:20 +0200 Subject: [PATCH] templates/lxc-download.in: fix wrong if condition (use the result of the gpg command, not the result when executing the result of the gpg command) Signed-off-by: Johannes Kastl <[email protected]> --- templates/lxc-download.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/lxc-download.in b/templates/lxc-download.in index 58d063f4c..f69b18fd4 100644 --- a/templates/lxc-download.in +++ b/templates/lxc-download.in @@ -134,8 +134,8 @@ gpg_setup() { success= for _ in $(seq 3); do - if $(gpg --keyserver "${DOWNLOAD_KEYSERVER}" ${DOWNLOAD_GPG_PROXY:-} \ - --recv-keys "${DOWNLOAD_KEYID}" >/dev/null 2>&1); then + if gpg --keyserver "${DOWNLOAD_KEYSERVER}" ${DOWNLOAD_GPG_PROXY:-} \ + --recv-keys "${DOWNLOAD_KEYID}" >/dev/null 2>&1; then success=1 break fi -- 2.27.0 ++++++ 0002-templates-lxc-download.in-make-shellcheck-happy.patch ++++++ >From eb44984ae51bc17650c0ba82c0431a209be51631 Mon Sep 17 00:00:00 2001 From: Johannes Kastl <[email protected]> Date: Tue, 30 Jun 2020 18:55:15 +0200 Subject: [PATCH] templates/lxc-download.in: make shellcheck happy Signed-off-by: Johannes Kastl <[email protected]> --- templates/lxc-download.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/lxc-download.in b/templates/lxc-download.in index f69b18fd4..fbfca32bc 100644 --- a/templates/lxc-download.in +++ b/templates/lxc-download.in @@ -327,7 +327,7 @@ if ! command -V mktemp >/dev/null 2>&1; then DOWNLOAD_TEMP="${DOWNLOAD_TEMP}/tmp/lxc-download.$$" elif [ -n "${DOWNLOAD_TEMP}" ]; then mkdir -p "${DOWNLOAD_TEMP}" - DOWNLOAD_TEMP="$(mktemp -p ${DOWNLOAD_TEMP} -d)" + DOWNLOAD_TEMP="$(mktemp -p "${DOWNLOAD_TEMP}" -d)" else DOWNLOAD_TEMP="${DOWNLOAD_TEMP}$(mktemp -d)" fi -- 2.27.0 ++++++ 0003-templates-lxc-download.in-use-GPG-option-receive-key.patch ++++++ >From 409040e702f814a167aed5a0e833f4d5c67fd29d Mon Sep 17 00:00:00 2001 From: Johannes Kastl <[email protected]> Date: Tue, 30 Jun 2020 19:13:04 +0200 Subject: [PATCH] templates/lxc-download.in: use GPG option --receive-keys instead of --recv-keys Signed-off-by: Johannes Kastl <[email protected]> --- templates/lxc-download.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/lxc-download.in b/templates/lxc-download.in index fbfca32bc..4cb21299b 100644 --- a/templates/lxc-download.in +++ b/templates/lxc-download.in @@ -135,7 +135,7 @@ gpg_setup() { success= for _ in $(seq 3); do if gpg --keyserver "${DOWNLOAD_KEYSERVER}" ${DOWNLOAD_GPG_PROXY:-} \ - --recv-keys "${DOWNLOAD_KEYID}" >/dev/null 2>&1; then + --receive-keys "${DOWNLOAD_KEYID}" >/dev/null 2>&1; then success=1 break fi -- 2.27.0
