summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2018-05-09 13:24:21 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-15 10:56:49 +0100
commit6d8644569eba7ed309d62bea36ecb92be03a345e (patch)
treeb11f257f35903e2f46023b62b6cf0185173ba690 /meta
parent56e6f969f64d6dd79d1f4cc681711437edf49760 (diff)
downloadpoky-6d8644569eba7ed309d62bea36ecb92be03a345e.tar.gz
libgpg-error: Upgrade 1.28 -> 1.31
License-Update: Check 19 lines of gpg-error.h.in only, more lines are not representing license text Drop upstreamed patch (From OE-Core rev: 9d26c595f648a8375ac92c2923b1cce3a1217c53) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/libgpg-error/libgpg-error/0001-core-Fix-regression-on-arm64-due-to-invalid-use-of-v.patch61
-rw-r--r--meta/recipes-support/libgpg-error/libgpg-error_1.31.bb (renamed from meta/recipes-support/libgpg-error/libgpg-error_1.28.bb)10
2 files changed, 4 insertions, 67 deletions
diff --git a/meta/recipes-support/libgpg-error/libgpg-error/0001-core-Fix-regression-on-arm64-due-to-invalid-use-of-v.patch b/meta/recipes-support/libgpg-error/libgpg-error/0001-core-Fix-regression-on-arm64-due-to-invalid-use-of-v.patch
deleted file mode 100644
index c35e7240b4..0000000000
--- a/meta/recipes-support/libgpg-error/libgpg-error/0001-core-Fix-regression-on-arm64-due-to-invalid-use-of-v.patch
+++ /dev/null
@@ -1,61 +0,0 @@
1From 791177de023574223eddf7288eb7c5a0721ac623 Mon Sep 17 00:00:00 2001
2From: Werner Koch <wk@gnupg.org>
3Date: Sun, 18 Mar 2018 17:39:43 +0100
4Subject: [PATCH] core: Fix regression on arm64 due to invalid use of va_list.
5
6* src/logging.c (_gpgrt_log_printhex): Provide a dummy arg instead of
7NULL.
8--
9
10Fix
11Suggested-by: Jakub Wilk <jwilk@jwilk.net>
12
13Signed-off-by: Werner Koch <wk@gnupg.org>
14
15Upstream-Status: Backport
16
17Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
18
19---
20 src/logging.c | 18 ++++++++++++++----
21 1 file changed, 14 insertions(+), 4 deletions(-)
22
23diff --git a/src/logging.c b/src/logging.c
24index 1a4f620..d01f974 100644
25--- a/src/logging.c
26+++ b/src/logging.c
27@@ -1090,9 +1090,10 @@ _gpgrt_log_flush (void)
28
29
30 /* Print a hexdump of (BUFFER,LENGTH). With FMT passed as NULL print
31- * just the raw dump, with FMT being an empty string, print a trailing
32- * linefeed, otherwise print an entire debug line with the expanded
33- * FMT followed by a possible wrapped hexdump and a final LF. */
34+ * just the raw dump (in this case ARG_PTR is not used), with FMT
35+ * being an empty string, print a trailing linefeed, otherwise print
36+ * an entire debug line with the expanded FMT followed by a possible
37+ * wrapped hexdump and a final LF. */
38 void
39 _gpgrt_logv_printhex (const void *buffer, size_t length,
40 const char *fmt, va_list arg_ptr)
41@@ -1150,7 +1151,16 @@ _gpgrt_log_printhex (const void *buffer, size_t length,
42 va_end (arg_ptr);
43 }
44 else
45- _gpgrt_logv_printhex (buffer, length, NULL, NULL);
46+ {
47+ /* va_list is not necessary a pointer and thus we can't use NULL
48+ * because that would conflict with platforms using a straight
49+ * struct for it (e.g. arm64). We use a dummy variable instead;
50+ * the static is a simple way zero it out so to not get
51+ * complains about uninitialized use. */
52+ static va_list dummy_argptr;
53+
54+ _gpgrt_logv_printhex (buffer, length, NULL, dummy_argptr);
55+ }
56 }
57
58
59--
602.7.4
61
diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.28.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.31.bb
index 71f4c3a388..5dd861501e 100644
--- a/meta/recipes-support/libgpg-error/libgpg-error_1.28.bb
+++ b/meta/recipes-support/libgpg-error/libgpg-error_1.31.bb
@@ -5,7 +5,7 @@ BUGTRACKER = "https://bugs.g10code.com/gnupg/index"
5LICENSE = "GPLv2+ & LGPLv2.1+" 5LICENSE = "GPLv2+ & LGPLv2.1+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ 6LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
7 file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ 7 file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
8 file://src/gpg-error.h.in;endline=23;md5=fc7423b56d5f7163a9a2acf9fe2f8d6b \ 8 file://src/gpg-error.h.in;endline=19;md5=e9be7dd9dc7686d91b5421a091c212cc \
9 file://src/init.c;endline=20;md5=872b2389fe9bae7ffb80d2b91225afbc" 9 file://src/init.c;endline=20;md5=872b2389fe9bae7ffb80d2b91225afbc"
10 10
11 11
@@ -14,11 +14,9 @@ SECTION = "libs"
14UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" 14UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html"
15SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \ 15SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \
16 file://pkgconfig.patch \ 16 file://pkgconfig.patch \
17 file://0001-core-Fix-regression-on-arm64-due-to-invalid-use-of-v.patch \
18 " 17 "
19 18SRC_URI[md5sum] = "5cc6df0fea27832e9cdbafc60f51561b"
20SRC_URI[md5sum] = "2b072f6194eb22d48cd4c7c77e59b5af" 19SRC_URI[sha256sum] = "40d0a823c9329478063903192a1f82496083b277265904878f4bc09e0db7a4ef"
21SRC_URI[sha256sum] = "3edb957744905412f30de3e25da18682cbe509541e18cd3b8f9df695a075da49"
22 20
23BINCONFIG = "${bindir}/gpg-error-config" 21BINCONFIG = "${bindir}/gpg-error-config"
24 22
@@ -42,7 +40,7 @@ do_compile_prepend() {
42 mips*el) TUPLE=mipsel-unknown-linux-gnu ;; 40 mips*el) TUPLE=mipsel-unknown-linux-gnu ;;
43 mips*) TUPLE=mips-unknown-linux-gnu ;; 41 mips*) TUPLE=mips-unknown-linux-gnu ;;
44 x86_64) TUPLE=x86_64-pc-linux-gnu ;; 42 x86_64) TUPLE=x86_64-pc-linux-gnu ;;
45 *) TUPLE=${TARGET_ARCH}-unknown-linux-gnu ;; 43 *) TUPLE=${TARGET_ARCH}-unknown-linux-gnu ;;
46 esac 44 esac
47 45
48 if [ -n "$TARGET_FILE" ]; then 46 if [ -n "$TARGET_FILE" ]; then