mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-03 01:40:07 +00:00
Code Issues Projects Releases Wiki Activity

gnupg: upgrade 2.2.20 -> 2.2.21

Browse Source 
(From OE-Core rev: 1aeb32228d92568e90f313a2a027c6790937eb8a)

(From OE-Core rev: 08186dd7594820dbb7e9c7f7385672917882b262)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 50e1649a32)
Signed-off-by: Armin Kuster <akuster@mvista.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2021-08-19 22:27:28 -07:00
parent ef3c563a4f
commit fa25ed8a6a
3 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch
+3 -3
View File
@@ -1,4 +1,4 @@
From e7ad11cf54475e455fdb84d118e4782961698567 Mon Sep 17 00:00:00 2001 From 0e51c62706a8c54e90a2d98c5250ecc894c65182 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com> From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Mon, 22 Jan 2018 18:00:21 +0200 Date: Mon, 22 Jan 2018 18:00:21 +0200
Subject: [PATCH] configure.ac: use a custom value for the location of Subject: [PATCH] configure.ac: use a custom value for the location of
@@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac diff --git a/configure.ac b/configure.ac
index 919ab31..cd58fdb 100644 index f3c9863..a57f559 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -1855,7 +1855,7 @@ AC_DEFINE_UNQUOTED(GPGCONF_DISP_NAME, "GPGConf", @@ -1856,7 +1856,7 @@ AC_DEFINE_UNQUOTED(GPGCONF_DISP_NAME, "GPGConf",
AC_DEFINE_UNQUOTED(GPGTAR_NAME, "gpgtar", [The name of the gpgtar tool]) AC_DEFINE_UNQUOTED(GPGTAR_NAME, "gpgtar", [The name of the gpgtar tool])
meta/recipes-support/gnupg/gnupg/relocate.patch
+10 -10
View File
@@ -1,4 +1,4 @@
From 59c077f32e81190955910cae02599c7a3edfa7fb Mon Sep 17 00:00:00 2001 From 6e3b1d89758c3ee7072aeefa305ce5fe76f2e439 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@intel.com> From: Ross Burton <ross.burton@intel.com>
Date: Wed, 19 Sep 2018 14:44:40 +0100 Date: Wed, 19 Sep 2018 14:44:40 +0100
Subject: [PATCH] Allow the environment to override where gnupg looks for its Subject: [PATCH] Allow the environment to override where gnupg looks for its
@@ -12,10 +12,10 @@ Signed-off-by: Ross Burton <ross.burton@intel.com>
1 file changed, 8 insertions(+), 8 deletions(-) 1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/common/homedir.c b/common/homedir.c diff --git a/common/homedir.c b/common/homedir.c
index e9e75d0..19140aa 100644 index 4b6e46e..58989b4 100644
--- a/common/homedir.c --- a/common/homedir.c
+++ b/common/homedir.c +++ b/common/homedir.c
@@ -760,7 +760,7 @@ gnupg_socketdir (void) @@ -763,7 +763,7 @@ gnupg_socketdir (void)
if (!name) if (!name)
{ {
unsigned int dummy; unsigned int dummy;
@@ -24,7 +24,7 @@ index e9e75d0..19140aa 100644
} }
return name; return name;
@@ -786,7 +786,7 @@ gnupg_sysconfdir (void) @@ -789,7 +789,7 @@ gnupg_sysconfdir (void)
} }
return name; return name;
#else /*!HAVE_W32_SYSTEM*/ #else /*!HAVE_W32_SYSTEM*/
@@ -33,7 +33,7 @@ index e9e75d0..19140aa 100644
#endif /*!HAVE_W32_SYSTEM*/ #endif /*!HAVE_W32_SYSTEM*/
} }
@@ -815,7 +815,7 @@ gnupg_bindir (void) @@ -818,7 +818,7 @@ gnupg_bindir (void)
else else
return rdir; return rdir;
#else /*!HAVE_W32_SYSTEM*/ #else /*!HAVE_W32_SYSTEM*/
@@ -42,7 +42,7 @@ index e9e75d0..19140aa 100644
#endif /*!HAVE_W32_SYSTEM*/ #endif /*!HAVE_W32_SYSTEM*/
} }
@@ -828,7 +828,7 @@ gnupg_libexecdir (void) @@ -831,7 +831,7 @@ gnupg_libexecdir (void)
#ifdef HAVE_W32_SYSTEM #ifdef HAVE_W32_SYSTEM
return gnupg_bindir (); return gnupg_bindir ();
#else /*!HAVE_W32_SYSTEM*/ #else /*!HAVE_W32_SYSTEM*/
@@ -51,7 +51,7 @@ index e9e75d0..19140aa 100644
#endif /*!HAVE_W32_SYSTEM*/ #endif /*!HAVE_W32_SYSTEM*/
} }
@@ -842,7 +842,7 @@ gnupg_libdir (void) @@ -845,7 +845,7 @@ gnupg_libdir (void)
name = xstrconcat (w32_rootdir (), DIRSEP_S "lib" DIRSEP_S "gnupg", NULL); name = xstrconcat (w32_rootdir (), DIRSEP_S "lib" DIRSEP_S "gnupg", NULL);
return name; return name;
#else /*!HAVE_W32_SYSTEM*/ #else /*!HAVE_W32_SYSTEM*/
@@ -60,7 +60,7 @@ index e9e75d0..19140aa 100644
#endif /*!HAVE_W32_SYSTEM*/ #endif /*!HAVE_W32_SYSTEM*/
} }
@@ -856,7 +856,7 @@ gnupg_datadir (void) @@ -859,7 +859,7 @@ gnupg_datadir (void)
name = xstrconcat (w32_rootdir (), DIRSEP_S "share" DIRSEP_S "gnupg", NULL); name = xstrconcat (w32_rootdir (), DIRSEP_S "share" DIRSEP_S "gnupg", NULL);
return name; return name;
#else /*!HAVE_W32_SYSTEM*/ #else /*!HAVE_W32_SYSTEM*/
@@ -69,7 +69,7 @@ index e9e75d0..19140aa 100644
#endif /*!HAVE_W32_SYSTEM*/ #endif /*!HAVE_W32_SYSTEM*/
} }
@@ -872,7 +872,7 @@ gnupg_localedir (void) @@ -875,7 +875,7 @@ gnupg_localedir (void)
NULL); NULL);
return name; return name;
#else /*!HAVE_W32_SYSTEM*/ #else /*!HAVE_W32_SYSTEM*/
@@ -78,7 +78,7 @@ index e9e75d0..19140aa 100644
#endif /*!HAVE_W32_SYSTEM*/ #endif /*!HAVE_W32_SYSTEM*/
} }
@@ -940,7 +940,7 @@ gnupg_cachedir (void) @@ -943,7 +943,7 @@ gnupg_cachedir (void)
} }
return dir; return dir;
#else /*!HAVE_W32_SYSTEM*/ #else /*!HAVE_W32_SYSTEM*/
meta/recipes-support/gnupg/gnupg_2.2.20.bb → meta/recipes-support/gnupg/gnupg_2.2.21.bb
+1 -2
View File
@@ -25,8 +25,7 @@ SRC_URI_append_class-native = " file://0001-configure.ac-use-a-custom-value-for-
file://relocate.patch" file://relocate.patch"
SRC_URI_append_class-nativesdk = " file://relocate.patch" SRC_URI_append_class-nativesdk = " file://relocate.patch"
SRC_URI[md5sum] = "4ff88920cf52b35db0dedaee87bdbbb1" SRC_URI[sha256sum] = "61e83278fb5fa7336658a8b73ab26f379d41275bb1c7c6e694dd9f9a6e8e76ec"
SRC_URI[sha256sum] = "04a7c9d48b74c399168ee8270e548588ddbe52218c337703d7f06373d326ca30"
EXTRA_OECONF = "--disable-ldap \ EXTRA_OECONF = "--disable-ldap \
--disable-ccid-driver \ --disable-ccid-driver \