CVS commit: pkgsrc/security/libassuan2

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Aug  9 12:02:45 UTC 2024

Modified Files:
        pkgsrc/security/libassuan2: Makefile distinfo
Added Files:
        pkgsrc/security/libassuan2/patches: patch-config.h.in patch-configure

Log Message:
libassuan2: do not redefine putc_unlocked()


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/security/libassuan2/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/security/libassuan2/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/security/libassuan2/patches/patch-config.h.in
cvs rdiff -u -r0 -r1.3 pkgsrc/security/libassuan2/patches/patch-configure

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

Modified files:

Index: pkgsrc/security/libassuan2/Makefile
diff -u pkgsrc/security/libassuan2/Makefile:1.25 pkgsrc/security/libassuan2/Makefile:1.26
--- pkgsrc/security/libassuan2/Makefile:1.25    Fri Aug  9 03:53:22 2024
+++ pkgsrc/security/libassuan2/Makefile Fri Aug  9 12:02:45 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2024/08/09 03:53:22 ryoon Exp $
+# $NetBSD: Makefile,v 1.26 2024/08/09 12:02:45 adam Exp $
 
 DISTNAME=      libassuan-3.0.1
 CATEGORIES=    security
@@ -19,6 +19,6 @@ TEST_TARGET=          check
 
 CONFLICTS=     libassuan-1.*
 
-BUILDLINK_ABI_DEPENDS.libgpg-error+=   libgpg-error>=1.17
+BUILDLINK_API_DEPENDS.libgpg-error+=   libgpg-error>=1.17
 .include "../../security/libgpg-error/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/libassuan2/distinfo
diff -u pkgsrc/security/libassuan2/distinfo:1.24 pkgsrc/security/libassuan2/distinfo:1.25
--- pkgsrc/security/libassuan2/distinfo:1.24    Fri Aug  9 03:53:22 2024
+++ pkgsrc/security/libassuan2/distinfo Fri Aug  9 12:02:45 2024
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.24 2024/08/09 03:53:22 ryoon Exp $
+$NetBSD: distinfo,v 1.25 2024/08/09 12:02:45 adam Exp $
 
 BLAKE2s (libassuan-3.0.1.tar.bz2) = 434ecf3d4099e9d28af327a8c3c3c5501adc36f0044c80233b1a4e8caa872d1d
 SHA512 (libassuan-3.0.1.tar.bz2) = 6914a02c20053bae0fc4c29c5c40655f1cec711983d57fa85e46df34e90b10e33d31256dd50ae7c7faa8d8d750a529bf9072da0cda3bdd77ebfedbc0e26e5e16
 Size (libassuan-3.0.1.tar.bz2) = 592430 bytes
+SHA1 (patch-config.h.in) = 2fbc3543620930d7be7ab87cbea981e0825f833d
+SHA1 (patch-configure) = 3c2c095aed1a12865e05b9f4f141f0da89634f83
 SHA1 (patch-src_assuan-socket.c) = f4f9301a35c2fc8f399d50b91dc84216f4059465
 SHA1 (patch-src_assuan-uds.c) = 62d935c5fad5eb5bbc6721f89681b7be724c4916

Added files:

Index: pkgsrc/security/libassuan2/patches/patch-config.h.in
diff -u /dev/null pkgsrc/security/libassuan2/patches/patch-config.h.in:1.1
--- /dev/null   Fri Aug  9 12:02:45 2024
+++ pkgsrc/security/libassuan2/patches/patch-config.h.in        Fri Aug  9 12:02:45 2024
@@ -0,0 +1,17 @@
+$NetBSD: patch-config.h.in,v 1.1 2024/08/09 12:02:45 adam Exp $
+
+Check if putc_unlocked(); Fixes "duplicate symbol '___sputc'" on Darwin.
+https://dev.gnupg.org/T7246
+
+--- config.h.in.orig   2024-08-09 11:52:53.288428556 +0000
++++ config.h.in
+@@ -49,6 +49,9 @@
+ /* Define to 1 if you have the `getrlimit' function. */
+ #undef HAVE_GETRLIMIT
+ 
++/* Define to 1 if you have the `putc_unlocked' function. */
++#undef HAVE_PUTC_UNLOCKED
++
+ /* Define to 1 if you have `inet_pton'. */
+ #undef HAVE_INET_PTON
+ 

Index: pkgsrc/security/libassuan2/patches/patch-configure
diff -u /dev/null pkgsrc/security/libassuan2/patches/patch-configure:1.3
--- /dev/null   Fri Aug  9 12:02:45 2024
+++ pkgsrc/security/libassuan2/patches/patch-configure  Fri Aug  9 12:02:45 2024
@@ -0,0 +1,20 @@
+$NetBSD: patch-configure,v 1.3 2024/08/09 12:02:45 adam Exp $
+
+Check if putc_unlocked(); Fixes "duplicate symbol '___sputc'" on Darwin.
+https://dev.gnupg.org/T7246
+
+--- configure.orig     2024-08-09 11:49:20.106366280 +0000
++++ configure
+@@ -15241,6 +15241,12 @@ then :
+   printf "%s\n" "#define HAVE_GETRLIMIT 1" >>confdefs.h
+ 
+ fi
++ac_fn_c_check_func "$LINENO" "putc_unlocked" "ac_cv_func_getrlimit"
++if test "x$ac_cv_func_getrlimit" = xyes
++then :
++  printf "%s\n" "#define HAVE_PUTC_UNLOCKED 1" >>confdefs.h
++
++fi
+ 
+ 
+ # If we didn't find inet_pton, it might be in -lsocket (which might