CVS commit: pkgsrc/www

["Emmanuel Dreyfus" <manu%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   manu
Date:           Wed Oct 26 15:51:24 UTC 2022

Modified Files:
        pkgsrc/www/cadaver: Makefile
        pkgsrc/www/neon: Makefile
Added Files:
        pkgsrc/www/neon: MESSAGE

Log Message:
Enable certificate validation for www/cadaver

This requires a dependency on www/neon, which performs the validation.
The CA bundle path is advertised by www/neon/MESSSAGE and depends
whether openssl is native or from pkgsrc.


To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 pkgsrc/www/cadaver/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/www/neon/MESSAGE
cvs rdiff -u -r1.90 -r1.91 pkgsrc/www/neon/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/cadaver/Makefile
diff -u pkgsrc/www/cadaver/Makefile:1.58 pkgsrc/www/cadaver/Makefile:1.59
--- pkgsrc/www/cadaver/Makefile:1.58    Wed Oct 26 10:32:04 2022
+++ pkgsrc/www/cadaver/Makefile Wed Oct 26 15:51:24 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.58 2022/10/26 10:32:04 wiz Exp $
+# $NetBSD: Makefile,v 1.59 2022/10/26 15:51:24 manu Exp $
 
 DISTNAME=              cadaver-0.23.3
-PKGREVISION=           11
+PKGREVISION=           12
 CATEGORIES=            www
 MASTER_SITES=          http://www.webdav.org/cadaver/
 
@@ -24,4 +24,5 @@ LIBS+=                        ${BUILDLINK_LDADD.termcap}
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"
+.include "../../www/neon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/neon/Makefile
diff -u pkgsrc/www/neon/Makefile:1.90 pkgsrc/www/neon/Makefile:1.91
--- pkgsrc/www/neon/Makefile:1.90       Wed Oct 26 10:31:10 2022
+++ pkgsrc/www/neon/Makefile    Wed Oct 26 15:51:24 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.90 2022/10/26 10:31:10 wiz Exp $
+# $NetBSD: Makefile,v 1.91 2022/10/26 15:51:24 manu Exp $
 
 DISTNAME=      neon-0.32.4
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    www
 MASTER_SITES=  https://notroj.github.io/neon/
 
@@ -17,12 +17,26 @@ USE_TOOLS+=         pkg-config msgfmt
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --enable-shared
 CONFIGURE_ARGS+=       --with-expat
+CONFIGURE_ARGS+=       --with-ca-bundle=${SSLCERTS:Q}/ca-certificates.crt
 
 PKGCONFIG_OVERRIDE=    neon.pc.in
 TEST_TARGET=           check
 #selftest needs perl
 USE_TOOLS+=            perl
 
+# Logic borrowed from security/mozilla-rootcerts
+CHECK_BUILTIN.openssl= yes
+.include "../../security/openssl/builtin.mk"
+CHECK_BUILTIN.openssl= no
+.if !empty(USE_BUILTIN.openssl:M[yY][eE][sS])
+SSLDIR=                /etc/openssl
+.else
+SSLDIR=                ${PKG_SYSCONFDIR}/openssl
+.endif
+
+SSLCERTS=      ${SSLDIR}/certs
+MESSAGE_SUBST+=                SSLCERTS=${SSLCERTS:Q}
+
 .include "options.mk"
 
 .include "../../devel/gettext-lib/buildlink3.mk"

Added files:

Index: pkgsrc/www/neon/MESSAGE
diff -u /dev/null pkgsrc/www/neon/MESSAGE:1.1
--- /dev/null   Wed Oct 26 15:51:24 2022
+++ pkgsrc/www/neon/MESSAGE     Wed Oct 26 15:51:24 2022
@@ -0,0 +1,7 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2022/10/26 15:51:24 manu Exp $
+
+neon will look for a trusted certificarte bundle at
+        ${SSLCERTS}/ca-certificates.crt
+
+===========================================================================