git: 15c1b5734bfc - main - security/gnutls: Fix RSAES-PKCS1-v1_5

The branch main has been updated by tijl:

URL: https://cgit.FreeBSD.org/ports/commit/?id=15c1b5734bfc5c0ad3a2756386fd9f00c0270299

commit 15c1b5734bfc5c0ad3a2756386fd9f00c0270299
Author:     Tijl Coosemans <tijl@FreeBSD.org>
AuthorDate: 2024-06-14 12:28:49 +0000
Commit:     Tijl Coosemans <tijl@FreeBSD.org>
CommitDate: 2024-06-14 13:08:45 +0000

    security/gnutls: Fix RSAES-PKCS1-v1_5
    
    Add upstream patch to fix RSAES-PKCS1-v1_5 when configuration file is
    missing.
    
    Pet portlint/portclippy/portfmt.
    
    PR:             279571
---
 security/gnutls/Makefile | 35 +++++++++++++++++++----------------
 security/gnutls/distinfo |  4 +++-
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index 2f2175e0340b..f11cc5fb25b6 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -1,9 +1,12 @@
 PORTNAME=	gnutls
 DISTVERSION=	3.8.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security net
 MASTER_SITES=	GNUPG/${PORTNAME}/v${DISTVERSION:R}
 
+PATCH_SITES=	https://gitlab.com/gnutls/gnutls/-/commit/
+PATCHFILES=	2d73d945c4b1dfcf8d2328c4d23187d62ffaab2d.patch:-p1
+
 MAINTAINER=	tijl@FreeBSD.org
 COMMENT=	GNU Transport Layer Security library
 WWW=		https://gnutls.org/
@@ -21,27 +24,27 @@ LIB_DEPENDS=	libgmp.so:math/gmp \
 USES=		compiler:c11 cpe gmake iconv libtool localbase makeinfo \
 		pkgconfig tar:xz
 CPE_VENDOR=	gnu
-
-GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 USE_LDCONFIG=	yes
 
-INFO=		gnutls
-INSTALL_TARGET=	install-strip
-TEST_TARGET=	check
-LDFLAGS=	-Wl,--undefined-version
-MAKE_ENV=	MAKEINFOFLAGS=--no-split
-
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-rpath \
-		--with-system-priority-file=${PREFIX}/etc/gnutls/config \
+		--enable-ld-version-script \
+		--enable-openssl-compatibility \
 		--with-default-trust-store-dir=/etc/ssl/certs \
+		--with-system-priority-file=${PREFIX}/etc/gnutls/config \
 		--without-brotli \
 		--without-included-libtasn1 \
-		--without-zstd \
 		--without-tpm \
 		--without-tpm2 \
-		--enable-ld-version-script \
-		--enable-openssl-compatibility
+		--without-zstd
+
+MAKE_ENV=	MAKEINFOFLAGS=--no-split
+INSTALL_TARGET=	install-strip
+TEST_TARGET=	check
+
+LDFLAGS+=	-Wl,--undefined-version
+
+INFO=		gnutls
 
 OPTIONS_DEFINE=		DANE EXAMPLES IDN KTLS MAN3 NLS P11KIT SRP
 OPTIONS_DEFAULT=	IDN KTLS MAN3 P11KIT
@@ -62,12 +65,12 @@ IDN_CONFIGURE_WITH=	idn
 KTLS_CONFIGURE_ENABLE=	ktls
 
 NLS_USES=		gettext
+NLS_CONFIGURE_OFF=	ac_cv_lib_intl_gettext=no
 NLS_CONFIGURE_ENABLE=	nls
-NLS_CONFIGURE_OFF= 	ac_cv_lib_intl_gettext=no
 
 P11KIT_LIB_DEPENDS=	libp11-kit.so:security/p11-kit
-P11KIT_CONFIGURE_WITH=	p11-kit
 P11KIT_CONFIGURE_ON=	--with-default-trust-store-pkcs11="pkcs11:model=p11-kit-trust;manufacturer=PKCS%2311%20Kit"
+P11KIT_CONFIGURE_WITH=	p11-kit
 
 SRP_CONFIGURE_ENABLE=	srp-authentication
 
diff --git a/security/gnutls/distinfo b/security/gnutls/distinfo
index 21d0e88f36df..d64c02ec6e91 100644
--- a/security/gnutls/distinfo
+++ b/security/gnutls/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1712473891
+TIMESTAMP = 1717849015
 SHA256 (gnutls-3.8.5.tar.xz) = 66269a2cfe0e1c2dabec87bdbbd8ab656f396edd9a40dd006978e003cfa52bfc
 SIZE (gnutls-3.8.5.tar.xz) = 6491504
+SHA256 (2d73d945c4b1dfcf8d2328c4d23187d62ffaab2d.patch) = 5e4bfa6946e5012cd518da453846ca9ed003dab18706814d502d84d6b4066627
+SIZE (2d73d945c4b1dfcf8d2328c4d23187d62ffaab2d.patch) = 7531