Wed May 15 08:13:25 2024 UTC (33d)
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


(nia)
diff -r1.249 -r1.250 pkgsrc/security/gnutls/Makefile
diff -r1.81 -r1.82 pkgsrc/security/gnutls/PLIST
diff -r1.50 -r1.51 pkgsrc/security/gnutls/buildlink3.mk
diff -r1.6 -r1.7 pkgsrc/security/gnutls/options.mk
cvs diff -r1.249 -r1.250 pkgsrc/security/gnutls/Makefile (expand / switch to unified diff)

--- pkgsrc/security/gnutls/Makefile 2024/04/10 10:13:17 1.249
+++ pkgsrc/security/gnutls/Makefile 2024/05/15 08:13:25 1.250
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.249 2024/04/10 10:13:17 adam Exp $ 1# $NetBSD: Makefile,v 1.250 2024/05/15 08:13:25 nia Exp $
2 2
3DISTNAME= gnutls-3.8.5 3DISTNAME= gnutls-3.8.5
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= security devel 5CATEGORIES= security devel
6MASTER_SITES= https://www.gnupg.org/ftp/gcrypt/gnutls/v${PKGVERSION_NOREV:R}/ 6MASTER_SITES= https://www.gnupg.org/ftp/gcrypt/gnutls/v${PKGVERSION_NOREV:R}/
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://www.gnutls.org/ 10HOMEPAGE= https://www.gnutls.org/
11COMMENT= Transport Layer Security library 11COMMENT= Transport Layer Security library
12LICENSE= gnu-gpl-v3 AND gnu-lgpl-v2.1 12LICENSE= gnu-gpl-v3 AND gnu-lgpl-v2.1
13 13
14DEPENDS+= mozilla-rootcerts-[0-9]*:../../security/mozilla-rootcerts 14DEPENDS+= mozilla-rootcerts-[0-9]*:../../security/mozilla-rootcerts
@@ -98,18 +98,16 @@ CONFIGURE_ARGS.SunOS+= --disable-tests @@ -98,18 +98,16 @@ CONFIGURE_ARGS.SunOS+= --disable-tests
98 98
99.include "../../converters/libiconv/buildlink3.mk" 99.include "../../converters/libiconv/buildlink3.mk"
100.include "../../devel/gettext-lib/buildlink3.mk" 100.include "../../devel/gettext-lib/buildlink3.mk"
101BUILDLINK_API_DEPENDS.gmp+= gmp>=5.0 101BUILDLINK_API_DEPENDS.gmp+= gmp>=5.0
102.include "../../devel/gmp/buildlink3.mk" 102.include "../../devel/gmp/buildlink3.mk"
103# Avoid creating a fake zlib.pc, because if it does 103# Avoid creating a fake zlib.pc, because if it does
104# gnutls will add a Requires.private for it in its .pc file 104# gnutls will add a Requires.private for it in its .pc file
105CHECK_BUILTIN.zlib:=yes 105CHECK_BUILTIN.zlib:=yes
106.include "../../devel/zlib/buildlink3.mk" 106.include "../../devel/zlib/buildlink3.mk"
107BUILDLINK_API_DEPENDS.libtasn1+= libtasn1>=4.9 107BUILDLINK_API_DEPENDS.libtasn1+= libtasn1>=4.9
108.include "../../security/libtasn1/buildlink3.mk" 108.include "../../security/libtasn1/buildlink3.mk"
109BUILDLINK_API_DEPENDS.nettle+= nettle>=3.6 109BUILDLINK_API_DEPENDS.nettle+= nettle>=3.6
110.include "../../security/nettle/buildlink3.mk" 110.include "../../security/nettle/buildlink3.mk"
111BUILDLINK_API_DEPENDS.p11-kit+= p11-kit>=0.23.1 
112.include "../../security/p11-kit/buildlink3.mk" 
113.include "../../textproc/libunistring/buildlink3.mk" 111.include "../../textproc/libunistring/buildlink3.mk"
114.include "../../mk/readline.buildlink3.mk" 112.include "../../mk/readline.buildlink3.mk"
115.include "../../mk/bsd.pkg.mk" 113.include "../../mk/bsd.pkg.mk"
cvs diff -r1.81 -r1.82 pkgsrc/security/gnutls/PLIST (expand / switch to unified diff)

--- pkgsrc/security/gnutls/PLIST 2024/03/21 06:08:38 1.81
+++ pkgsrc/security/gnutls/PLIST 2024/05/15 08:13:25 1.82
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1@comment $NetBSD: PLIST,v 1.81 2024/03/21 06:08:38 adam Exp $ 1@comment $NetBSD: PLIST,v 1.82 2024/05/15 08:13:25 nia Exp $
2bin/certtool 2bin/certtool
3bin/gnutls-cli 3bin/gnutls-cli
4bin/gnutls-cli-debug 4bin/gnutls-cli-debug
5bin/gnutls-serv 5bin/gnutls-serv
6bin/ocsptool 6bin/ocsptool
7bin/p11tool 7${PLIST.pkcs11}bin/p11tool
8bin/psktool 8bin/psktool
9include/gnutls/abstract.h 9include/gnutls/abstract.h
10include/gnutls/compat.h 10include/gnutls/compat.h
11include/gnutls/crypto.h 11include/gnutls/crypto.h
12include/gnutls/dtls.h 12include/gnutls/dtls.h
13include/gnutls/gnutls.h 13include/gnutls/gnutls.h
14include/gnutls/gnutlsxx.h 14include/gnutls/gnutlsxx.h
15include/gnutls/ocsp.h 15include/gnutls/ocsp.h
16include/gnutls/openpgp.h 16include/gnutls/openpgp.h
17include/gnutls/pkcs11.h 17include/gnutls/pkcs11.h
18include/gnutls/pkcs12.h 18include/gnutls/pkcs12.h
19include/gnutls/pkcs7.h 19include/gnutls/pkcs7.h
20include/gnutls/self-test.h 20include/gnutls/self-test.h
cvs diff -r1.50 -r1.51 pkgsrc/security/gnutls/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/security/gnutls/buildlink3.mk 2024/04/10 10:13:17 1.50
+++ pkgsrc/security/gnutls/buildlink3.mk 2024/05/15 08:13:25 1.51
@@ -1,26 +1,28 @@ @@ -1,26 +1,28 @@
1# $NetBSD: buildlink3.mk,v 1.50 2024/04/10 10:13:17 adam Exp $ 1# $NetBSD: buildlink3.mk,v 1.51 2024/05/15 08:13:25 nia Exp $
2 2
3BUILDLINK_TREE+= gnutls 3BUILDLINK_TREE+= gnutls
4 4
5.if !defined(GNUTLS_BUILDLINK3_MK) 5.if !defined(GNUTLS_BUILDLINK3_MK)
6GNUTLS_BUILDLINK3_MK:= 6GNUTLS_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.gnutls+= gnutls>=3.3.0 8BUILDLINK_API_DEPENDS.gnutls+= gnutls>=3.3.0
9BUILDLINK_ABI_DEPENDS.gnutls+= gnutls>=3.8.1nb2 9BUILDLINK_ABI_DEPENDS.gnutls+= gnutls>=3.8.1nb2
10BUILDLINK_PKGSRCDIR.gnutls?= ../../security/gnutls 10BUILDLINK_PKGSRCDIR.gnutls?= ../../security/gnutls
11 11
12.include "../../devel/gettext-lib/buildlink3.mk" 12.include "../../devel/gettext-lib/buildlink3.mk"
13.include "../../devel/zlib/buildlink3.mk" 13.include "../../devel/zlib/buildlink3.mk"
14.include "../../security/libtasn1/buildlink3.mk" 14.include "../../security/libtasn1/buildlink3.mk"
15BUILDLINK_API_DEPENDS.nettle+= nettle>=3.4.1 15BUILDLINK_API_DEPENDS.nettle+= nettle>=3.4.1
16.include "../../security/nettle/buildlink3.mk" 16.include "../../security/nettle/buildlink3.mk"
 17.if ${PKG_BUILD_OPTIONS.gnutls:Mpkcs11}
17.include "../../security/p11-kit/buildlink3.mk" 18.include "../../security/p11-kit/buildlink3.mk"
 19.endif
18.include "../../textproc/libunistring/buildlink3.mk" 20.include "../../textproc/libunistring/buildlink3.mk"
19pkgbase := gnutls 21pkgbase := gnutls
20.include "../../mk/pkg-build-options.mk" 22.include "../../mk/pkg-build-options.mk"
21.if ${PKG_BUILD_OPTIONS.gnutls:Mdane} 23.if ${PKG_BUILD_OPTIONS.gnutls:Mdane}
22.include "../../net/unbound/buildlink3.mk" 24.include "../../net/unbound/buildlink3.mk"
23.endif 25.endif
24.endif # GNUTLS_BUILDLINK3_MK 26.endif # GNUTLS_BUILDLINK3_MK
25 27
26BUILDLINK_TREE+= -gnutls 28BUILDLINK_TREE+= -gnutls
cvs diff -r1.6 -r1.7 pkgsrc/security/gnutls/options.mk (expand / switch to unified diff)

--- pkgsrc/security/gnutls/options.mk 2023/02/15 07:40:52 1.6
+++ pkgsrc/security/gnutls/options.mk 2024/05/15 08:13:25 1.7
@@ -1,14 +1,24 @@ @@ -1,14 +1,24 @@
1# $NetBSD: options.mk,v 1.6 2023/02/15 07:40:52 nikita Exp $ 1# $NetBSD: options.mk,v 1.7 2024/05/15 08:13:25 nia Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.gnutls 3PKG_OPTIONS_VAR= PKG_OPTIONS.gnutls
4PKG_SUPPORTED_OPTIONS= dane 4PKG_SUPPORTED_OPTIONS= dane pkcs11
 5PKG_SUGGESTED_OPTIONS= pkcs11
5 6
6.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
7 8
8.if !empty(PKG_OPTIONS:Mdane) 9.if !empty(PKG_OPTIONS:Mdane)
9.include "../../net/unbound/buildlink3.mk" 10.include "../../net/unbound/buildlink3.mk"
10CONFIGURE_ARGS+= --enable-libdane 11CONFIGURE_ARGS+= --enable-libdane
11PLIST_SRC+= PLIST.dane 12PLIST_SRC+= PLIST.dane
12.else 13.else
13CONFIGURE_ARGS+= --disable-libdane 14CONFIGURE_ARGS+= --disable-libdane
14.endif 15.endif
 16
 17PLIST_VARS+= pkcs11
 18.if !empty(PKG_OPTIONS:Mpkcs11)
 19PLIST.pkcs11= yes
 20BUILDLINK_API_DEPENDS.p11-kit+= p11-kit>=0.23.1
 21.include "../../security/p11-kit/buildlink3.mk"
 22.else
 23CONFIGURE_ARGS+= --without-p11-kit
 24.endif