Wed Apr 11 08:29:24 2018 UTC ()
libgpg-error: Fix build error on ARM via upstream patch.
PR pkg/53106, upstream fix noted by Matthias Peterman.
Bump PKGREVISION.
(maya)
diff -r1.60 -r1.61 pkgsrc/security/libgpg-error/Makefile
diff -r1.35 -r1.36 pkgsrc/security/libgpg-error/distinfo
diff -r0 -r1.1 pkgsrc/security/libgpg-error/patches/patch-src_logging.c
--- pkgsrc/security/libgpg-error/Makefile 2018/04/04 08:08:54 1.60
+++ pkgsrc/security/libgpg-error/Makefile 2018/04/11 08:29:24 1.61
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.60 2018/04/04 08:08:54 jperkin Exp $
+# $NetBSD: Makefile,v 1.61 2018/04/11 08:29:24 maya Exp $
DISTNAME= libgpg-error-1.28
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= security
MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/libgpg-error/
MASTER_SITES+= ftp://ftp.ring.gr.jp/pub/net/gnupg/libgpg-error/
--- pkgsrc/security/libgpg-error/distinfo 2018/03/20 12:39:28 1.35
+++ pkgsrc/security/libgpg-error/distinfo 2018/04/11 08:29:24 1.36
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.35 2018/03/20 12:39:28 wiz Exp $
+$NetBSD: distinfo,v 1.36 2018/04/11 08:29:24 maya Exp $
SHA1 (libgpg-error-1.28.tar.bz2) = 2b9baae264f3e82ebe00dcd10bae3f2d64232c10
RMD160 (libgpg-error-1.28.tar.bz2) = 2ed66ada89612822ba3f639dd957892646fe81cd
@@ -7,3 +7,4 @@
SHA1 (patch-doc_Makefile.in) = 39695ac1dc4601445f335979f3db0c8c2b53a095
SHA1 (patch-src_estream.c) = 0502a55403062abeab22c83a6d919c57ff1c5d82
SHA1 (patch-src_gpg-error-config.in) = e22e99208192971f8c123d7ee9b22c5f615669e1
+SHA1 (patch-src_logging.c) = ea8fa46844a40fdde57ac26c43ec8d011c4a75b5
$NetBSD: patch-src_logging.c,v 1.1 2018/04/11 08:29:24 maya Exp $
From: Werner Koch <wk@gnupg.org>
Date: Sun, 18 Mar 2018 16:39:43 +0000 (+0100)
Subject: 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.orig 2017-12-08 12:22:41.000000000 +0000
+++ src/logging.c
@@ -1150,7 +1150,16 @@ _gpgrt_log_printhex (const void *buffer,
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);
+ }
}