diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2017-08-21 05:49:29 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-08-23 08:44:40 +0100 |
commit | f62d844424670967d2d40cd2afc96f5fc597bf1d (patch) | |
tree | 29b3027e7405a560e168beaf397cccdda4451e51 /meta/recipes-support/gnupg/gnupg/0004-autogen.sh-fix-find-version-for-beta-checking.patch | |
parent | 92a299a550b5b9c68c0285fdeb3d4c9defa0dede (diff) | |
download | openembedded-core-contrib-f62d844424670967d2d40cd2afc96f5fc597bf1d.tar.gz |
gnupg: 2.1.20 -> 2.1.23
1. COPYING.LIB: Rename to COPYING.LGPL3.
https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commit;h=3419a339d9c4e800bf30e9021e05982d8c1021c1
2. Rebase patches:
- pkgconfig.patch -> 0001
- use-pkgconfig-instead-of-npth-config.patch -> 0002
- dirmngr-uses-libgpg-error.patch -> 0003
- autogen.sh-fix-find-version-for-beta-checking.patch -> 0004
3. Fix gpg2 not found
...
dnf -vy makecache
|Cannot download 'http://192.168.7.1:33541': repomd.xml GPG signature
verification error: gpgme_engine_check_version() error: Invalid crypto
engine.
...
The upstream install gpg by default and no gpg2
...
commit a69464b0b6dac88b360a13d3faf19dd7f2a0e02b
Author: Werner Koch <wk@gnupg.org>
Date: Sat Aug 5 14:39:32 2017 +0200
gpg: Install gpg by default under the name gpg.
...
Add --enable-gpg-is-gpg2 to revert it.
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/gnupg/gnupg/0004-autogen.sh-fix-find-version-for-beta-checking.patch')
-rw-r--r-- | meta/recipes-support/gnupg/gnupg/0004-autogen.sh-fix-find-version-for-beta-checking.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/meta/recipes-support/gnupg/gnupg/0004-autogen.sh-fix-find-version-for-beta-checking.patch b/meta/recipes-support/gnupg/gnupg/0004-autogen.sh-fix-find-version-for-beta-checking.patch new file mode 100644 index 0000000000..dcd8582ca6 --- /dev/null +++ b/meta/recipes-support/gnupg/gnupg/0004-autogen.sh-fix-find-version-for-beta-checking.patch @@ -0,0 +1,34 @@ +From 914ae4a3f7529fb069467bf0ded57dd24ee2e763 Mon Sep 17 00:00:00 2001 +From: Wenzong Fan <wenzong.fan@windriver.com> +Date: Wed, 16 Aug 2017 11:23:22 +0800 +Subject: [PATCH 4/4] autogen.sh: fix find-version for beta checking + +find-version always assumes that gnupg is beta if autogen.sh is run +out of git-repo. This doesn't work for users whom just take release +tarball and re-run autoconf in their local build dir. + +Upstream-Status: Pending + +Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> + +Rebase to 2.1.23 +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + autogen.sh | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/autogen.sh b/autogen.sh +index e5ba5bf..05e0e11 100755 +--- a/autogen.sh ++++ b/autogen.sh +@@ -245,7 +245,6 @@ if [ "$myhost" = "find-version" ]; then + rvd=$((0x$(echo ${rev} | dd bs=1 count=4 2>/dev/null))) + else + ingit=no +- beta=yes + tmp="-unknown" + rev="0000000" + rvd="0" +-- +1.8.3.1 + |