summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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.patch18
-rw-r--r--meta/recipes-support/gnupg/gnupg_2.4.2.bb (renamed from meta/recipes-support/gnupg/gnupg_2.4.0.bb)2
3 files changed, 13 insertions, 13 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 0cd4c45907..81aeaf5d3a 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 346a6b17a07b658954db65f814461b59824d9fcd Mon Sep 17 00:00:00 2001 1From 8b9e3d286e87bc978ec6bb9cfd790d8d253b79c3 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 099c6a8..e8cf408 100644 17index a547401..60bc2c5 100644
18--- a/configure.ac 18--- a/configure.ac
19+++ b/configure.ac 19+++ b/configure.ac
20@@ -1935,7 +1935,7 @@ AC_DEFINE_UNQUOTED(GPGCONF_DISP_NAME, "GPGConf", 20@@ -1922,7 +1922,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 071dd93ff5..f7dd12fbcc 100644
--- a/meta/recipes-support/gnupg/gnupg/relocate.patch
+++ b/meta/recipes-support/gnupg/gnupg/relocate.patch
@@ -1,4 +1,4 @@
1From b1117adeb476304ce2792814516a5b7cd44d0d38 Mon Sep 17 00:00:00 2001 1From c4ddea8e6070d1df51058aac08088e27c37e7e73 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
@@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <alex@linutronix.de>
14 1 file changed, 7 insertions(+), 7 deletions(-) 14 1 file changed, 7 insertions(+), 7 deletions(-)
15 15
16diff --git a/common/homedir.c b/common/homedir.c 16diff --git a/common/homedir.c b/common/homedir.c
17index 67bbde8..7f360ba 100644 17index 286685f..212a945 100644
18--- a/common/homedir.c 18--- a/common/homedir.c
19+++ b/common/homedir.c 19+++ b/common/homedir.c
20@@ -1171,7 +1171,7 @@ gnupg_socketdir (void) 20@@ -1213,7 +1213,7 @@ gnupg_socketdir (void)
21 if (!name) 21 if (!name)
22 { 22 {
23 unsigned int dummy; 23 unsigned int dummy;
@@ -26,7 +26,7 @@ index 67bbde8..7f360ba 100644
26 gpgrt_annotate_leaked_object (name); 26 gpgrt_annotate_leaked_object (name);
27 } 27 }
28 28
29@@ -1203,7 +1203,7 @@ gnupg_sysconfdir (void) 29@@ -1245,7 +1245,7 @@ gnupg_sysconfdir (void)
30 if (dir) 30 if (dir)
31 return dir; 31 return dir;
32 else 32 else
@@ -35,7 +35,7 @@ index 67bbde8..7f360ba 100644
35 #endif /*!HAVE_W32_SYSTEM*/ 35 #endif /*!HAVE_W32_SYSTEM*/
36 } 36 }
37 37
38@@ -1239,7 +1239,7 @@ gnupg_bindir (void) 38@@ -1281,7 +1281,7 @@ gnupg_bindir (void)
39 return name; 39 return name;
40 } 40 }
41 else 41 else
@@ -44,7 +44,7 @@ index 67bbde8..7f360ba 100644
44 #endif /*!HAVE_W32_SYSTEM*/ 44 #endif /*!HAVE_W32_SYSTEM*/
45 } 45 }
46 46
47@@ -1266,7 +1266,7 @@ gnupg_libexecdir (void) 47@@ -1308,7 +1308,7 @@ gnupg_libexecdir (void)
48 return name; 48 return name;
49 } 49 }
50 else 50 else
@@ -53,7 +53,7 @@ index 67bbde8..7f360ba 100644
53 #endif /*!HAVE_W32_SYSTEM*/ 53 #endif /*!HAVE_W32_SYSTEM*/
54 } 54 }
55 55
56@@ -1296,7 +1296,7 @@ gnupg_libdir (void) 56@@ -1338,7 +1338,7 @@ gnupg_libdir (void)
57 return name; 57 return name;
58 } 58 }
59 else 59 else
@@ -62,7 +62,7 @@ index 67bbde8..7f360ba 100644
62 #endif /*!HAVE_W32_SYSTEM*/ 62 #endif /*!HAVE_W32_SYSTEM*/
63 } 63 }
64 64
65@@ -1327,7 +1327,7 @@ gnupg_datadir (void) 65@@ -1369,7 +1369,7 @@ gnupg_datadir (void)
66 return name; 66 return name;
67 } 67 }
68 else 68 else
@@ -71,7 +71,7 @@ index 67bbde8..7f360ba 100644
71 #endif /*!HAVE_W32_SYSTEM*/ 71 #endif /*!HAVE_W32_SYSTEM*/
72 } 72 }
73 73
74@@ -1359,7 +1359,7 @@ gnupg_localedir (void) 74@@ -1401,7 +1401,7 @@ gnupg_localedir (void)
75 return name; 75 return name;
76 } 76 }
77 else 77 else
diff --git a/meta/recipes-support/gnupg/gnupg_2.4.0.bb b/meta/recipes-support/gnupg/gnupg_2.4.2.bb
index 900aa8ad73..580782037e 100644
--- a/meta/recipes-support/gnupg/gnupg_2.4.0.bb
+++ b/meta/recipes-support/gnupg/gnupg_2.4.2.bb
@@ -23,7 +23,7 @@ SRC_URI:append:class-native = " file://0001-configure.ac-use-a-custom-value-for-
23 file://relocate.patch" 23 file://relocate.patch"
24SRC_URI:append:class-nativesdk = " file://relocate.patch" 24SRC_URI:append:class-nativesdk = " file://relocate.patch"
25 25
26SRC_URI[sha256sum] = "1d79158dd01d992431dd2e3facb89fdac97127f89784ea2cb610c600fb0c1483" 26SRC_URI[sha256sum] = "97eb47df8ae5a3ff744f868005a090da5ab45cb48ee9836dbf5ee739a4e5cf49"
27 27
28EXTRA_OECONF = "--disable-ldap \ 28EXTRA_OECONF = "--disable-ldap \
29 --disable-ccid-driver \ 29 --disable-ccid-driver \