CVS commit: pkgsrc/security/gnupg21

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Sat Aug 20 13:40:30 UTC 2016

Modified Files:
        pkgsrc/security/gnupg21: Makefile distinfo
Added Files:
        pkgsrc/security/gnupg21/patches: patch-tests_gpgscm_Makefile.in

Log Message:
Link gpgscm against libintl to fix build failures. Add required minimum
versions of libcrypt and libksba.

Reported by Andreas Kusalananda Kähäri in mail to pkgsrc-user.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/security/gnupg21/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/security/gnupg21/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/security/gnupg21/patches/patch-tests_gpgscm_Makefile.in

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

Modified files:

Index: pkgsrc/security/gnupg21/Makefile
diff -u pkgsrc/security/gnupg21/Makefile:1.22 pkgsrc/security/gnupg21/Makefile:1.23
--- pkgsrc/security/gnupg21/Makefile:1.22       Sat Jul 16 08:32:05 2016
+++ pkgsrc/security/gnupg21/Makefile    Sat Aug 20 13:40:30 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2016/07/16 08:32:05 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2016/08/20 13:40:30 bsiegert Exp $
 
 DISTNAME=      gnupg-2.1.14
 PKGNAME=       ${DISTNAME:S/gnupg-/gnupg21-/}
@@ -32,11 +32,14 @@ LDFLAGS.Darwin+=    -lresolv
 
 .include "options.mk"
 
+BUILDLINK_API_DEPENDS.libgcrypt+=      libgcrypt>=1.7
+.include "../../security/libgcrypt/buildlink3.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libgpg-error+=   libgpg-error>=1.24
 .include "../../security/libgpg-error/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libassuan+=      libassuan>=2.4.3
 .include "../../security/libassuan2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libksba+=                libksba>=1.3.4
 .include "../../security/libksba/buildlink3.mk"
 BUILDLINK_API_DEPENDS.npth+=           npth>=0.91
 .include "../../devel/npth/buildlink3.mk"

Index: pkgsrc/security/gnupg21/distinfo
diff -u pkgsrc/security/gnupg21/distinfo:1.9 pkgsrc/security/gnupg21/distinfo:1.10
--- pkgsrc/security/gnupg21/distinfo:1.9        Sat Jul 16 08:32:05 2016
+++ pkgsrc/security/gnupg21/distinfo    Sat Aug 20 13:40:30 2016
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2016/07/16 08:32:05 wiz Exp $
+$NetBSD: distinfo,v 1.10 2016/08/20 13:40:30 bsiegert Exp $
 
 SHA1 (gnupg-2.1.14.tar.bz2) = bc7609a3a0daf0ed0efb22f77b43e82f28e20e34
 RMD160 (gnupg-2.1.14.tar.bz2) = 22d1f1791133f48ab71e900617ad7fd13c8a4e0f
@@ -7,3 +7,4 @@ Size (gnupg-2.1.14.tar.bz2) = 5706058 by
 SHA1 (patch-dirmngr_Makefile.in) = fa74bcf4ea214945c64d383dff039ab938ae1446
 SHA1 (patch-dirmngr_ks-engine-ldap.c) = 3a7d96d877cd52bed66c481af83da99c517d3380
 SHA1 (patch-kbx_Makefile.in) = 58f7c3711744a42d40f580944fb768f7aaaf1b68
+SHA1 (patch-tests_gpgscm_Makefile.in) = 9251e0b4a124812ff8d6c859519cb5c7faa6b712

Added files:

Index: pkgsrc/security/gnupg21/patches/patch-tests_gpgscm_Makefile.in
diff -u /dev/null pkgsrc/security/gnupg21/patches/patch-tests_gpgscm_Makefile.in:1.1
--- /dev/null   Sat Aug 20 13:40:30 2016
+++ pkgsrc/security/gnupg21/patches/patch-tests_gpgscm_Makefile.in      Sat Aug 20 13:40:30 2016
@@ -0,0 +1,15 @@
+$NetBSD: patch-tests_gpgscm_Makefile.in,v 1.1 2016/08/20 13:40:30 bsiegert Exp $
+
+gpgscm needs libintl, at least on Darwin.
+
+--- tests/gpgscm/Makefile.in.orig      2016-08-20 13:25:51.000000000 +0000
++++ tests/gpgscm/Makefile.in
+@@ -458,7 +458,7 @@ gpgscm_SOURCES = main.c private.h ffi.c 
+ 
+ gpgscm_LDADD = $(LDADD) $(common_libs) \
+       $(NETLIBS) $(LIBICONV) $(LIBREADLINE) \
+-      $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS)
++      $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL)
+ 
+ t_child_SOURCES = t-child.c
+ all: all-am