diff options
-rw-r--r-- | meta/recipes-support/gnupg/gnupg/0001-fix-compile-failure-with-musl.patch | 8 | ||||
-rw-r--r-- | meta/recipes-support/gnupg/gnupg/relocate.patch | 18 | ||||
-rw-r--r-- | meta/recipes-support/gnupg/gnupg_2.5.2.bb (renamed from meta/recipes-support/gnupg/gnupg_2.5.1.bb) | 2 |
3 files changed, 14 insertions, 14 deletions
diff --git a/meta/recipes-support/gnupg/gnupg/0001-fix-compile-failure-with-musl.patch b/meta/recipes-support/gnupg/gnupg/0001-fix-compile-failure-with-musl.patch index 13c1a36366..ec99f4b10c 100644 --- a/meta/recipes-support/gnupg/gnupg/0001-fix-compile-failure-with-musl.patch +++ b/meta/recipes-support/gnupg/gnupg/0001-fix-compile-failure-with-musl.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 2e7534f3f7694ba426615b2061c235908097bb9b Mon Sep 17 00:00:00 2001 | 1 | From 81c222ea179ef73fcae4b50c56342bdad4787a28 Mon Sep 17 00:00:00 2001 |
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
3 | Date: Thu, 22 Aug 2024 15:31:16 +0800 | 3 | Date: Thu, 22 Aug 2024 15:31:16 +0800 |
4 | Subject: [PATCH] fix compile failure with musl | 4 | Subject: [PATCH] fix compile failure with musl |
@@ -20,7 +20,7 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | |||
20 | 1 file changed, 1 insertion(+) | 20 | 1 file changed, 1 insertion(+) |
21 | 21 | ||
22 | diff --git a/scd/app.c b/scd/app.c | 22 | diff --git a/scd/app.c b/scd/app.c |
23 | index 525950e..7180178 100644 | 23 | index ba7bb23..7d41e53 100644 |
24 | --- a/scd/app.c | 24 | --- a/scd/app.c |
25 | +++ b/scd/app.c | 25 | +++ b/scd/app.c |
26 | @@ -24,6 +24,7 @@ | 26 | @@ -24,6 +24,7 @@ |
@@ -29,5 +29,5 @@ index 525950e..7180178 100644 | |||
29 | #include <npth.h> | 29 | #include <npth.h> |
30 | +#include <unistd.h> | 30 | +#include <unistd.h> |
31 | 31 | ||
32 | #include "scdaemon.h" | 32 | #ifndef HAVE_W32_SYSTEM |
33 | #include "../common/exechelp.h" | 33 | #include <fcntl.h> /* F_SETFD F_GETFL F_SETFL O_NONBLOCK fcntl(2) */ |
diff --git a/meta/recipes-support/gnupg/gnupg/relocate.patch b/meta/recipes-support/gnupg/gnupg/relocate.patch index 6fcbc2d18f..08e70fb444 100644 --- a/meta/recipes-support/gnupg/gnupg/relocate.patch +++ b/meta/recipes-support/gnupg/gnupg/relocate.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 3c761174b0ec6f49f184f16a0b0eaade44264edc Mon Sep 17 00:00:00 2001 | 1 | From 93fef8f493ee66856ef02351da25583eea94202d 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 |
@@ -13,10 +13,10 @@ Signed-off-by: Alexander Kanavin <alex@linutronix.de> | |||
13 | 1 file changed, 7 insertions(+), 7 deletions(-) | 13 | 1 file changed, 7 insertions(+), 7 deletions(-) |
14 | 14 | ||
15 | diff --git a/common/homedir.c b/common/homedir.c | 15 | diff --git a/common/homedir.c b/common/homedir.c |
16 | index a73182e..9994a9a 100644 | 16 | index d26ddd9..24224c0 100644 |
17 | --- a/common/homedir.c | 17 | --- a/common/homedir.c |
18 | +++ b/common/homedir.c | 18 | +++ b/common/homedir.c |
19 | @@ -1439,7 +1439,7 @@ gnupg_socketdir (void) | 19 | @@ -1451,7 +1451,7 @@ gnupg_socketdir (void) |
20 | if (!name) | 20 | if (!name) |
21 | { | 21 | { |
22 | unsigned int dummy; | 22 | unsigned int dummy; |
@@ -25,7 +25,7 @@ index a73182e..9994a9a 100644 | |||
25 | gpgrt_annotate_leaked_object (name); | 25 | gpgrt_annotate_leaked_object (name); |
26 | } | 26 | } |
27 | 27 | ||
28 | @@ -1468,7 +1468,7 @@ gnupg_sysconfdir (void) | 28 | @@ -1480,7 +1480,7 @@ gnupg_sysconfdir (void) |
29 | if (dir) | 29 | if (dir) |
30 | return dir; | 30 | return dir; |
31 | else | 31 | else |
@@ -34,7 +34,7 @@ index a73182e..9994a9a 100644 | |||
34 | #endif /*!HAVE_W32_SYSTEM*/ | 34 | #endif /*!HAVE_W32_SYSTEM*/ |
35 | } | 35 | } |
36 | 36 | ||
37 | @@ -1504,7 +1504,7 @@ gnupg_bindir (void) | 37 | @@ -1516,7 +1516,7 @@ gnupg_bindir (void) |
38 | return name; | 38 | return name; |
39 | } | 39 | } |
40 | else | 40 | else |
@@ -43,7 +43,7 @@ index a73182e..9994a9a 100644 | |||
43 | #endif /*!HAVE_W32_SYSTEM*/ | 43 | #endif /*!HAVE_W32_SYSTEM*/ |
44 | } | 44 | } |
45 | 45 | ||
46 | @@ -1531,7 +1531,7 @@ gnupg_libexecdir (void) | 46 | @@ -1543,7 +1543,7 @@ gnupg_libexecdir (void) |
47 | return name; | 47 | return name; |
48 | } | 48 | } |
49 | else | 49 | else |
@@ -52,7 +52,7 @@ index a73182e..9994a9a 100644 | |||
52 | #endif /*!HAVE_W32_SYSTEM*/ | 52 | #endif /*!HAVE_W32_SYSTEM*/ |
53 | } | 53 | } |
54 | 54 | ||
55 | @@ -1561,7 +1561,7 @@ gnupg_libdir (void) | 55 | @@ -1573,7 +1573,7 @@ gnupg_libdir (void) |
56 | return name; | 56 | return name; |
57 | } | 57 | } |
58 | else | 58 | else |
@@ -61,7 +61,7 @@ index a73182e..9994a9a 100644 | |||
61 | #endif /*!HAVE_W32_SYSTEM*/ | 61 | #endif /*!HAVE_W32_SYSTEM*/ |
62 | } | 62 | } |
63 | 63 | ||
64 | @@ -1592,7 +1592,7 @@ gnupg_datadir (void) | 64 | @@ -1604,7 +1604,7 @@ gnupg_datadir (void) |
65 | return name; | 65 | return name; |
66 | } | 66 | } |
67 | else | 67 | else |
@@ -70,7 +70,7 @@ index a73182e..9994a9a 100644 | |||
70 | #endif /*!HAVE_W32_SYSTEM*/ | 70 | #endif /*!HAVE_W32_SYSTEM*/ |
71 | } | 71 | } |
72 | 72 | ||
73 | @@ -1624,7 +1624,7 @@ gnupg_localedir (void) | 73 | @@ -1636,7 +1636,7 @@ gnupg_localedir (void) |
74 | return name; | 74 | return name; |
75 | } | 75 | } |
76 | else | 76 | else |
diff --git a/meta/recipes-support/gnupg/gnupg_2.5.1.bb b/meta/recipes-support/gnupg/gnupg_2.5.2.bb index 080056f74c..64c63e31ce 100644 --- a/meta/recipes-support/gnupg/gnupg_2.5.1.bb +++ b/meta/recipes-support/gnupg/gnupg_2.5.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] = "8a34bb318499867962c939e156666ada93ed81f01926590ac68f3ff79178375e" | 27 | SRC_URI[sha256sum] = "7f404ccc6a58493fedc15faef59f3ae914831cff866a23f0bf9d66cfdd0fea29" |
28 | 28 | ||
29 | EXTRA_OECONF = "--disable-ldap \ | 29 | EXTRA_OECONF = "--disable-ldap \ |
30 | --disable-ccid-driver \ | 30 | --disable-ccid-driver \ |