diff options
| author | Clemens Gruber <clemens.gruber@pqgruber.com> | 2018-07-18 17:44:52 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-07-23 09:15:31 +0200 |
| commit | 7722e22589b5a03023d76c72d135be96b8b52399 (patch) | |
| tree | 90bf69dd169527bf79229cb6c6b428c443264955 /patches | |
| parent | 6ad70dd76bcdc21b7ee04fd252e9c57e903ee561 (diff) | |
| download | ptxdist-7722e22589b5a03023d76c72d135be96b8b52399.tar.gz ptxdist-7722e22589b5a03023d76c72d135be96b8b52399.tar.xz | |
libgpg-error: version bump 1.28 -> 1.32
The patch is now upstream and therefore removed.
Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/libgpg-error-1.28/0001-core-Fix-regression-on-arm64-due-to-invalid-use-of-v.patch | 53 | ||||
| -rw-r--r-- | patches/libgpg-error-1.28/series | 4 |
2 files changed, 0 insertions, 57 deletions
diff --git a/patches/libgpg-error-1.28/0001-core-Fix-regression-on-arm64-due-to-invalid-use-of-v.patch b/patches/libgpg-error-1.28/0001-core-Fix-regression-on-arm64-due-to-invalid-use-of-v.patch deleted file mode 100644 index 8c7265a90..000000000 --- a/patches/libgpg-error-1.28/0001-core-Fix-regression-on-arm64-due-to-invalid-use-of-v.patch +++ /dev/null @@ -1,53 +0,0 @@ -From: Werner Koch <wk@gnupg.org> -Date: Sun, 18 Mar 2018 17:39:43 +0100 -Subject: [PATCH] core: Fix regression on arm64 due to invalid use of va_list. - -* src/logging.c (_gpgrt_log_printhex): Provide a dummy arg instead of -NULL. --- - -Fix -Suggested-by: Jakub Wilk <jwilk@jwilk.net> - -Signed-off-by: Werner Koch <wk@gnupg.org> -Signed-off-by: Baruch Siach <baruch@tkos.co.il> ---- - src/logging.c | 18 ++++++++++++++---- - 1 file changed, 14 insertions(+), 4 deletions(-) - -diff --git a/src/logging.c b/src/logging.c -index 1a4f6203d16d..d01f974e4545 100644 ---- a/src/logging.c -+++ b/src/logging.c -@@ -1090,9 +1090,10 @@ _gpgrt_log_flush (void) - - - /* Print a hexdump of (BUFFER,LENGTH). With FMT passed as NULL print -- * just the raw dump, with FMT being an empty string, print a trailing -- * linefeed, otherwise print an entire debug line with the expanded -- * FMT followed by a possible wrapped hexdump and a final LF. */ -+ * just the raw dump (in this case ARG_PTR is not used), with FMT -+ * being an empty string, print a trailing linefeed, otherwise print -+ * an entire debug line with the expanded FMT followed by a possible -+ * wrapped hexdump and a final LF. */ - void - _gpgrt_logv_printhex (const void *buffer, size_t length, - const char *fmt, va_list arg_ptr) -@@ -1150,7 +1151,16 @@ _gpgrt_log_printhex (const void *buffer, size_t length, - va_end (arg_ptr); - } - else -- _gpgrt_logv_printhex (buffer, length, NULL, NULL); -+ { -+ /* va_list is not necessary a pointer and thus we can't use NULL -+ * because that would conflict with platforms using a straight -+ * struct for it (e.g. arm64). We use a dummy variable instead; -+ * the static is a simple way zero it out so to not get -+ * complains about uninitialized use. */ -+ static va_list dummy_argptr; -+ -+ _gpgrt_logv_printhex (buffer, length, NULL, dummy_argptr); -+ } - } - - diff --git a/patches/libgpg-error-1.28/series b/patches/libgpg-error-1.28/series deleted file mode 100644 index d627f12d0..000000000 --- a/patches/libgpg-error-1.28/series +++ /dev/null @@ -1,4 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-core-Fix-regression-on-arm64-due-to-invalid-use-of-v.patch -# da99be1b79ee0b3994f2153e5ad33086 - git-ptx-patches magic |