diff options
Diffstat (limited to 'meta/recipes-support')
-rw-r--r-- | meta/recipes-support/libgpg-error/libgpg-error/0001-core-Fix-regression-on-arm64-due-to-invalid-use-of-v.patch | 61 | ||||
-rw-r--r-- | meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch | 67 | ||||
-rw-r--r-- | meta/recipes-support/libgpg-error/libgpg-error_1.28.bb (renamed from meta/recipes-support/libgpg-error/libgpg-error_1.27.bb) | 7 |
3 files changed, 106 insertions, 29 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 new file mode 100644 index 0000000000..c35e7240b4 --- /dev/null +++ b/meta/recipes-support/libgpg-error/libgpg-error/0001-core-Fix-regression-on-arm64-due-to-invalid-use-of-v.patch | |||
@@ -0,0 +1,61 @@ | |||
1 | From 791177de023574223eddf7288eb7c5a0721ac623 Mon Sep 17 00:00:00 2001 | ||
2 | From: Werner Koch <wk@gnupg.org> | ||
3 | Date: Sun, 18 Mar 2018 17:39:43 +0100 | ||
4 | Subject: [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 | ||
7 | NULL. | ||
8 | -- | ||
9 | |||
10 | Fix | ||
11 | Suggested-by: Jakub Wilk <jwilk@jwilk.net> | ||
12 | |||
13 | Signed-off-by: Werner Koch <wk@gnupg.org> | ||
14 | |||
15 | Upstream-Status: Backport | ||
16 | |||
17 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
18 | |||
19 | --- | ||
20 | src/logging.c | 18 ++++++++++++++---- | ||
21 | 1 file changed, 14 insertions(+), 4 deletions(-) | ||
22 | |||
23 | diff --git a/src/logging.c b/src/logging.c | ||
24 | index 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 | -- | ||
60 | 2.7.4 | ||
61 | |||
diff --git a/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch b/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch index 9ffeedbe5a..3066613d42 100644 --- a/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch +++ b/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch | |||
@@ -1,15 +1,26 @@ | |||
1 | 1 | From ec309e20b5a27d42a5fb915c328d61e924ab5f19 Mon Sep 17 00:00:00 2001 | |
2 | # | 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
3 | # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher | 3 | Date: Thu, 29 Mar 2018 15:12:17 +0800 |
4 | # | 4 | Subject: [PATCH] support pkgconfig |
5 | 5 | ||
6 | Upstream-Status: Pending | 6 | Upstream-Status: Pending |
7 | 7 | ||
8 | Index: libgpg-error-1.17/configure.ac | 8 | Rebase to 1.28 |
9 | =================================================================== | 9 | |
10 | --- libgpg-error-1.17.orig/configure.ac | 10 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
11 | +++ libgpg-error-1.17/configure.ac | 11 | --- |
12 | @@ -529,6 +529,7 @@ AC_CONFIG_FILES([src/Makefile tests/Make | 12 | configure.ac | 1 + |
13 | src/Makefile.am | 4 ++- | ||
14 | src/gpg-error.m4 | 71 +++-------------------------------------------------- | ||
15 | src/gpg-error.pc.in | 11 +++++++++ | ||
16 | 4 files changed, 18 insertions(+), 69 deletions(-) | ||
17 | create mode 100644 src/gpg-error.pc.in | ||
18 | |||
19 | diff --git a/configure.ac b/configure.ac | ||
20 | index aca9300..f7794e9 100644 | ||
21 | --- a/configure.ac | ||
22 | +++ b/configure.ac | ||
23 | @@ -621,6 +621,7 @@ AC_CONFIG_FILES([src/Makefile tests/Makefile]) | ||
13 | AC_CONFIG_FILES([lang/Makefile lang/cl/Makefile lang/cl/gpg-error.asd]) | 24 | AC_CONFIG_FILES([lang/Makefile lang/cl/Makefile lang/cl/gpg-error.asd]) |
14 | AC_CONFIG_FILES([src/versioninfo.rc src/gpg-error.w32-manifest]) | 25 | AC_CONFIG_FILES([src/versioninfo.rc src/gpg-error.w32-manifest]) |
15 | AC_CONFIG_FILES([src/gpg-error-config], [chmod +x src/gpg-error-config]) | 26 | AC_CONFIG_FILES([src/gpg-error-config], [chmod +x src/gpg-error-config]) |
@@ -17,33 +28,33 @@ Index: libgpg-error-1.17/configure.ac | |||
17 | 28 | ||
18 | AC_OUTPUT | 29 | AC_OUTPUT |
19 | 30 | ||
20 | Index: libgpg-error-1.17/src/Makefile.am | 31 | diff --git a/src/Makefile.am b/src/Makefile.am |
21 | =================================================================== | 32 | index 268c2ab..95f8459 100644 |
22 | --- libgpg-error-1.17.orig/src/Makefile.am | 33 | --- a/src/Makefile.am |
23 | +++ libgpg-error-1.17/src/Makefile.am | 34 | +++ b/src/Makefile.am |
24 | @@ -75,6 +75,8 @@ nodist_include_HEADERS = gpg-error.h | 35 | @@ -87,6 +87,8 @@ bin_SCRIPTS = gpg-error-config |
25 | bin_SCRIPTS = gpg-error-config | 36 | nodist_bin_SCRIPTS = gpgrt-config |
26 | m4datadir = $(datadir)/aclocal | 37 | m4datadir = $(datadir)/aclocal |
27 | m4data_DATA = gpg-error.m4 | 38 | m4data_DATA = gpg-error.m4 gpgrt.m4 |
28 | +pkgconfigdir = $(libdir)/pkgconfig | 39 | +pkgconfigdir = $(libdir)/pkgconfig |
29 | +pkgconfig_DATA = gpg-error.pc | 40 | +pkgconfig_DATA = gpg-error.pc |
30 | 41 | ||
31 | EXTRA_DIST = mkstrtable.awk err-sources.h.in err-codes.h.in \ | 42 | EXTRA_DIST = mkstrtable.awk err-sources.h.in err-codes.h.in \ |
32 | mkerrnos.awk errnos.in README \ | 43 | mkerrnos.awk errnos.in README \ |
33 | @@ -82,7 +84,7 @@ EXTRA_DIST = mkstrtable.awk err-sources. | 44 | @@ -94,7 +96,7 @@ EXTRA_DIST = mkstrtable.awk err-sources.h.in err-codes.h.in \ |
34 | mkheader.c gpg-error.h.in mkw32errmap.c w32-add.h w32ce-add.h \ | 45 | mkheader.c gpg-error.h.in mkw32errmap.c w32-add.h w32ce-add.h \ |
35 | err-sources.h err-codes.h gpg-error-config.in gpg-error.m4 \ | 46 | err-sources.h err-codes.h gpg-error-config.in gpg-error.m4 gpgrt.m4 \ |
36 | gpg-error.vers gpg-error.def.in \ | 47 | gpg-error.vers gpg-error.def.in \ |
37 | - versioninfo.rc.in gpg-error.w32-manifest.in \ | 48 | - versioninfo.rc.in gpg-error.w32-manifest.in \ |
38 | + versioninfo.rc.in gpg-error.w32-manifest.in gpg-error.pc \ | 49 | + versioninfo.rc.in gpg-error.w32-manifest.in gpg-error.pc \ |
39 | $(lock_obj_pub) | 50 | $(lock_obj_pub) |
40 | 51 | ||
41 | BUILT_SOURCES = err-sources.h err-codes.h code-to-errno.h code-from-errno.h \ | 52 | BUILT_SOURCES = err-sources.h err-codes.h code-to-errno.h code-from-errno.h \ |
42 | Index: libgpg-error-1.17/src/gpg-error.m4 | 53 | diff --git a/src/gpg-error.m4 b/src/gpg-error.m4 |
43 | =================================================================== | 54 | index 60c88d8..2ef7e3e 100644 |
44 | --- libgpg-error-1.17.orig/src/gpg-error.m4 | 55 | --- a/src/gpg-error.m4 |
45 | +++ libgpg-error-1.17/src/gpg-error.m4 | 56 | +++ b/src/gpg-error.m4 |
46 | @@ -26,73 +26,13 @@ dnl is added to the gpg_config_script_wa | 57 | @@ -26,73 +26,13 @@ dnl is added to the gpg_config_script_warn variable. |
47 | dnl | 58 | dnl |
48 | AC_DEFUN([AM_PATH_GPG_ERROR], | 59 | AC_DEFUN([AM_PATH_GPG_ERROR], |
49 | [ AC_REQUIRE([AC_CANONICAL_HOST]) | 60 | [ AC_REQUIRE([AC_CANONICAL_HOST]) |
@@ -132,10 +143,11 @@ Index: libgpg-error-1.17/src/gpg-error.m4 | |||
132 | ifelse([$3], , :, [$3]) | 143 | ifelse([$3], , :, [$3]) |
133 | fi | 144 | fi |
134 | AC_SUBST(GPG_ERROR_CFLAGS) | 145 | AC_SUBST(GPG_ERROR_CFLAGS) |
135 | Index: libgpg-error-1.17/src/gpg-error.pc.in | 146 | diff --git a/src/gpg-error.pc.in b/src/gpg-error.pc.in |
136 | =================================================================== | 147 | new file mode 100644 |
148 | index 0000000..bc0b174 | ||
137 | --- /dev/null | 149 | --- /dev/null |
138 | +++ libgpg-error-1.17/src/gpg-error.pc.in | 150 | +++ b/src/gpg-error.pc.in |
139 | @@ -0,0 +1,11 @@ | 151 | @@ -0,0 +1,11 @@ |
140 | +prefix=@prefix@ | 152 | +prefix=@prefix@ |
141 | +exec_prefix=@exec_prefix@ | 153 | +exec_prefix=@exec_prefix@ |
@@ -148,3 +160,6 @@ Index: libgpg-error-1.17/src/gpg-error.pc.in | |||
148 | +Version: @VERSION@ | 160 | +Version: @VERSION@ |
149 | +Libs: -L${libdir} -lgpg-error | 161 | +Libs: -L${libdir} -lgpg-error |
150 | +Cflags: -I${includedir} | 162 | +Cflags: -I${includedir} |
163 | -- | ||
164 | 1.8.3.1 | ||
165 | |||
diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.27.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.28.bb index b74f079f5d..71f4c3a388 100644 --- a/meta/recipes-support/libgpg-error/libgpg-error_1.27.bb +++ b/meta/recipes-support/libgpg-error/libgpg-error_1.28.bb | |||
@@ -5,7 +5,7 @@ BUGTRACKER = "https://bugs.g10code.com/gnupg/index" | |||
5 | LICENSE = "GPLv2+ & LGPLv2.1+" | 5 | LICENSE = "GPLv2+ & LGPLv2.1+" |
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ | 6 | LIC_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=beae1e44d8d5c265d194760276033a7c \ | 8 | file://src/gpg-error.h.in;endline=23;md5=fc7423b56d5f7163a9a2acf9fe2f8d6b \ |
9 | file://src/init.c;endline=20;md5=872b2389fe9bae7ffb80d2b91225afbc" | 9 | file://src/init.c;endline=20;md5=872b2389fe9bae7ffb80d2b91225afbc" |
10 | 10 | ||
11 | 11 | ||
@@ -14,10 +14,11 @@ SECTION = "libs" | |||
14 | UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" | 14 | UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" |
15 | SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \ | 15 | SRC_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 \ | ||
17 | " | 18 | " |
18 | 19 | ||
19 | SRC_URI[md5sum] = "5217ef3e76a7275a2a3b569a12ddc989" | 20 | SRC_URI[md5sum] = "2b072f6194eb22d48cd4c7c77e59b5af" |
20 | SRC_URI[sha256sum] = "4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2" | 21 | SRC_URI[sha256sum] = "3edb957744905412f30de3e25da18682cbe509541e18cd3b8f9df695a075da49" |
21 | 22 | ||
22 | BINCONFIG = "${bindir}/gpg-error-config" | 23 | BINCONFIG = "${bindir}/gpg-error-config" |
23 | 24 | ||