pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/www Enable certificate validation for www/cadaver



details:   https://anonhg.NetBSD.org/pkgsrc/rev/f30f57e7fb06
branches:  trunk
changeset: 387318:f30f57e7fb06
user:      manu <manu%pkgsrc.org@localhost>
date:      Wed Oct 26 15:51:24 2022 +0000

description:
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.

diffstat:

 www/cadaver/Makefile |   5 +++--
 www/neon/MESSAGE     |   7 +++++++
 www/neon/Makefile    |  18 ++++++++++++++++--
 3 files changed, 26 insertions(+), 4 deletions(-)

diffs (70 lines):

diff -r 704aeadce83e -r f30f57e7fb06 www/cadaver/Makefile
--- a/www/cadaver/Makefile      Wed Oct 26 14:38:33 2022 +0000
+++ b/www/cadaver/Makefile      Wed Oct 26 15:51:24 2022 +0000
@@ -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 @@
 .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"
diff -r 704aeadce83e -r f30f57e7fb06 www/neon/MESSAGE
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/neon/MESSAGE  Wed Oct 26 15:51:24 2022 +0000
@@ -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
+
+===========================================================================
diff -r 704aeadce83e -r f30f57e7fb06 www/neon/Makefile
--- a/www/neon/Makefile Wed Oct 26 14:38:33 2022 +0000
+++ b/www/neon/Makefile Wed Oct 26 15:51:24 2022 +0000
@@ -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 @@
 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"



Home | Main Index | Thread Index | Old Index