Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1715760806114080"
MIME-Version: 1.0
Date: Wed, 15 May 2024 08:13:26 +0000
From: "Nia Alarie" <nia@netbsd.org>
Subject: CVS commit: pkgsrc/security/gnutls
To: pkgsrc-changes@NetBSD.org
Reply-To: nia@netbsd.org
Message-Id: <20240515081326.0EAFFFA2C@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1715760806114080
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	nia
Date:		Wed May 15 08:13:25 UTC 2024

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

Log Message:
gnutls: Make pkcs11 optional.

pkcs11 and smart card support is rather unrelated to gnutls's core
goal of providing TLS support to applications, and may be unsuitable
e.g. on embedded devices


To generate a diff of this commit:
cvs rdiff -u -r1.249 -r1.250 pkgsrc/security/gnutls/Makefile
cvs rdiff -u -r1.81 -r1.82 pkgsrc/security/gnutls/PLIST
cvs rdiff -u -r1.50 -r1.51 pkgsrc/security/gnutls/buildlink3.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/security/gnutls/options.mk

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


--_----------=_1715760806114080
Content-Disposition: inline
Content-Length: 3193
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/security/gnutls/Makefile
diff -u pkgsrc/security/gnutls/Makefile:1.249 pkgsrc/security/gnutls/Makefile:1.250
--- pkgsrc/security/gnutls/Makefile:1.249	Wed Apr 10 10:13:17 2024
+++ pkgsrc/security/gnutls/Makefile	Wed May 15 08:13:25 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.249 2024/04/10 10:13:17 adam Exp $
+# $NetBSD: Makefile,v 1.250 2024/05/15 08:13:25 nia Exp $
 
 DISTNAME=	gnutls-3.8.5
 PKGREVISION=	1
@@ -108,8 +108,6 @@ BUILDLINK_API_DEPENDS.libtasn1+=	libtasn
 .include "../../security/libtasn1/buildlink3.mk"
 BUILDLINK_API_DEPENDS.nettle+=		nettle>=3.6
 .include "../../security/nettle/buildlink3.mk"
-BUILDLINK_API_DEPENDS.p11-kit+=	p11-kit>=0.23.1
-.include "../../security/p11-kit/buildlink3.mk"
 .include "../../textproc/libunistring/buildlink3.mk"
 .include "../../mk/readline.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/gnutls/PLIST
diff -u pkgsrc/security/gnutls/PLIST:1.81 pkgsrc/security/gnutls/PLIST:1.82
--- pkgsrc/security/gnutls/PLIST:1.81	Thu Mar 21 06:08:38 2024
+++ pkgsrc/security/gnutls/PLIST	Wed May 15 08:13:25 2024
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.81 2024/03/21 06:08:38 adam Exp $
+@comment $NetBSD: PLIST,v 1.82 2024/05/15 08:13:25 nia Exp $
 bin/certtool
 bin/gnutls-cli
 bin/gnutls-cli-debug
 bin/gnutls-serv
 bin/ocsptool
-bin/p11tool
+${PLIST.pkcs11}bin/p11tool
 bin/psktool
 include/gnutls/abstract.h
 include/gnutls/compat.h

Index: pkgsrc/security/gnutls/buildlink3.mk
diff -u pkgsrc/security/gnutls/buildlink3.mk:1.50 pkgsrc/security/gnutls/buildlink3.mk:1.51
--- pkgsrc/security/gnutls/buildlink3.mk:1.50	Wed Apr 10 10:13:17 2024
+++ pkgsrc/security/gnutls/buildlink3.mk	Wed May 15 08:13:25 2024
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.50 2024/04/10 10:13:17 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.51 2024/05/15 08:13:25 nia Exp $
 
 BUILDLINK_TREE+=	gnutls
 
@@ -14,7 +14,9 @@ BUILDLINK_PKGSRCDIR.gnutls?=	../../secur
 .include "../../security/libtasn1/buildlink3.mk"
 BUILDLINK_API_DEPENDS.nettle+=		nettle>=3.4.1
 .include "../../security/nettle/buildlink3.mk"
+.if ${PKG_BUILD_OPTIONS.gnutls:Mpkcs11}
 .include "../../security/p11-kit/buildlink3.mk"
+.endif
 .include "../../textproc/libunistring/buildlink3.mk"
 pkgbase := gnutls
 .include "../../mk/pkg-build-options.mk"

Index: pkgsrc/security/gnutls/options.mk
diff -u pkgsrc/security/gnutls/options.mk:1.6 pkgsrc/security/gnutls/options.mk:1.7
--- pkgsrc/security/gnutls/options.mk:1.6	Wed Feb 15 07:40:52 2023
+++ pkgsrc/security/gnutls/options.mk	Wed May 15 08:13:25 2024
@@ -1,7 +1,8 @@
-# $NetBSD: options.mk,v 1.6 2023/02/15 07:40:52 nikita Exp $
+# $NetBSD: options.mk,v 1.7 2024/05/15 08:13:25 nia Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gnutls
-PKG_SUPPORTED_OPTIONS=	dane
+PKG_SUPPORTED_OPTIONS=	dane pkcs11
+PKG_SUGGESTED_OPTIONS=	pkcs11
 
 .include "../../mk/bsd.options.mk"
 
@@ -12,3 +13,12 @@ PLIST_SRC+=		PLIST.dane
 .else
 CONFIGURE_ARGS+=	--disable-libdane
 .endif
+
+PLIST_VARS+=	pkcs11
+.if !empty(PKG_OPTIONS:Mpkcs11)
+PLIST.pkcs11=	yes
+BUILDLINK_API_DEPENDS.p11-kit+=	p11-kit>=0.23.1
+.include "../../security/p11-kit/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-p11-kit
+.endif


--_----------=_1715760806114080--