[pkgsrc/pkgsrc-2018Q1]: pkgsrc/security/libgpg-error Pullup ticket #5737 - re...

[bsiegert <bsiegert%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fc7a6cccb9ca
branches:  pkgsrc-2018Q1
changeset: 408471:fc7a6cccb9ca
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Wed Apr 11 11:50:11 2018 +0000

description:
Pullup ticket #5737 - requested by maya
security/libgpg-error: ARM build fix

Revisions pulled up:
- security/libgpg-error/Makefile                                1.61
- security/libgpg-error/distinfo                                1.36
- security/libgpg-error/patches/patch-src_logging.c             1.1

---
   Module Name:    pkgsrc
   Committed By:   maya
   Date:           Wed Apr 11 08:29:24 UTC 2018

   Modified Files:
           pkgsrc/security/libgpg-error: Makefile distinfo
   Added Files:
           pkgsrc/security/libgpg-error/patches: patch-src_logging.c

   Log Message:
   libgpg-error: Fix build error on ARM via upstream patch.

   PR pkg/53106, upstream fix noted by Matthias Peterman.
   Bump PKGREVISION.

diffstat:

 security/libgpg-error/Makefile                    |   4 +-
 security/libgpg-error/distinfo                    |   3 +-
 security/libgpg-error/patches/patch-src_logging.c |  35 +++++++++++++++++++++++
 3 files changed, 39 insertions(+), 3 deletions(-)

diffs (66 lines):

diff -r acf858021f51 -r fc7a6cccb9ca security/libgpg-error/Makefile
--- a/security/libgpg-error/Makefile    Wed Apr 11 11:49:12 2018 +0000
+++ b/security/libgpg-error/Makefile    Wed Apr 11 11:50:11 2018 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.59 2018/03/20 12:39:28 wiz Exp $
+# $NetBSD: Makefile,v 1.59.2.1 2018/04/11 11:50:11 bsiegert 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/
diff -r acf858021f51 -r fc7a6cccb9ca security/libgpg-error/distinfo
--- a/security/libgpg-error/distinfo    Wed Apr 11 11:49:12 2018 +0000
+++ b/security/libgpg-error/distinfo    Wed Apr 11 11:50:11 2018 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.35 2018/03/20 12:39:28 wiz Exp $
+$NetBSD: distinfo,v 1.35.2.1 2018/04/11 11:50:11 bsiegert 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
diff -r acf858021f51 -r fc7a6cccb9ca security/libgpg-error/patches/patch-src_logging.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/libgpg-error/patches/patch-src_logging.c Wed Apr 11 11:50:11 2018 +0000
@@ -0,0 +1,35 @@
+$NetBSD: patch-src_logging.c,v 1.1.2.2 2018/04/11 11:50:11 bsiegert Exp $
+
+From: Werner Koch <wk%gnupg.org@localhost>
+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@localhost>
+
+Signed-off-by: Werner Koch <wk%gnupg.org@localhost>
+
+--- 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);
++    }
+ }
+ 
+