From nobody Tue Oct 03 15:11:01 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S0Lqp05PTz4wLqH; Tue, 3 Oct 2023 15:11:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S0Lqn6mCSz3P2v; Tue, 3 Oct 2023 15:11:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696345861; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YgxADLoqz+ytmuy31rwHak3+lBpwqAyl1WMe7bJbZyU=; b=I7+d1B51J8vqxg2ZOBcxl5ZVa7nmADM2GEaoL1hs3dfR4LjJVFN1pOVfYn+/bmNRypaTxR qNyUOg3d6FOJDkchN+AqZdam0X0AR1Iboh2d+IIH/BP6b2dLgGW9BErcxu4nAn7LNNDe/Y pebLvGXeCT7KSs3KOSn+cxDkW+CcLVTpjuzqi0169MF/ip245mpPhCTw4frG1iyrj2xYRu 5v9cRv5OHGGwK6vbr+Igeqegv8YpPbajIbcJGr1jrG7UvmLlm8g3KFIhPhP6Zf3fQIZi6H We3y8MLNtZPmcryWxj79BfK0kHd2ShINmnGT2j8xhC5gXtRKeyrC/6BjbCgomA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696345861; a=rsa-sha256; cv=none; b=T52DI8Q/3ujy1E6lztd3UFVrAFgJXOOxO0mtVKHnQTi31hcLX+dO03K1fcLC7n6z8m3YBL 2vFXbNNlZ4RjA4cDslFwqK+8mZP16WuxLZ0IWDfHmbZSTT/QLU8mJfdEHAwJL49R/5X6E4 xUiEfg1H0QoZSgigY9z8+ibekvElEuZ0o/3+lD7RscWWMIdJSf+p9FexUzi4A7XrZ9XxA3 be7Gop1os7Z5+QbZk+lAnjQGrJEBlhQDoZxpwGFq+bW240GjUEFy6DyC5K/fnbJdS4eRvZ 5rys5iWCtOjAClaX3c+xVTPVrjhtkhOuJRgy6WcdU/xwcwVijo3SNDL/HhnnBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696345861; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YgxADLoqz+ytmuy31rwHak3+lBpwqAyl1WMe7bJbZyU=; b=V7b4OKAj5VYiYCZ09NGWqApcXYBkCyRM/gnnBHp61eN/IKZXUDYXaB9/voBapSZiVnjYpc IufiOe4z4Z0Kc8eo3mJwZtiXUoTdUppFOex+OUQ0QewYDpgpFh0GuOB2JYMmF533Z+SiFZ qutdr9pcUuOp1u2PkVlCdPWMBNGkT0qjmKzIy9wNPI05z1vnkisghD6wy2W0yVdAxy7lkQ Gel+sTbJlDmMnvuQhgjE94O4SOk7/LKd+ZM6gAtkdMl2ewXZzfYJWUTlfjZRkthNZ+5ig9 Yz3S7iZhUUJavcDimgUoCgHX+doVlhgNFZS7psxznVouYVsOggezJuxUfKf70w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S0Lqn5rBVz10Qy; Tue, 3 Oct 2023 15:11:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 393FB1Bw063733; Tue, 3 Oct 2023 15:11:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 393FB1kn063730; Tue, 3 Oct 2023 15:11:01 GMT (envelope-from git) Date: Tue, 3 Oct 2023 15:11:01 GMT Message-Id: <202310031511.393FB1kn063730@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 5b543262eae9 - main - net/measurement-kit: Drop ca_root_nss dependency. List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5b543262eae9ef8330757da6f467b9ff79d61c26 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/ports/commit/?id=5b543262eae9ef8330757da6f467b9ff79d61c26 commit 5b543262eae9ef8330757da6f467b9ff79d61c26 Author: Dag-Erling Smørgrav AuthorDate: 2023-10-03 15:08:55 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-10-03 15:09:30 +0000 net/measurement-kit: Drop ca_root_nss dependency. Since this piece of software is no longer maintained, we don't strive for elegance but simply hack the configure script to stop requiring a trust bundle and the code to use the system trust store instead. MFH: 2023Q4 Reviewed by: egypcio Differential Revision: https://reviews.freebsd.org/D42040 --- net/measurement-kit/Makefile | 2 +- net/measurement-kit/files/patch-m4_mk.m4 | 52 ++++++++++++++++++++-- .../patch-src_libmeasurement__kit_net_libssl.hpp | 11 +++++ 3 files changed, 61 insertions(+), 4 deletions(-) diff --git a/net/measurement-kit/Makefile b/net/measurement-kit/Makefile index a6c31a530242..808f883934eb 100644 --- a/net/measurement-kit/Makefile +++ b/net/measurement-kit/Makefile @@ -1,6 +1,7 @@ PORTNAME= measurement-kit DISTVERSIONPREFIX= v DISTVERSION= 0.10.14 +PORTREVISION= 1 CATEGORIES= net devel MAINTAINER= egypcio@FreeBSD.org @@ -13,7 +14,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libcurl.so:ftp/curl \ libevent.so:devel/libevent \ libmaxminddb.so:net/libmaxminddb -RUN_DEPENDS= ca_root_nss>=0:security/ca_root_nss USES= autoreconf:build compiler:c++14-lang libtool ssl USE_GITHUB= yes diff --git a/net/measurement-kit/files/patch-m4_mk.m4 b/net/measurement-kit/files/patch-m4_mk.m4 index 3374b546c2b5..03b408235adc 100644 --- a/net/measurement-kit/files/patch-m4_mk.m4 +++ b/net/measurement-kit/files/patch-m4_mk.m4 @@ -1,6 +1,6 @@ ---- m4/mk.m4.orig 2019-05-16 20:09:11 UTC +--- m4/mk.m4.orig 2021-03-04 14:14:57 UTC +++ m4/mk.m4 -@@ -90,8 +90,10 @@ AC_DEFUN([MK_AM_OPENSSL], [ +@@ -99,8 +99,10 @@ AC_DEFUN([MK_AM_OPENSSL], [ [SSL toolkit @<:@default=check@:>@]) ], [ @@ -12,4 +12,50 @@ + fi ], [ - if test -d /usr/local/Cellar/openssl; then + if test -d /usr/local/Cellar/openssl@1.1; then +@@ -252,43 +254,8 @@ dnl + dnl Except as contained in this notice, the name of a copyright holder shall not be + dnl used in advertising or otherwise to promote the sale, use or other dealings in + dnl this Software without prior written authorization of the copyright holder. +-AC_DEFUN([MK_MAYBE_CA_BUNDLE], [ +- AC_MSG_CHECKING([CA bundle path]) +- AC_ARG_WITH([ca-bundle], AC_HELP_STRING([--with-ca-bundle=FILE], +- [Path to CA bundle]), [want_ca="$withval"], [want_ca="unset"]) +- if test "x$want_ca" != "xunset"; then +- ca="$want_ca" +- else +- ca="no" +- if test "x$cross_compiling" != "xyes"; then +- for a in /etc/ssl/certs/ca-certificates.crt \ +- /etc/pki/tls/certs/ca-bundle.crt \ +- /usr/share/ssl/certs/ca-bundle.crt \ +- /usr/local/share/certs/ca-root.crt \ +- /etc/ssl/cert.pem \ +- /usr/local/etc/openssl/cert.pem; do +- if test -f "$a"; then +- ca="$a" +- break +- fi +- done +- fi +- fi +- if test "x$ca" != "xno"; then +- MK_CA_BUNDLE="$ca" +- AC_DEFINE_UNQUOTED(MK_CA_BUNDLE, "$ca", [Location of default ca bundle]) +- AC_SUBST(MK_CA_BUNDLE) +- AC_MSG_RESULT([$ca]) +- elif test "x$cross_compiling" == "xyes"; then +- AC_MSG_RESULT([skipped (cross compiling)]) +- AC_MSG_WARN([skipped the ca-bundle detection when cross-compiling]) +- AC_DEFINE_UNQUOTED(MK_CA_BUNDLE, "", [Location of default ca bundle]) +- AC_SUBST(MK_CA_BUNDLE) +- else +- AC_MSG_RESULT([no]) +- AC_MSG_ERROR([you should give a ca-bundle location]) +- fi +-]) ++AC_DEFINE_UNQUOTED(MK_CA_BUNDLE, "", [Location of default ca bundle]) ++AC_SUBST(MK_CA_BUNDLE) + + AC_DEFUN([MK_PTHREAD], [ + AX_PTHREAD diff --git a/net/measurement-kit/files/patch-src_libmeasurement__kit_net_libssl.hpp b/net/measurement-kit/files/patch-src_libmeasurement__kit_net_libssl.hpp new file mode 100644 index 000000000000..4e4f47992d35 --- /dev/null +++ b/net/measurement-kit/files/patch-src_libmeasurement__kit_net_libssl.hpp @@ -0,0 +1,11 @@ +--- src/libmeasurement_kit/net/libssl.hpp.orig 2021-03-04 14:14:57 UTC ++++ src/libmeasurement_kit/net/libssl.hpp +@@ -156,7 +156,7 @@ class Context : public NonCopyable, public NonMovable + SSL_CTX_free(ctx); + return {SslCtxLoadVerifyLocationsError(), {}}; + } +- } else { ++ } else if (!SSL_CTX_set_default_verify_paths(ctx)) { + SSL_CTX_free(ctx); + return {MissingCaBundlePathError(), {}}; + }