diff options
author | Tobias Geerinckx-Rice <me@tobias.gr> | 2018-05-01 03:45:03 +0200 |
---|---|---|
committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2018-05-01 03:45:17 +0200 |
commit | 5ecd5fefd0e9fb0965662f2094c16363325ba614 (patch) | |
tree | fcd81a7ad8bb5c43f11eca27d62b70c2d715bcd9 /gnu/packages | |
parent | 38e4d5956f8d585b1c0263a1a6c79e749d7e7c90 (diff) | |
download | gnu-guix-5ecd5fefd0e9fb0965662f2094c16363325ba614.tar gnu-guix-5ecd5fefd0e9fb0965662f2094c16363325ba614.tar.gz |
gnu: libgpg-error: Update to 1.29.
* gnu/packages/gnupg.scm (libgpg-error): Update to 1.29.
[source]: Remove upstreamed patch.
* gnu/packages/patches/libgpg-error-aarch64-logging-fix.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
Diffstat (limited to 'gnu/packages')
-rw-r--r-- | gnu/packages/gnupg.scm | 5 | ||||
-rw-r--r-- | gnu/packages/patches/libgpg-error-aarch64-logging-fix.patch | 58 |
2 files changed, 2 insertions, 61 deletions
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 17207e2173..df86ee2fc6 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -69,7 +69,7 @@ (define-public libgpg-error (package (name "libgpg-error") - (version "1.28") + (version "1.29") (source (origin (method url-fetch) @@ -77,8 +77,7 @@ version ".tar.bz2")) (sha256 (base32 - "0jfsfnh9bxlxiwxws60yah4ybjw2hshmvqp31pri4m4h8ivrbnry")) - (patches (search-patches "libgpg-error-aarch64-logging-fix.patch")))) + "1smihcrhkfy58kazjaigmfbagy52rw98fqfsv1x7ml8razx2dsgc")))) (build-system gnu-build-system) (home-page "https://gnupg.org") (synopsis "Library of error values for GnuPG components") diff --git a/gnu/packages/patches/libgpg-error-aarch64-logging-fix.patch b/gnu/packages/patches/libgpg-error-aarch64-logging-fix.patch deleted file mode 100644 index d848d639b2..0000000000 --- a/gnu/packages/patches/libgpg-error-aarch64-logging-fix.patch +++ /dev/null @@ -1,58 +0,0 @@ -https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=patch;h=791177de023574223eddf7288eb7c5a0721ac623 - -From 791177de023574223eddf7288eb7c5a0721ac623 Mon Sep 17 00:00:00 2001 -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> ---- - src/logging.c | 18 ++++++++++++++---- - 1 file changed, 14 insertions(+), 4 deletions(-) - -diff --git a/src/logging.c b/src/logging.c -index 1a4f620..d01f974 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); -+ } - } - - --- -2.8.0.rc3 - |