CVS commit: pkgsrc/security/gnutls

["ng0" <ng0%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ng0
Date:           Wed Sep 18 15:27:05 UTC 2019

Modified Files:
        pkgsrc/security/gnutls: Makefile PLIST
Added Files:
        pkgsrc/security/gnutls: options.mk

Log Message:
security/gnutls: Add ability to link against libunbound for DANE support.


To generate a diff of this commit:
cvs rdiff -u -r1.199 -r1.200 pkgsrc/security/gnutls/Makefile
cvs rdiff -u -r1.65 -r1.66 pkgsrc/security/gnutls/PLIST
cvs rdiff -u -r0 -r1.1 pkgsrc/security/gnutls/options.mk

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

Modified files:

Index: pkgsrc/security/gnutls/Makefile
diff -u pkgsrc/security/gnutls/Makefile:1.199 pkgsrc/security/gnutls/Makefile:1.200
--- pkgsrc/security/gnutls/Makefile:1.199       Mon Sep 16 00:28:48 2019
+++ pkgsrc/security/gnutls/Makefile     Wed Sep 18 15:27:05 2019
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.199 2019/09/16 00:28:48 nia Exp $
+# $NetBSD: Makefile,v 1.200 2019/09/18 15:27:05 ng0 Exp $
 
 DISTNAME=      gnutls-3.6.9
+PKGREVISION=   1
 CATEGORIES=    security devel
 MASTER_SITES=  https://www.gnupg.org/ftp/gcrypt/gnutls/v3.6/
 EXTRACT_SUFX=  .tar.xz
@@ -31,6 +32,8 @@ CONFIGURE_ARGS+=              --enable-local-libopts
 CONFIGURE_ARGS.SunOS+=         --disable-hardware-acceleration
 CONFIGURE_ARGS.FreeBSD+=       ac_cv_type_max_align_t=yes
 
+.include "options.mk"
+
 TEST_TARGET=           check
 
 INFO_FILES=            yes

Index: pkgsrc/security/gnutls/PLIST
diff -u pkgsrc/security/gnutls/PLIST:1.65 pkgsrc/security/gnutls/PLIST:1.66
--- pkgsrc/security/gnutls/PLIST:1.65   Mon Sep 16 00:28:48 2019
+++ pkgsrc/security/gnutls/PLIST        Wed Sep 18 15:27:05 2019
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.65 2019/09/16 00:28:48 nia Exp $
+@comment $NetBSD: PLIST,v 1.66 2019/09/18 15:27:05 ng0 Exp $
 bin/certtool
+${PLIST.unbound}bin/danetool
 bin/gnutls-cli
 bin/gnutls-cli-debug
 bin/gnutls-serv
@@ -10,6 +11,7 @@ bin/srptool
 include/gnutls/abstract.h
 include/gnutls/compat.h
 include/gnutls/crypto.h
+${PLIST.dane}include/gnutls/dane.h
 include/gnutls/dtls.h
 include/gnutls/gnutls.h
 include/gnutls/gnutlsxx.h
@@ -36,10 +38,13 @@ info/gnutls-modauth.png
 info/gnutls-x509.png
 info/gnutls.info
 info/pkcs11-vision.png
+${PLIST.dane}lib/libgnutls-dane.la
 lib/libgnutls.la
 lib/libgnutlsxx.la
+${PLIST.dane}lib/pkgconfig/gnutls-dane.pc
 lib/pkgconfig/gnutls.pc
 man/man1/certtool.1
+${PLIST.dane}man/man1/danetool.1
 man/man1/gnutls-cli-debug.1
 man/man1/gnutls-cli.1
 man/man1/gnutls-serv.1

Added files:

Index: pkgsrc/security/gnutls/options.mk
diff -u /dev/null pkgsrc/security/gnutls/options.mk:1.1
--- /dev/null   Wed Sep 18 15:27:05 2019
+++ pkgsrc/security/gnutls/options.mk   Wed Sep 18 15:27:05 2019
@@ -0,0 +1,15 @@
+# $NetBSD: options.mk,v 1.1 2019/09/18 15:27:05 ng0 Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.gnutls
+PKG_SUPPORTED_OPTIONS= dane
+PLIST_VARS+=           dane
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mdane)
+.include "../../net/unbound/buildlink3.mk"
+CONFIGURE_ARGS+=       --enable-libdane
+PLIST.dane=            yes
+.else
+CONFIGURE_ARGS+=       --disable-libdane
+.endif