git: 459915b74a14 - main - security/boringssl: update to the recent snapshot

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Sergey A. Osokin <osa_at_FreeBSD.org>
Date: Sat, 28 Sep 2024 00:17:55 UTC
The branch main has been updated by osa:

URL: https://cgit.FreeBSD.org/ports/commit/?id=459915b74a14570d350c5e29d1329cac06d6ca1f

commit 459915b74a14570d350c5e29d1329cac06d6ca1f
Author:     Sergey A. Osokin <osa@FreeBSD.org>
AuthorDate: 2024-09-28 00:16:55 +0000
Commit:     Sergey A. Osokin <osa@FreeBSD.org>
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 <bsd.port.pre.mk>
+
+.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 <bsd.port.mk>
+.include <bsd.port.post.mk>
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)