The patch is now upstream and therefore removed. Signed-off-by: Clemens Gruber <clemens.gru...@pqgruber.com> --- ...ion-on-arm64-due-to-invalid-use-of-v.patch | 53 ------------------- patches/libgpg-error-1.28/series | 4 -- rules/libgpg-error.make | 4 +- 3 files changed, 2 insertions(+), 59 deletions(-) delete mode 100644 patches/libgpg-error-1.28/0001-core-Fix-regression-on-arm64-due-to-invalid-use-of-v.patch delete mode 100644 patches/libgpg-error-1.28/series
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 <w...@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 <jw...@jwilk.net> - -Signed-off-by: Werner Koch <w...@gnupg.org> -Signed-off-by: Baruch Siach <bar...@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 diff --git a/rules/libgpg-error.make b/rules/libgpg-error.make index 525ab0c7a..2a71ea042 100644 --- a/rules/libgpg-error.make +++ b/rules/libgpg-error.make @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_LIBGPG_ERROR) += libgpg-error # # Paths and names # -LIBGPG_ERROR_VERSION := 1.28 -LIBGPG_ERROR_MD5 := 2b072f6194eb22d48cd4c7c77e59b5af +LIBGPG_ERROR_VERSION := 1.31 +LIBGPG_ERROR_MD5 := 5cc6df0fea27832e9cdbafc60f51561b LIBGPG_ERROR := libgpg-error-$(LIBGPG_ERROR_VERSION) LIBGPG_ERROR_SUFFIX := tar.bz2 LIBGPG_ERROR_URL := \ -- 2.17.1 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de