From nobody Sat Sep 28 00:17:55 2024 X-Original-To: dev-commits-ports-main@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 4XFnwg3MZlz5XRlR; Sat, 28 Sep 2024 00:17:55 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XFnwg2n5qz40QV; Sat, 28 Sep 2024 00:17:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727482675; 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=XSSJR7bduC5f9hZ/MK+ld6HeHMxHyA6VS5Kufov7gzM=; b=kURpLKOX9JjtMrCXtXsZOO2gwP3JmLSxKza1H52zzZYuEFfAg8hjmDe+djFV5bMOSliiro LiZot4HNFpRFC8IaAMyKfwO7A2xIX+lb1Oy619eNhi/65fFDDI69DCz3pOCCqYYMjs32+N WNK3HHSReuPF8Tdhgkiv6ikii+gpoj2DxqApn5iVLgwAtC33fifDcrc3av5q2wjZQROBr8 eVhxjdJAa0MYuSvDyRiMmWmn9QIJ3ZeL7rAx3uVWl3pPe/DkK1PJ0M8cg69YB74WGbfcJz hKE1tHQVGy9FqIJRqQKsDDnnQ2Z/734H/HAg00jBbMtR5MWil734kXMVcoPUSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727482675; 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=XSSJR7bduC5f9hZ/MK+ld6HeHMxHyA6VS5Kufov7gzM=; b=ker6WZtZcSzK2d+H9w7KF4Ln7u4X/lVUuFIi7ftiA1KcCTdwD2YXPrQN5+POwk9dD4EK6C bCVKwYCJjdPjkGfqbe9gesWaKbB6vL4ml+3MPQ/tlgMaxTSLK/1JoolN8TKlxdUxv10uEU O/Re7un0BfC/+EeNfHg5MBoymxyU/ageVfkjMMz6lIQk6O4DS9fUw/kPRK68DkhEPsUFtp 9amG4e2YO3zSNQg4hGYzL7Qhi8uMyf42dsLSPOUfXDIQ43DC3s3MIU6j0S58Sp1WQIgMJm dUeN4qqIfzKzzb6mwGKRTmgzG0mI84UlaMeg4P7MD+Rn8EW/0EyOt0MW7GgWIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727482675; a=rsa-sha256; cv=none; b=sTjYx2zm4iC+0tL9w1VJT2ndMoBqm/puut9rVwgGKDZU6Ziv30Vv4H34PP3lBaVmulQ5EN a0S8gQPxhc7eG2UJUizNLc/FYbIxWIQtXlgosi8ZIo+VdxsIR5GkqrcW/7SfdfF9ZO3gYS Ymo/Py6XWV0dJUksB+au/WpHneoBZNFR1sYVC+91JMF4li0L8JrGOu5qCHGxZmelPZ+oj+ wkq9IyaTbCjSPvNIkhYHTEenM1hylpW4qIQ68FIFAKxBrd4+yIxsNEbDOyagosEBMTMx3N KC5EvE4R2AkXo0NJLBtm5PBukCC25l06fNbgTB7DidknZVaApSRir+AqU5xFRw== 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 4XFnwg2GbTz11yG; Sat, 28 Sep 2024 00:17:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48S0HthK042239; Sat, 28 Sep 2024 00:17:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48S0HtrZ042236; Sat, 28 Sep 2024 00:17:55 GMT (envelope-from git) Date: Sat, 28 Sep 2024 00:17:55 GMT Message-Id: <202409280017.48S0HtrZ042236@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Sergey A. Osokin" Subject: git: 459915b74a14 - main - security/boringssl: update to the recent snapshot List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: osa X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 459915b74a14570d350c5e29d1329cac06d6ca1f Auto-Submitted: auto-generated The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=459915b74a14570d350c5e29d1329cac06d6ca1f commit 459915b74a14570d350c5e29d1329cac06d6ca1f Author: Sergey A. Osokin AuthorDate: 2024-09-28 00:16:55 +0000 Commit: Sergey A. Osokin CommitDate: 2024-09-28 00:16:55 +0000 security/boringssl: update to the recent snapshot Also: - update go packages according to the recent snapshot requirements - fetch go packages optionaly (for makesum and test targets only) - update the patch - use go v1.22 --- security/boringssl/Makefile | 37 ++++++++++++++++----------- security/boringssl/distinfo | 34 +++++++++++++----------- security/boringssl/files/patch-CMakeLists.txt | 4 +-- 3 files changed, 43 insertions(+), 32 deletions(-) diff --git a/security/boringssl/Makefile b/security/boringssl/Makefile index 5fa2d4b18b25..68751946dad8 100644 --- a/security/boringssl/Makefile +++ b/security/boringssl/Makefile @@ -1,15 +1,6 @@ PORTNAME= boringssl -PORTVERSION= 0.0.0.0.2024.09.20.01 +PORTVERSION= 0.0.0.0.2024.09.27.01 CATEGORIES= security -MASTER_SITES+= https://proxy.golang.org/:gomods -DISTFILES+= golang.org/x/crypto/@v/v0.25.0.zip:gomods \ - golang.org/x/crypto/@v/v0.25.0.mod:gomods \ - golang.org/x/net/@v/v0.27.0.zip:gomods \ - golang.org/x/net/@v/v0.27.0.mod:gomods \ - golang.org/x/sys/@v/v0.22.0.zip:gomods \ - golang.org/x/sys/@v/v0.22.0.mod:gomods \ - golang.org/x/term/@v/v0.22.0.zip:gomods \ - golang.org/x/term/@v/v0.22.0.mod:gomods EXTRACT_ONLY= ${GH_ACCOUNT}-${PORTNAME}-${PORTVERSION}-${GH_TAGNAME}_GH0.tar.gz MAINTAINER= osa@FreeBSD.org @@ -19,16 +10,16 @@ WWW= https://boringssl.googlesource.com/boringssl/ LICENSE= OpenSSL LICENSE_FILE= ${WRKSRC}/LICENSE -USES= cmake:insource cpe go:no_targets localbase perl5 +USES= cmake:insource cpe go:no_targets,1.22 localbase perl5 -CONFLICTS_INSTALL= libressl libressl-devel \ - openssl openssl3[012] openssl-quictls +CONFLICTS_INSTALL= libressl libressl-devel openssl openssl111 \ + openssl3[123] openssl-quictls openssl31-quictls CPE_VENDOR= google USE_GITHUB= yes GH_ACCOUNT= google -GH_TAGNAME= 718900a +GH_TAGNAME= 72a6050 CMAKE_ARGS+= -DBUILD_SHARED_LIBS=1 CFLAGS_i386= -msse2 @@ -38,8 +29,24 @@ TEST_TARGET= run_tests MAKE_ENV+= GOFLAGS=-mod=readonly \ GOPROXY=file://${DISTDIR} +.include + +.if ${.TARGETS} == "makesum" || ${.TARGETS} == "test" +MASTER_SITES+= https://proxy.golang.org/:gomods +DISTFILES+= filippo.io/mlkem768/@v/v0.0.0-20240821141156-859a9b3f2ff6.zip:gomods \ + filippo.io/mlkem768/@v/v0.0.0-20240821141156-859a9b3f2ff6.mod:gomods \ + golang.org/x/crypto/@v/v0.26.0.zip:gomods \ + golang.org/x/crypto/@v/v0.26.0.mod:gomods \ + golang.org/x/net/@v/v0.27.0.zip:gomods \ + golang.org/x/net/@v/v0.27.0.mod:gomods \ + golang.org/x/sys/@v/v0.24.0.zip:gomods \ + golang.org/x/sys/@v/v0.24.0.mod:gomods \ + golang.org/x/term/@v/v0.23.0.zip:gomods \ + golang.org/x/term/@v/v0.23.0.mod:gomods +.endif + post-install: ${LN} -sf libcrypto.so.1 ${STAGEDIR}${PREFIX}/lib/libcrypto.so.1.0.0 ${LN} -sf libssl.so.1 ${STAGEDIR}${PREFIX}/lib/libssl.so.1.0.0 -.include +.include diff --git a/security/boringssl/distinfo b/security/boringssl/distinfo index bd6787db6769..69a623186e9c 100644 --- a/security/boringssl/distinfo +++ b/security/boringssl/distinfo @@ -1,19 +1,23 @@ -TIMESTAMP = 1726937397 -SHA256 (golang.org/x/crypto/@v/v0.25.0.zip) = 5cd21f5fcb21845389eed13ad39186f57c86db70f3cc6cf8a4904633f07d1bdb -SIZE (golang.org/x/crypto/@v/v0.25.0.zip) = 1783134 -SHA256 (golang.org/x/crypto/@v/v0.25.0.mod) = 1fbb5033c267bcf60e4f981e0ab8f08148b1fdf14103c592bf781c805088ea23 -SIZE (golang.org/x/crypto/@v/v0.25.0.mod) = 190 +TIMESTAMP = 1727481643 +SHA256 (filippo.io/mlkem768/@v/v0.0.0-20240821141156-859a9b3f2ff6.zip) = 937bf0a147580a33e2a8831bc73edb8889698f9e906c71740ddf4fffb9691d4e +SIZE (filippo.io/mlkem768/@v/v0.0.0-20240821141156-859a9b3f2ff6.zip) = 21003 +SHA256 (filippo.io/mlkem768/@v/v0.0.0-20240821141156-859a9b3f2ff6.mod) = e11c63e9fabc4f05d5f369a535d67287958b4f9266390b68882f28d67311a676 +SIZE (filippo.io/mlkem768/@v/v0.0.0-20240821141156-859a9b3f2ff6.mod) = 121 +SHA256 (golang.org/x/crypto/@v/v0.26.0.zip) = ec96acfe28be3ff2fb14201c5f51132f0e24c7d0d6f3201a8aa69c84f989d014 +SIZE (golang.org/x/crypto/@v/v0.26.0.zip) = 1784955 +SHA256 (golang.org/x/crypto/@v/v0.26.0.mod) = 5dfc662e7a84a6c435914c07fca5585ad98d3c60ceb7d088ad39ce2fb2cf4f83 +SIZE (golang.org/x/crypto/@v/v0.26.0.mod) = 190 SHA256 (golang.org/x/net/@v/v0.27.0.zip) = 0adf4068f2b9d2b2852288b77caf1f76dac61f960e691e7544191de9bfa36406 SIZE (golang.org/x/net/@v/v0.27.0.zip) = 1836756 SHA256 (golang.org/x/net/@v/v0.27.0.mod) = 2e321fd3cededd8992c5192d1399af4e0900debcadbba27e3a06420617879f17 SIZE (golang.org/x/net/@v/v0.27.0.mod) = 155 -SHA256 (golang.org/x/sys/@v/v0.22.0.zip) = 2434299f530b049a5c8121d6465751ce58bd62f939afde34c442f79c88e9033c -SIZE (golang.org/x/sys/@v/v0.22.0.zip) = 1959283 -SHA256 (golang.org/x/sys/@v/v0.22.0.mod) = d227b325f621f4ebe28d39ba773ea99b870f393b7c09c34592c365b16dd560de -SIZE (golang.org/x/sys/@v/v0.22.0.mod) = 33 -SHA256 (golang.org/x/term/@v/v0.22.0.zip) = 0766e30db0cea597a7c87ad6a829df2a538939dc65b5ca65791dfd6e4f1244b4 -SIZE (golang.org/x/term/@v/v0.22.0.zip) = 19883 -SHA256 (golang.org/x/term/@v/v0.22.0.mod) = 5554d3f6d36b677248edc280bb560f396dbd8ab6b124f7ffa407977df7ce37b9 -SIZE (golang.org/x/term/@v/v0.22.0.mod) = 68 -SHA256 (google-boringssl-0.0.0.0.2024.09.20.01-718900a_GH0.tar.gz) = daa629ecddf449d1f1bb31aabe71f0cc88a27a4d064db3c518a44c2d3668d5b7 -SIZE (google-boringssl-0.0.0.0.2024.09.20.01-718900a_GH0.tar.gz) = 45409259 +SHA256 (golang.org/x/sys/@v/v0.24.0.zip) = fbc83ddb0aee236ee85c0f8294e7c9b6f79d28794d22e7d0957fcd64ca252960 +SIZE (golang.org/x/sys/@v/v0.24.0.zip) = 1962535 +SHA256 (golang.org/x/sys/@v/v0.24.0.mod) = d227b325f621f4ebe28d39ba773ea99b870f393b7c09c34592c365b16dd560de +SIZE (golang.org/x/sys/@v/v0.24.0.mod) = 33 +SHA256 (golang.org/x/term/@v/v0.23.0.zip) = 2597a62b487b952c11c89b2001551af1fe1d29c484388ec1c3f5e3be7ff58ba5 +SIZE (golang.org/x/term/@v/v0.23.0.zip) = 19866 +SHA256 (golang.org/x/term/@v/v0.23.0.mod) = d44cfec368bf145eb7174b94307dbbf13d9ce881f03de797c3abf5731fba1eba +SIZE (golang.org/x/term/@v/v0.23.0.mod) = 68 +SHA256 (google-boringssl-0.0.0.0.2024.09.27.01-72a6050_GH0.tar.gz) = 6f8a553e730206dc1e239f479bbbe4769ecbd9d83a78c5bb58ef1e6219c5b87d +SIZE (google-boringssl-0.0.0.0.2024.09.27.01-72a6050_GH0.tar.gz) = 45412800 diff --git a/security/boringssl/files/patch-CMakeLists.txt b/security/boringssl/files/patch-CMakeLists.txt index 4e3e522d5f6f..36613ff98cc5 100644 --- a/security/boringssl/files/patch-CMakeLists.txt +++ b/security/boringssl/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2024-04-01 22:15:28 UTC +--- CMakeLists.txt.orig 2024-09-26 16:41:25 UTC +++ CMakeLists.txt -@@ -610,6 +610,8 @@ add_library(ssl ${SSL_SOURCES}) +@@ -624,6 +624,8 @@ target_link_libraries(ssl crypto) # here. set_property(TARGET ssl PROPERTY EXPORT_NAME SSL) target_link_libraries(ssl crypto)