Attachment 228311 Details for Bug 258824 – 0001-devel-arcanist-lib-Add-a-php-config-to-use-CA-info-f.patch

[patch] 0001-devel-arcanist-lib-Add-a-php-config-to-use-CA-info-f.patch

0001-devel-arcanist-lib-Add-a-php-config-to-use-CA-info-f.patch (text/plain), 2.57 KB, created by Li-Wen Hsu on 2021-10-01 10:08:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Li-Wen Hsu

Created: 2021-10-01 10:08:06 UTC

Size: 2.57 KB

patch

obsolete

>From 1367f4f4c964a76c0cae97d3b77d05799fb6c1a7 Mon Sep 17 00:00:00 2001
>From: Li-Wen Hsu <lwhsu@FreeBSD.org>
>Date: Fri, 1 Oct 2021 17:59:03 +0800
>Subject: [PATCH] devel/arcanist-lib: Add a php config to use CA info from
> ca-root-nss
>
>php-curl ship its own CA Bundle which has expired Intermediates for
>Let's Encrypt:
>
>https://letsencrypt.org/docs/dst-root-ca-x3-expiration-september-2021/
>
>This fix the validation for the sites use Let's Encrypt, including
>https://reviews.FreeBSD.org
>
>PR:		258824
>Sponsored by:	The FreeBSD Foundation
>---
> devel/arcanist-lib/Makefile              | 7 ++++++-
> devel/arcanist-lib/files/curl-cainfo.ini | 1 +
> devel/arcanist-lib/pkg-plist             | 1 +
> 3 files changed, 8 insertions(+), 1 deletion(-)
> create mode 100644 devel/arcanist-lib/files/curl-cainfo.ini
>
>diff --git a/devel/arcanist-lib/Makefile b/devel/arcanist-lib/Makefile
>index b73e2d8f8a7d..1f23609d32b2 100644
>--- a/devel/arcanist-lib/Makefile
>+++ b/devel/arcanist-lib/Makefile
>@@ -1,5 +1,6 @@
> PORTNAME?=	arcanist
> PORTVERSION?=	20210113
>+PORTREVISION?=	1
> CATEGORIES?=	devel
> PKGNAMESUFFIX=	${SLAVE_PKGNAMESUFFIX}${PHP_PKGNAMESUFFIX}
> 
>@@ -11,6 +12,8 @@ SLAVEPORT?=	lib
> LICENSE=	APACHE20
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>+RUN_DEPENDS=	ca_root_nss>0:security/ca_root_nss
>+
> PHP_DESTDIR=	lib/php/arcanist
> USES=		php:cli,flavors python:env shebangfix
> SHEBANG_FILES=	bin/arc \
>@@ -43,7 +46,7 @@ ENCODINGS_USE=	PHP=mbstring
> 
> .else # link only
> 
>-RUN_DEPENDS=	arcanist-lib${PHP_PKGNAMESUFFIX}>0:devel/arcanist-lib@${PHP_FLAVOR}
>+RUN_DEPENDS+=	arcanist-lib${PHP_PKGNAMESUFFIX}>0:devel/arcanist-lib@${PHP_FLAVOR}
> 
> CONFLICTS=	arc
> 
>@@ -81,6 +84,8 @@ do-install:
> 	${RLN} ${STAGEDIR}${PREFIX}/${PHP_DESTDIR}/support/shell/hooks/bash-completion.sh \
> 		 ${STAGEDIR}${PREFIX}/share/bash-completion/completions/arc
> 	${STAGEDIR}${PREFIX}/${PHP_DESTDIR}/bin/arc shell-complete --generate
>+	@${MKDIR} ${STAGEDIR}/${PREFIX}/etc/php
>+	${INSTALL_DATA} ${FILESDIR}/curl-cainfo.ini ${STAGEDIR}/${PREFIX}/etc/php
> .endif
> 
> .include <bsd.port.mk>
>diff --git a/devel/arcanist-lib/files/curl-cainfo.ini b/devel/arcanist-lib/files/curl-cainfo.ini
>new file mode 100644
>index 000000000000..89cc141878b3
>--- /dev/null
>+++ b/devel/arcanist-lib/files/curl-cainfo.ini
>@@ -0,0 +1 @@
>+curl.cainfo="/usr/local/share/certs/ca-root-nss.crt"
>diff --git a/devel/arcanist-lib/pkg-plist b/devel/arcanist-lib/pkg-plist
>index fbec1a3e91ef..8e1b575cc7d9 100644
>--- a/devel/arcanist-lib/pkg-plist
>+++ b/devel/arcanist-lib/pkg-plist
>@@ -1,3 +1,4 @@
>+etc/php/curl-cainfo.ini
> lib/php/arcanist/LICENSE
> lib/php/arcanist/NOTICE
> lib/php/arcanist/README.md
>-- 
>2.32.0
>

Actions: View | Diff

Attachments on bug 258824: 228311