summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2020-07-15 09:44:26 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-07-18 11:06:32 +0100
commit50e1649a320f2e631da9e6393efb8459fd979e88 (patch)
treeb4fcda5f85832a5e242df2192ba79d9e2f13f0f7
parent4b9a86f6fda935b294bdc792375f151e7087f333 (diff)
downloadpoky-50e1649a320f2e631da9e6393efb8459fd979e88.tar.gz
gnupg: upgrade 2.2.20 -> 2.2.21
(From OE-Core rev: 1aeb32228d92568e90f313a2a027c6790937eb8a) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch6
-rw-r--r--meta/recipes-support/gnupg/gnupg/relocate.patch20
-rw-r--r--meta/recipes-support/gnupg/gnupg_2.2.21.bb (renamed from meta/recipes-support/gnupg/gnupg_2.2.20.bb)3
3 files changed, 14 insertions, 15 deletions
diff --git a/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch b/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch
index 2c204e0245..0e78f5679e 100644
--- a/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch
+++ b/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch
@@ -1,4 +1,4 @@
1From e7ad11cf54475e455fdb84d118e4782961698567 Mon Sep 17 00:00:00 2001 1From 0e51c62706a8c54e90a2d98c5250ecc894c65182 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Mon, 22 Jan 2018 18:00:21 +0200 3Date: Mon, 22 Jan 2018 18:00:21 +0200
4Subject: [PATCH] configure.ac: use a custom value for the location of 4Subject: [PATCH] configure.ac: use a custom value for the location of
@@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
14 1 file changed, 1 insertion(+), 1 deletion(-) 14 1 file changed, 1 insertion(+), 1 deletion(-)
15 15
16diff --git a/configure.ac b/configure.ac 16diff --git a/configure.ac b/configure.ac
17index 919ab31..cd58fdb 100644 17index f3c9863..a57f559 100644
18--- a/configure.ac 18--- a/configure.ac
19+++ b/configure.ac 19+++ b/configure.ac
20@@ -1855,7 +1855,7 @@ AC_DEFINE_UNQUOTED(GPGCONF_DISP_NAME, "GPGConf", 20@@ -1856,7 +1856,7 @@ AC_DEFINE_UNQUOTED(GPGCONF_DISP_NAME, "GPGConf",
21 21
22 AC_DEFINE_UNQUOTED(GPGTAR_NAME, "gpgtar", [The name of the gpgtar tool]) 22 AC_DEFINE_UNQUOTED(GPGTAR_NAME, "gpgtar", [The name of the gpgtar tool])
23 23
diff --git a/meta/recipes-support/gnupg/gnupg/relocate.patch b/meta/recipes-support/gnupg/gnupg/relocate.patch
index e5a82aa76d..25732a8277 100644
--- a/meta/recipes-support/gnupg/gnupg/relocate.patch
+++ b/meta/recipes-support/gnupg/gnupg/relocate.patch
@@ -1,4 +1,4 @@
1From 59c077f32e81190955910cae02599c7a3edfa7fb Mon Sep 17 00:00:00 2001 1From 6e3b1d89758c3ee7072aeefa305ce5fe76f2e439 Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@intel.com> 2From: Ross Burton <ross.burton@intel.com>
3Date: Wed, 19 Sep 2018 14:44:40 +0100 3Date: Wed, 19 Sep 2018 14:44:40 +0100
4Subject: [PATCH] Allow the environment to override where gnupg looks for its 4Subject: [PATCH] Allow the environment to override where gnupg looks for its
@@ -12,10 +12,10 @@ Signed-off-by: Ross Burton <ross.burton@intel.com>
12 1 file changed, 8 insertions(+), 8 deletions(-) 12 1 file changed, 8 insertions(+), 8 deletions(-)
13 13
14diff --git a/common/homedir.c b/common/homedir.c 14diff --git a/common/homedir.c b/common/homedir.c
15index e9e75d0..19140aa 100644 15index 4b6e46e..58989b4 100644
16--- a/common/homedir.c 16--- a/common/homedir.c
17+++ b/common/homedir.c 17+++ b/common/homedir.c
18@@ -760,7 +760,7 @@ gnupg_socketdir (void) 18@@ -763,7 +763,7 @@ gnupg_socketdir (void)
19 if (!name) 19 if (!name)
20 { 20 {
21 unsigned int dummy; 21 unsigned int dummy;
@@ -24,7 +24,7 @@ index e9e75d0..19140aa 100644
24 } 24 }
25 25
26 return name; 26 return name;
27@@ -786,7 +786,7 @@ gnupg_sysconfdir (void) 27@@ -789,7 +789,7 @@ gnupg_sysconfdir (void)
28 } 28 }
29 return name; 29 return name;
30 #else /*!HAVE_W32_SYSTEM*/ 30 #else /*!HAVE_W32_SYSTEM*/
@@ -33,7 +33,7 @@ index e9e75d0..19140aa 100644
33 #endif /*!HAVE_W32_SYSTEM*/ 33 #endif /*!HAVE_W32_SYSTEM*/
34 } 34 }
35 35
36@@ -815,7 +815,7 @@ gnupg_bindir (void) 36@@ -818,7 +818,7 @@ gnupg_bindir (void)
37 else 37 else
38 return rdir; 38 return rdir;
39 #else /*!HAVE_W32_SYSTEM*/ 39 #else /*!HAVE_W32_SYSTEM*/
@@ -42,7 +42,7 @@ index e9e75d0..19140aa 100644
42 #endif /*!HAVE_W32_SYSTEM*/ 42 #endif /*!HAVE_W32_SYSTEM*/
43 } 43 }
44 44
45@@ -828,7 +828,7 @@ gnupg_libexecdir (void) 45@@ -831,7 +831,7 @@ gnupg_libexecdir (void)
46 #ifdef HAVE_W32_SYSTEM 46 #ifdef HAVE_W32_SYSTEM
47 return gnupg_bindir (); 47 return gnupg_bindir ();
48 #else /*!HAVE_W32_SYSTEM*/ 48 #else /*!HAVE_W32_SYSTEM*/
@@ -51,7 +51,7 @@ index e9e75d0..19140aa 100644
51 #endif /*!HAVE_W32_SYSTEM*/ 51 #endif /*!HAVE_W32_SYSTEM*/
52 } 52 }
53 53
54@@ -842,7 +842,7 @@ gnupg_libdir (void) 54@@ -845,7 +845,7 @@ gnupg_libdir (void)
55 name = xstrconcat (w32_rootdir (), DIRSEP_S "lib" DIRSEP_S "gnupg", NULL); 55 name = xstrconcat (w32_rootdir (), DIRSEP_S "lib" DIRSEP_S "gnupg", NULL);
56 return name; 56 return name;
57 #else /*!HAVE_W32_SYSTEM*/ 57 #else /*!HAVE_W32_SYSTEM*/
@@ -60,7 +60,7 @@ index e9e75d0..19140aa 100644
60 #endif /*!HAVE_W32_SYSTEM*/ 60 #endif /*!HAVE_W32_SYSTEM*/
61 } 61 }
62 62
63@@ -856,7 +856,7 @@ gnupg_datadir (void) 63@@ -859,7 +859,7 @@ gnupg_datadir (void)
64 name = xstrconcat (w32_rootdir (), DIRSEP_S "share" DIRSEP_S "gnupg", NULL); 64 name = xstrconcat (w32_rootdir (), DIRSEP_S "share" DIRSEP_S "gnupg", NULL);
65 return name; 65 return name;
66 #else /*!HAVE_W32_SYSTEM*/ 66 #else /*!HAVE_W32_SYSTEM*/
@@ -69,7 +69,7 @@ index e9e75d0..19140aa 100644
69 #endif /*!HAVE_W32_SYSTEM*/ 69 #endif /*!HAVE_W32_SYSTEM*/
70 } 70 }
71 71
72@@ -872,7 +872,7 @@ gnupg_localedir (void) 72@@ -875,7 +875,7 @@ gnupg_localedir (void)
73 NULL); 73 NULL);
74 return name; 74 return name;
75 #else /*!HAVE_W32_SYSTEM*/ 75 #else /*!HAVE_W32_SYSTEM*/
@@ -78,7 +78,7 @@ index e9e75d0..19140aa 100644
78 #endif /*!HAVE_W32_SYSTEM*/ 78 #endif /*!HAVE_W32_SYSTEM*/
79 } 79 }
80 80
81@@ -940,7 +940,7 @@ gnupg_cachedir (void) 81@@ -943,7 +943,7 @@ gnupg_cachedir (void)
82 } 82 }
83 return dir; 83 return dir;
84 #else /*!HAVE_W32_SYSTEM*/ 84 #else /*!HAVE_W32_SYSTEM*/
diff --git a/meta/recipes-support/gnupg/gnupg_2.2.20.bb b/meta/recipes-support/gnupg/gnupg_2.2.21.bb
index f754573c88..701d769e64 100644
--- a/meta/recipes-support/gnupg/gnupg_2.2.20.bb
+++ b/meta/recipes-support/gnupg/gnupg_2.2.21.bb
@@ -20,8 +20,7 @@ SRC_URI_append_class-native = " file://0001-configure.ac-use-a-custom-value-for-
20 file://relocate.patch" 20 file://relocate.patch"
21SRC_URI_append_class-nativesdk = " file://relocate.patch" 21SRC_URI_append_class-nativesdk = " file://relocate.patch"
22 22
23SRC_URI[md5sum] = "4ff88920cf52b35db0dedaee87bdbbb1" 23SRC_URI[sha256sum] = "61e83278fb5fa7336658a8b73ab26f379d41275bb1c7c6e694dd9f9a6e8e76ec"
24SRC_URI[sha256sum] = "04a7c9d48b74c399168ee8270e548588ddbe52218c337703d7f06373d326ca30"
25 24
26EXTRA_OECONF = "--disable-ldap \ 25EXTRA_OECONF = "--disable-ldap \
27 --disable-ccid-driver \ 26 --disable-ccid-driver \