CVS commit: pkgsrc/www/curl

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Mon Mar  1 23:31:31 UTC 2021

Modified Files:
        pkgsrc/www/curl: Makefile

Log Message:
www/curl: Accomodate SSLCERTBUNDLE

Rather than letting openssl perform default validation, curl passes in
an explicit request to...  use the certificates in the default
location.  In cases where SSLCERTBUNDLE is defined (because the system
uses a bundle instead of the traditonal directory of trust anchors),
pass that to curl's configure.

As proposed on tech-pkg by Thomas Orgis, without objections.


To generate a diff of this commit:
cvs rdiff -u -r1.238 -r1.239 pkgsrc/www/curl/Makefile

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

Modified files:

Index: pkgsrc/www/curl/Makefile
diff -u pkgsrc/www/curl/Makefile:1.238 pkgsrc/www/curl/Makefile:1.239
--- pkgsrc/www/curl/Makefile:1.238      Wed Feb  3 13:17:18 2021
+++ pkgsrc/www/curl/Makefile    Mon Mar  1 23:31:30 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.238 2021/02/03 13:17:18 adam Exp $
+# $NetBSD: Makefile,v 1.239 2021/03/01 23:31:30 gdt Exp $
 
 DISTNAME=      curl-7.75.0
 CATEGORIES=    www
@@ -19,7 +19,13 @@ USE_TOOLS+=          nroff perl
 USE_LIBTOOL=           yes
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --with-ssl=${BUILDLINK_PREFIX.openssl}
+# Some systems use bundles instead of directories; this needs configuring
+# because curl doesn't use default validation.
+.if !empty(SSLCERTBUNDLE)
+CONFIGURE_ARGS+=       --with-ca-bundle=${SSLCERTBUNDLE}
+.else
 CONFIGURE_ARGS+=       --with-ca-path=${SSLCERTS}
+.endif
 CONFIGURE_ARGS+=       --with-zlib=${BUILDLINK_PREFIX.zlib}
 CONFIGURE_ARGS+=       --without-libpsl
 PKGCONFIG_OVERRIDE=    libcurl.pc.in