Index: devel/arcanist-lib/Makefile =================================================================== --- devel/arcanist-lib/Makefile +++ devel/arcanist-lib/Makefile @@ -1,6 +1,6 @@ PORTNAME?= arcanist PORTVERSION?= 20220518 -PORTREVISION?= 4 +PORTREVISION?= 5 CATEGORIES?= devel PKGNAMESUFFIX= ${SLAVE_PKGNAMESUFFIX}${PHP_PKGNAMESUFFIX} @@ -38,8 +38,6 @@ .if ${SLAVEPORT} == lib SLAVE_PKGNAMESUFFIX= -${SLAVEPORT} -RUN_DEPENDS= ca_root_nss>0:security/ca_root_nss - OPTIONS_DEFINE= ENCODINGS OPTIONS_DEFAULT=ENCODINGS ENCODINGS_DESC= Support for encodings other than utf-8 @@ -82,8 +80,6 @@ @${REINPLACE_CMD} \ 's|%%PYTHON_CMD%%|${PYTHON_CMD}|g' \ ${STAGEDIR}${PREFIX}/${PHP_DESTDIR}/src/workflow/ArcanistAnoidWorkflow.php - ${LN} -sf ${LOCALBASE}/share/certs/ca-root-nss.crt \ - ${STAGEDIR}${PREFIX}/${PHP_DESTDIR}/resources/ssl/default.pem ${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 Index: devel/arcanist-lib/files/patch-src_config_arc_ArcanistArcConfigurationEngineExtension.php =================================================================== --- /dev/null +++ devel/arcanist-lib/files/patch-src_config_arc_ArcanistArcConfigurationEngineExtension.php @@ -0,0 +1,10 @@ +--- src/config/arc/ArcanistArcConfigurationEngineExtension.php.orig 2022-05-17 23:20:14 UTC ++++ src/config/arc/ArcanistArcConfigurationEngineExtension.php +@@ -38,6 +38,7 @@ final class ArcanistArcConfigurationEngineExtension + "Path to a custom CA bundle file to be used for arcanist's cURL ". + "calls. This is used primarily when your conduit endpoint is ". + "behind HTTPS signed by your organization's internal CA."), ++ 'default' => '/etc/ssl/certs', + 'example' => 'support/yourca.pem', + ), + 'browser' => array( Index: devel/arcanist-lib/files/patch-src_configuration_ArcanistSettings.php =================================================================== --- /dev/null +++ devel/arcanist-lib/files/patch-src_configuration_ArcanistSettings.php @@ -0,0 +1,10 @@ +--- src/configuration/ArcanistSettings.php.orig 2022-05-17 23:20:14 UTC ++++ src/configuration/ArcanistSettings.php +@@ -98,6 +98,7 @@ final class ArcanistSettings extends Phobject { + "Path to a custom CA bundle file to be used for cURL calls. ". + "This is used primarily when your conduit endpoint is ". + "behind HTTPS signed by your organization's internal CA."), ++ 'default' => '/etc/ssl/certs', + 'example' => 'support/yourca.pem', + ), + 'browser' => array( Index: devel/arcanist-lib/files/patch-src_future_http_HTTPSFuture.php =================================================================== --- /dev/null +++ devel/arcanist-lib/files/patch-src_future_http_HTTPSFuture.php @@ -0,0 +1,16 @@ +--- src/future/http/HTTPSFuture.php.orig 2023-10-02 18:55:11 UTC ++++ src/future/http/HTTPSFuture.php +@@ -399,7 +399,12 @@ final class HTTPSFuture extends BaseHTTPFuture { + } + + if ($this->canSetCAInfo()) { +- curl_setopt($curl, CURLOPT_CAINFO, $this->getCABundle()); ++ $path = $this->getCABundle(); ++ if (is_dir($path)) { ++ curl_setopt($curl, CURLOPT_CAPATH, $path); ++ } else { ++ curl_setopt($curl, CURLOPT_CAINFO, $path); ++ } + } + + $verify_peer = 1; Index: devel/arcanist-lib/pkg-plist =================================================================== --- devel/arcanist-lib/pkg-plist +++ devel/arcanist-lib/pkg-plist @@ -17,7 +17,6 @@ lib/php/arcanist/resources/php/symbol-information.json lib/php/arcanist/resources/spelling/english.json lib/php/arcanist/resources/ssl/README -lib/php/arcanist/resources/ssl/default.pem lib/php/arcanist/scripts/__init_script__.php lib/php/arcanist/scripts/arcanist.php lib/php/arcanist/scripts/hgdaemon/hgdaemon_client.php