CVS commit: pkgsrc/security/p11-kit

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sun Sep  2 07:49:51 UTC 2018

Modified Files:
        pkgsrc/security/p11-kit: Makefile distinfo
        pkgsrc/security/p11-kit/patches: patch-common_compat.c

Log Message:
p11-kit: Hide getauxval(). PR pkg/53387 (related to port-arm/53386)


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/security/p11-kit/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/security/p11-kit/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/security/p11-kit/patches/patch-common_compat.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/p11-kit/Makefile
diff -u pkgsrc/security/p11-kit/Makefile:1.10 pkgsrc/security/p11-kit/Makefile:1.11
--- pkgsrc/security/p11-kit/Makefile:1.10       Sun Aug 19 05:00:41 2018
+++ pkgsrc/security/p11-kit/Makefile    Sun Sep  2 07:49:51 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2018/08/19 05:00:41 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2018/09/02 07:49:51 tnn Exp $
 
 DISTNAME=      p11-kit-0.23.13
+PKGREVISION=   1
 CATEGORIES=    security
 #MASTER_SITES= http://p11-glue.freedesktop.org/releases/
 MASTER_SITES+= ${MASTER_SITE_GITHUB:=p11-glue/}

Index: pkgsrc/security/p11-kit/distinfo
diff -u pkgsrc/security/p11-kit/distinfo:1.7 pkgsrc/security/p11-kit/distinfo:1.8
--- pkgsrc/security/p11-kit/distinfo:1.7        Sun Aug 19 05:00:41 2018
+++ pkgsrc/security/p11-kit/distinfo    Sun Sep  2 07:49:51 2018
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.7 2018/08/19 05:00:41 wiz Exp $
+$NetBSD: distinfo,v 1.8 2018/09/02 07:49:51 tnn Exp $
 
 SHA1 (p11-kit-0.23.13.tar.gz) = 783fb69fabbc0fbc6569a3350f4bc553d95ecf2b
 RMD160 (p11-kit-0.23.13.tar.gz) = f7e9a7987dcec4a0fb96c01e3010aca61659f16c
 SHA512 (p11-kit-0.23.13.tar.gz) = bdf97867250fec20cf7e813bfe4ecee9d613ee0cf245fe5e97c0bc99446fa61e616756ce2785ae98cfd4fe55276ad6070828e1ef8ad154fac0e741ceb038a9c7
 Size (p11-kit-0.23.13.tar.gz) = 1264090 bytes
 SHA1 (patch-Makefile.in) = c7f26205c09537593a49dea33c05e1fd29e9dbc3
-SHA1 (patch-common_compat.c) = a0a41c6f95e1d6e70c058f42f7c55ce0eeaf4f43
+SHA1 (patch-common_compat.c) = 74d0bac6cbaabb4260ce512925d611d5d399a34f

Index: pkgsrc/security/p11-kit/patches/patch-common_compat.c
diff -u pkgsrc/security/p11-kit/patches/patch-common_compat.c:1.1 pkgsrc/security/p11-kit/patches/patch-common_compat.c:1.2
--- pkgsrc/security/p11-kit/patches/patch-common_compat.c:1.1   Wed Aug  1 19:18:19 2018
+++ pkgsrc/security/p11-kit/patches/patch-common_compat.c       Sun Sep  2 07:49:51 2018
@@ -1,10 +1,22 @@
-$NetBSD: patch-common_compat.c,v 1.1 2018/08/01 19:18:19 jperkin Exp $
+$NetBSD: patch-common_compat.c,v 1.2 2018/09/02 07:49:51 tnn Exp $
 
-Avoid /proc section on Darwin.
+- Hide getauxval() symbol because the implementation is incomplete
+  and breaks for example openssl on NetBSD/evbarm
+- Avoid /proc section on Darwin.
 
---- common/compat.c.orig       2018-05-30 13:40:36.000000000 +0000
+--- common/compat.c.orig       2018-08-10 09:54:46.000000000 +0000
 +++ common/compat.c
-@@ -910,6 +910,7 @@ fdwalk (int (* cb) (void *data, int fd),
+@@ -791,6 +791,9 @@ mkdtemp (char *template)
+ #ifndef HAVE_GETAUXVAL
+ 
+ unsigned long
++#if defined(__GNUC__) || defined(__clang__)
++__attribute__((visibility("hidden")))
++#endif
+ getauxval (unsigned long type)
+ {
+       static unsigned long secure = 0UL;
+@@ -912,6 +915,7 @@ fdwalk (int (* cb) (void *data, int fd),
        struct rlimit rl;
  #endif
  
@@ -12,7 +24,7 @@ Avoid /proc section on Darwin.
        dir = opendir ("/proc/self/fd");
        if (dir != NULL) {
                while ((de = readdir (dir)) != NULL) {
-@@ -932,6 +933,7 @@ fdwalk (int (* cb) (void *data, int fd),
+@@ -934,6 +938,7 @@ fdwalk (int (* cb) (void *data, int fd),
                closedir (dir);
                return res;
        }