diff options
author | Alexander Kanavin <alex@linutronix.de> | 2021-09-08 20:01:11 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-10-11 18:41:37 +0100 |
commit | 623a73cefd798da886aad6595a755d9b3282f030 (patch) | |
tree | 3f1514b8088c18aeacf1df3d81596ef87132a6d1 | |
parent | 8dfe2412da0a6939a8f2565d5d9a5a2d841c21ca (diff) | |
download | poky-623a73cefd798da886aad6595a755d9b3282f030.tar.gz |
gnupg: update 2.3.1 -> 2.3.2
Drop chunk from relocate.patch, the upstream code no longer exists.
(From OE-Core rev: 8f268f981d53615d8ac9ee3ee64d840dc7051ced)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
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-.patch | 6 | ||||
-rw-r--r-- | meta/recipes-support/gnupg/gnupg/relocate.patch | 39 | ||||
-rw-r--r-- | meta/recipes-support/gnupg/gnupg_2.3.2.bb (renamed from meta/recipes-support/gnupg/gnupg_2.3.1.bb) | 2 |
3 files changed, 19 insertions, 28 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 ecd6263626..a66a8e62b0 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 @@ | |||
1 | From 52ba9d34cd9317145ee8a93afd5d73dd0cbf3182 Mon Sep 17 00:00:00 2001 | 1 | From c873c85b1ee1c35ebbba0bc80c2352c64787a5fd Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Mon, 22 Jan 2018 18:00:21 +0200 | 3 | Date: Mon, 22 Jan 2018 18:00:21 +0200 |
4 | Subject: [PATCH] configure.ac: use a custom value for the location of | 4 | 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> | |||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | 14 | 1 file changed, 1 insertion(+), 1 deletion(-) |
15 | 15 | ||
16 | diff --git a/configure.ac b/configure.ac | 16 | diff --git a/configure.ac b/configure.ac |
17 | index 7a2d410..14a7203 100644 | 17 | index d03ea3b..a6dfa19 100644 |
18 | --- a/configure.ac | 18 | --- a/configure.ac |
19 | +++ b/configure.ac | 19 | +++ b/configure.ac |
20 | @@ -1841,7 +1841,7 @@ AC_DEFINE_UNQUOTED(GPGCONF_DISP_NAME, "GPGConf", | 20 | @@ -1958,7 +1958,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 9b0f0a8ce0..f9f38c2876 100644 --- a/meta/recipes-support/gnupg/gnupg/relocate.patch +++ b/meta/recipes-support/gnupg/gnupg/relocate.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From d6992692d1c36983b709fe1ff049cc91ef2c408a Mon Sep 17 00:00:00 2001 | 1 | From 5a68a37ae2649e0988965cfe3a63a0142f0182a1 Mon Sep 17 00:00:00 2001 |
2 | From: Ross Burton <ross.burton@intel.com> | 2 | From: Ross Burton <ross.burton@intel.com> |
3 | Date: Wed, 19 Sep 2018 14:44:40 +0100 | 3 | Date: Wed, 19 Sep 2018 14:44:40 +0100 |
4 | Subject: [PATCH] Allow the environment to override where gnupg looks for its | 4 | Subject: [PATCH] Allow the environment to override where gnupg looks for its |
@@ -8,23 +8,23 @@ Upstream-Status: Inappropriate [OE-specific] | |||
8 | Signed-off-by: Ross Burton <ross.burton@intel.com> | 8 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
9 | 9 | ||
10 | --- | 10 | --- |
11 | common/homedir.c | 16 ++++++++-------- | 11 | common/homedir.c | 14 +++++++------- |
12 | 1 file changed, 8 insertions(+), 8 deletions(-) | 12 | 1 file changed, 7 insertions(+), 7 deletions(-) |
13 | 13 | ||
14 | diff --git a/common/homedir.c b/common/homedir.c | 14 | diff --git a/common/homedir.c b/common/homedir.c |
15 | index 85e09c4..e1410e2 100644 | 15 | index 7969a2c..06b8016 100644 |
16 | --- a/common/homedir.c | 16 | --- a/common/homedir.c |
17 | +++ b/common/homedir.c | 17 | +++ b/common/homedir.c |
18 | @@ -788,7 +788,7 @@ gnupg_socketdir (void) | 18 | @@ -918,7 +918,7 @@ gnupg_socketdir (void) |
19 | if (!name) | 19 | if (!name) |
20 | { | 20 | { |
21 | unsigned int dummy; | 21 | unsigned int dummy; |
22 | - name = _gnupg_socketdir_internal (0, &dummy); | 22 | - name = _gnupg_socketdir_internal (0, &dummy); |
23 | + name = getenv("GNUPG_SOCKETDIR") ?: _gnupg_socketdir_internal (0, &dummy); | 23 | + name = getenv("GNUPG_SOCKETDIR") ?: _gnupg_socketdir_internal (0, &dummy); |
24 | gpgrt_annotate_leaked_object (name); | ||
24 | } | 25 | } |
25 | 26 | ||
26 | return name; | 27 | @@ -946,7 +946,7 @@ gnupg_sysconfdir (void) |
27 | @@ -814,7 +814,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 85e09c4..e1410e2 100644 | |||
33 | #endif /*!HAVE_W32_SYSTEM*/ | 33 | #endif /*!HAVE_W32_SYSTEM*/ |
34 | } | 34 | } |
35 | 35 | ||
36 | @@ -843,7 +843,7 @@ gnupg_bindir (void) | 36 | @@ -978,7 +978,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 85e09c4..e1410e2 100644 | |||
42 | #endif /*!HAVE_W32_SYSTEM*/ | 42 | #endif /*!HAVE_W32_SYSTEM*/ |
43 | } | 43 | } |
44 | 44 | ||
45 | @@ -856,7 +856,7 @@ gnupg_libexecdir (void) | 45 | @@ -991,7 +991,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,8 +51,8 @@ index 85e09c4..e1410e2 100644 | |||
51 | #endif /*!HAVE_W32_SYSTEM*/ | 51 | #endif /*!HAVE_W32_SYSTEM*/ |
52 | } | 52 | } |
53 | 53 | ||
54 | @@ -870,7 +870,7 @@ gnupg_libdir (void) | 54 | @@ -1008,7 +1008,7 @@ gnupg_libdir (void) |
55 | name = xstrconcat (w32_rootdir (), DIRSEP_S "lib" DIRSEP_S "gnupg", NULL); | 55 | } |
56 | return name; | 56 | return name; |
57 | #else /*!HAVE_W32_SYSTEM*/ | 57 | #else /*!HAVE_W32_SYSTEM*/ |
58 | - return GNUPG_LIBDIR; | 58 | - return GNUPG_LIBDIR; |
@@ -60,8 +60,8 @@ index 85e09c4..e1410e2 100644 | |||
60 | #endif /*!HAVE_W32_SYSTEM*/ | 60 | #endif /*!HAVE_W32_SYSTEM*/ |
61 | } | 61 | } |
62 | 62 | ||
63 | @@ -884,7 +884,7 @@ gnupg_datadir (void) | 63 | @@ -1026,7 +1026,7 @@ gnupg_datadir (void) |
64 | name = xstrconcat (w32_rootdir (), DIRSEP_S "share" DIRSEP_S "gnupg", NULL); | 64 | } |
65 | return name; | 65 | return name; |
66 | #else /*!HAVE_W32_SYSTEM*/ | 66 | #else /*!HAVE_W32_SYSTEM*/ |
67 | - return GNUPG_DATADIR; | 67 | - return GNUPG_DATADIR; |
@@ -69,8 +69,8 @@ index 85e09c4..e1410e2 100644 | |||
69 | #endif /*!HAVE_W32_SYSTEM*/ | 69 | #endif /*!HAVE_W32_SYSTEM*/ |
70 | } | 70 | } |
71 | 71 | ||
72 | @@ -900,7 +900,7 @@ gnupg_localedir (void) | 72 | @@ -1045,7 +1045,7 @@ gnupg_localedir (void) |
73 | NULL); | 73 | } |
74 | return name; | 74 | return name; |
75 | #else /*!HAVE_W32_SYSTEM*/ | 75 | #else /*!HAVE_W32_SYSTEM*/ |
76 | - return LOCALEDIR; | 76 | - return LOCALEDIR; |
@@ -78,12 +78,3 @@ index 85e09c4..e1410e2 100644 | |||
78 | #endif /*!HAVE_W32_SYSTEM*/ | 78 | #endif /*!HAVE_W32_SYSTEM*/ |
79 | } | 79 | } |
80 | 80 | ||
81 | @@ -971,7 +971,7 @@ gnupg_cachedir (void) | ||
82 | } | ||
83 | return dir; | ||
84 | #else /*!HAVE_W32_SYSTEM*/ | ||
85 | - return GNUPG_LOCALSTATEDIR "/cache/" PACKAGE_NAME; | ||
86 | + return getenv("GNUPG_LOCALSTATEDIR") ?: GNUPG_LOCALSTATEDIR "/cache/" PACKAGE_NAME; | ||
87 | #endif /*!HAVE_W32_SYSTEM*/ | ||
88 | } | ||
89 | |||
diff --git a/meta/recipes-support/gnupg/gnupg_2.3.1.bb b/meta/recipes-support/gnupg/gnupg_2.3.2.bb index 411ea9579d..f3b277b0a8 100644 --- a/meta/recipes-support/gnupg/gnupg_2.3.1.bb +++ b/meta/recipes-support/gnupg/gnupg_2.3.2.bb | |||
@@ -24,7 +24,7 @@ SRC_URI:append:class-native = " file://0001-configure.ac-use-a-custom-value-for- | |||
24 | file://relocate.patch" | 24 | file://relocate.patch" |
25 | SRC_URI:append:class-nativesdk = " file://relocate.patch" | 25 | SRC_URI:append:class-nativesdk = " file://relocate.patch" |
26 | 26 | ||
27 | SRC_URI[sha256sum] = "c498db346a9b9a4b399e514c8f56dfc0a888ce8f327f10376ff984452cd154ec" | 27 | SRC_URI[sha256sum] = "e1d953e0e296072fca284215103ef168885eaac596c4660c5039a36a83e3041b" |
28 | 28 | ||
29 | EXTRA_OECONF = "--disable-ldap \ | 29 | EXTRA_OECONF = "--disable-ldap \ |
30 | --disable-ccid-driver \ | 30 | --disable-ccid-driver \ |