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
cvs diff -r1.60 -r1.61 pkgsrc/security/libgpg-error/Makefile (expand / switch to unified diff)

--- 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,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.60 2018/04/04 08:08:54 jperkin Exp $ 1# $NetBSD: Makefile,v 1.61 2018/04/11 08:29:24 maya Exp $
2 2
3DISTNAME= libgpg-error-1.28 3DISTNAME= libgpg-error-1.28
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= security 5CATEGORIES= security
6MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/libgpg-error/ 6MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/libgpg-error/
7MASTER_SITES+= ftp://ftp.ring.gr.jp/pub/net/gnupg/libgpg-error/ 7MASTER_SITES+= ftp://ftp.ring.gr.jp/pub/net/gnupg/libgpg-error/
8MASTER_SITES+= ftp://mirror.switch.ch/mirror/gnupg/libgpg-error/ 8MASTER_SITES+= ftp://mirror.switch.ch/mirror/gnupg/libgpg-error/
9MASTER_SITES+= ftp://ftp.freenet.de/pub/ftp.gnupg.org/gcrypt/libgpg-error/ 9MASTER_SITES+= ftp://ftp.freenet.de/pub/ftp.gnupg.org/gcrypt/libgpg-error/
10EXTRACT_SUFX= .tar.bz2 10EXTRACT_SUFX= .tar.bz2
11 11
12MAINTAINER= minskim@NetBSD.org 12MAINTAINER= minskim@NetBSD.org
13HOMEPAGE= http://www.gnupg.org/ 13HOMEPAGE= http://www.gnupg.org/
14COMMENT= Definitions of common error values for all GnuPG components 14COMMENT= Definitions of common error values for all GnuPG components
15LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 15LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1
16 16
17USE_LIBTOOL= yes 17USE_LIBTOOL= yes
cvs diff -r1.35 -r1.36 pkgsrc/security/libgpg-error/distinfo (expand / switch to unified diff)

--- 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,9 +1,10 @@ @@ -1,9 +1,10 @@
1$NetBSD: distinfo,v 1.35 2018/03/20 12:39:28 wiz Exp $ 1$NetBSD: distinfo,v 1.36 2018/04/11 08:29:24 maya Exp $
2 2
3SHA1 (libgpg-error-1.28.tar.bz2) = 2b9baae264f3e82ebe00dcd10bae3f2d64232c10 3SHA1 (libgpg-error-1.28.tar.bz2) = 2b9baae264f3e82ebe00dcd10bae3f2d64232c10
4RMD160 (libgpg-error-1.28.tar.bz2) = 2ed66ada89612822ba3f639dd957892646fe81cd 4RMD160 (libgpg-error-1.28.tar.bz2) = 2ed66ada89612822ba3f639dd957892646fe81cd
5SHA512 (libgpg-error-1.28.tar.bz2) = 967e5e9930ca2bcd4cc790d69c907684500120c1363ed384a5540ccd4e9a387977c7352da03ff7e0feeacedf073131fc0db9eea9d097d0fbd389fd0bc9b5c209 5SHA512 (libgpg-error-1.28.tar.bz2) = 967e5e9930ca2bcd4cc790d69c907684500120c1363ed384a5540ccd4e9a387977c7352da03ff7e0feeacedf073131fc0db9eea9d097d0fbd389fd0bc9b5c209
6Size (libgpg-error-1.28.tar.bz2) = 862569 bytes 6Size (libgpg-error-1.28.tar.bz2) = 862569 bytes
7SHA1 (patch-doc_Makefile.in) = 39695ac1dc4601445f335979f3db0c8c2b53a095 7SHA1 (patch-doc_Makefile.in) = 39695ac1dc4601445f335979f3db0c8c2b53a095
8SHA1 (patch-src_estream.c) = 0502a55403062abeab22c83a6d919c57ff1c5d82 8SHA1 (patch-src_estream.c) = 0502a55403062abeab22c83a6d919c57ff1c5d82
9SHA1 (patch-src_gpg-error-config.in) = e22e99208192971f8c123d7ee9b22c5f615669e1 9SHA1 (patch-src_gpg-error-config.in) = e22e99208192971f8c123d7ee9b22c5f615669e1
 10SHA1 (patch-src_logging.c) = ea8fa46844a40fdde57ac26c43ec8d011c4a75b5
File Added: pkgsrc/security/libgpg-error/patches/Attic/patch-src_logging.c
$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);
+    }
 }