diff options
-rw-r--r-- | meta/recipes-support/gnupg/gnupg/relocate.patch | 22 | ||||
-rw-r--r-- | meta/recipes-support/gnupg/gnupg_2.3.4.bb (renamed from meta/recipes-support/gnupg/gnupg_2.3.3.bb) | 2 |
2 files changed, 11 insertions, 13 deletions
diff --git a/meta/recipes-support/gnupg/gnupg/relocate.patch b/meta/recipes-support/gnupg/gnupg/relocate.patch index 53679bf1d9..74f48e9582 100644 --- a/meta/recipes-support/gnupg/gnupg/relocate.patch +++ b/meta/recipes-support/gnupg/gnupg/relocate.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 766d37fe9acd9fdaaff9c094635e06b50c5902d7 Mon Sep 17 00:00:00 2001 | 1 | From 1e34e1d477f843c0ee2f1a3fddc20201f0233e81 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,15 +8,16 @@ 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 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | 10 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> |
11 | |||
11 | --- | 12 | --- |
12 | common/homedir.c | 14 +++++++------- | 13 | common/homedir.c | 14 +++++++------- |
13 | 1 file changed, 7 insertions(+), 7 deletions(-) | 14 | 1 file changed, 7 insertions(+), 7 deletions(-) |
14 | 15 | ||
15 | diff --git a/common/homedir.c b/common/homedir.c | 16 | diff --git a/common/homedir.c b/common/homedir.c |
16 | index 455c188..55049db 100644 | 17 | index 174d961..f4c25fb 100644 |
17 | --- a/common/homedir.c | 18 | --- a/common/homedir.c |
18 | +++ b/common/homedir.c | 19 | +++ b/common/homedir.c |
19 | @@ -1155,7 +1155,7 @@ gnupg_socketdir (void) | 20 | @@ -1161,7 +1161,7 @@ gnupg_socketdir (void) |
20 | if (!name) | 21 | if (!name) |
21 | { | 22 | { |
22 | unsigned int dummy; | 23 | unsigned int dummy; |
@@ -25,7 +26,7 @@ index 455c188..55049db 100644 | |||
25 | gpgrt_annotate_leaked_object (name); | 26 | gpgrt_annotate_leaked_object (name); |
26 | } | 27 | } |
27 | 28 | ||
28 | @@ -1187,7 +1187,7 @@ gnupg_sysconfdir (void) | 29 | @@ -1193,7 +1193,7 @@ gnupg_sysconfdir (void) |
29 | if (dir) | 30 | if (dir) |
30 | return dir; | 31 | return dir; |
31 | else | 32 | else |
@@ -34,7 +35,7 @@ index 455c188..55049db 100644 | |||
34 | #endif /*!HAVE_W32_SYSTEM*/ | 35 | #endif /*!HAVE_W32_SYSTEM*/ |
35 | } | 36 | } |
36 | 37 | ||
37 | @@ -1223,7 +1223,7 @@ gnupg_bindir (void) | 38 | @@ -1229,7 +1229,7 @@ gnupg_bindir (void) |
38 | return name; | 39 | return name; |
39 | } | 40 | } |
40 | else | 41 | else |
@@ -43,7 +44,7 @@ index 455c188..55049db 100644 | |||
43 | #endif /*!HAVE_W32_SYSTEM*/ | 44 | #endif /*!HAVE_W32_SYSTEM*/ |
44 | } | 45 | } |
45 | 46 | ||
46 | @@ -1250,7 +1250,7 @@ gnupg_libexecdir (void) | 47 | @@ -1256,7 +1256,7 @@ gnupg_libexecdir (void) |
47 | return name; | 48 | return name; |
48 | } | 49 | } |
49 | else | 50 | else |
@@ -52,7 +53,7 @@ index 455c188..55049db 100644 | |||
52 | #endif /*!HAVE_W32_SYSTEM*/ | 53 | #endif /*!HAVE_W32_SYSTEM*/ |
53 | } | 54 | } |
54 | 55 | ||
55 | @@ -1280,7 +1280,7 @@ gnupg_libdir (void) | 56 | @@ -1286,7 +1286,7 @@ gnupg_libdir (void) |
56 | return name; | 57 | return name; |
57 | } | 58 | } |
58 | else | 59 | else |
@@ -61,7 +62,7 @@ index 455c188..55049db 100644 | |||
61 | #endif /*!HAVE_W32_SYSTEM*/ | 62 | #endif /*!HAVE_W32_SYSTEM*/ |
62 | } | 63 | } |
63 | 64 | ||
64 | @@ -1311,7 +1311,7 @@ gnupg_datadir (void) | 65 | @@ -1317,7 +1317,7 @@ gnupg_datadir (void) |
65 | return name; | 66 | return name; |
66 | } | 67 | } |
67 | else | 68 | else |
@@ -70,7 +71,7 @@ index 455c188..55049db 100644 | |||
70 | #endif /*!HAVE_W32_SYSTEM*/ | 71 | #endif /*!HAVE_W32_SYSTEM*/ |
71 | } | 72 | } |
72 | 73 | ||
73 | @@ -1343,7 +1343,7 @@ gnupg_localedir (void) | 74 | @@ -1349,7 +1349,7 @@ gnupg_localedir (void) |
74 | return name; | 75 | return name; |
75 | } | 76 | } |
76 | else | 77 | else |
@@ -79,6 +80,3 @@ index 455c188..55049db 100644 | |||
79 | #endif /*!HAVE_W32_SYSTEM*/ | 80 | #endif /*!HAVE_W32_SYSTEM*/ |
80 | } | 81 | } |
81 | 82 | ||
82 | -- | ||
83 | 2.20.1 | ||
84 | |||
diff --git a/meta/recipes-support/gnupg/gnupg_2.3.3.bb b/meta/recipes-support/gnupg/gnupg_2.3.4.bb index 5614ac6473..7faaffbc27 100644 --- a/meta/recipes-support/gnupg/gnupg_2.3.3.bb +++ b/meta/recipes-support/gnupg/gnupg_2.3.4.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] = "5789b86da6a1a6752efb38598f16a77af51170a8494039c3842b085032e8e937" | 27 | SRC_URI[sha256sum] = "f3468ecafb1d7f9ad7b51fd1db7aebf17ceb89d2efa8a05cf2f39b4d405402ae" |
28 | 28 | ||
29 | EXTRA_OECONF = "--disable-ldap \ | 29 | EXTRA_OECONF = "--disable-ldap \ |
30 | --disable-ccid-driver \ | 30 | --disable-ccid-driver \ |