From 51395dbebd43411aa0a1e3f01ef995c1a919a736 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Fri, 9 Apr 2021 18:51:17 +0200 Subject: [PATCH] build: Change version tag also in getswdb.sh -- --- build-aux/getswdb.sh | 4 ++-- configure.ac | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build-aux/getswdb.sh b/build-aux/getswdb.sh index cd419f2bd..7d4b31eef 100755 --- a/build-aux/getswdb.sh +++ b/build-aux/getswdb.sh @@ -175,9 +175,9 @@ fi # to help detect rollback attacks. # if [ $skip_selfcheck = no ]; then - gnupg_ver=$(awk '$1=="gnupg22_ver" {print $2;exit}' swdb.lst) + gnupg_ver=$(awk '$1=="gnupg24_ver" {print $2;exit}' swdb.lst) if [ -z "$gnupg_ver" ]; then - echo "GnuPG 2.2 version missing in swdb.lst!" >&2 + echo "GnuPG 2.4 version info missing in swdb.lst!" >&2 exit 1 fi gnupg_ver_num=$(echo "$gnupg_ver" | cvtver) diff --git a/configure.ac b/configure.ac index 69d2f7798..215a6535f 100644 --- a/configure.ac +++ b/configure.ac @@ -51,7 +51,7 @@ m4_esyscmd([echo ]mym4_version[>VERSION]) AC_INIT([mym4_package],[mym4_version],[https://bugs.gnupg.org]) # When changing the SWDB tag please also adjust the hard coded tags in -# build-aux/speedo.mk and Makefile.am +# build-aux/speedo.mk, build-aux/getswdb.sh, and Makefile.am AC_DEFINE_UNQUOTED(GNUPG_SWDB_TAG, "gnupg24", [swdb tag for this branch]) NEED_GPGRT_VERSION=1.41