git: 277ebc94020d - main - security/boringssl: update to the recent commit
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 27 Jan 2022 01:46:33 UTC
The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=277ebc94020d1bb329df3a7abf7f60a0f8398d5d commit 277ebc94020d1bb329df3a7abf7f60a0f8398d5d Author: Sergey A. Osokin <osa@FreeBSD.org> AuthorDate: 2022-01-27 01:43:13 +0000 Commit: Sergey A. Osokin <osa@FreeBSD.org> CommitDate: 2022-01-27 01:43:13 +0000 security/boringssl: update to the recent commit The vendor is limit handshake tests to Linux platform for simplicity [1], so remove two patches. References: [1] https://bugs.chromium.org/p/boringssl/issues/detail?id=476 --- security/boringssl/Makefile | 4 ++-- security/boringssl/distinfo | 6 ++--- .../files/patch-ssl_test_handshake__util.cc | 28 ---------------------- .../files/patch-ssl_test_handshake__util.h | 11 --------- 4 files changed, 5 insertions(+), 44 deletions(-) diff --git a/security/boringssl/Makefile b/security/boringssl/Makefile index 50d90157ce48..b8ae76803349 100644 --- a/security/boringssl/Makefile +++ b/security/boringssl/Makefile @@ -1,5 +1,5 @@ PORTNAME= boringssl -PORTVERSION= 0.0.0.0.2022.01.25.02 +PORTVERSION= 0.0.0.0.2022.01.26.01 CATEGORIES= security MAINTAINER= osa@FreeBSD.org @@ -20,7 +20,7 @@ CPE_VENDOR= google USE_GITHUB= yes GH_ACCOUNT= google -GH_TAGNAME= b90261a +GH_TAGNAME= 0f4454c GH_TUPLE= golang:crypto:c07d793c2f9a:golang_crypto/vendor/golang.org/x/crypto \ golang:net:04defd469f4e:golang_net/vendor/golang.org/x/net \ golang:sys:04245dca01da:golang_sys/vendor/golang.org/x/sys \ diff --git a/security/boringssl/distinfo b/security/boringssl/distinfo index 6c5f2441ac82..7b0a25317be3 100644 --- a/security/boringssl/distinfo +++ b/security/boringssl/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1643203234 -SHA256 (google-boringssl-0.0.0.0.2022.01.25.02-b90261a_GH0.tar.gz) = d16e202b8eba8cd517d0676aec7c4800f4f7aa8ac38ec184cd49e7efd0f91c62 -SIZE (google-boringssl-0.0.0.0.2022.01.25.02-b90261a_GH0.tar.gz) = 30730783 +TIMESTAMP = 1643231160 +SHA256 (google-boringssl-0.0.0.0.2022.01.26.01-0f4454c_GH0.tar.gz) = fa83af206c8032f3f86bb863d9056f2bea11b1fb10474b83f8a4cdbc50d86ee4 +SIZE (google-boringssl-0.0.0.0.2022.01.26.01-0f4454c_GH0.tar.gz) = 30730960 SHA256 (golang-crypto-c07d793c2f9a_GH0.tar.gz) = bd1e0856c43287c6ebd20d59e2b4f2ffa91c5cc275dbb02bb2cfc822e6dc18a4 SIZE (golang-crypto-c07d793c2f9a_GH0.tar.gz) = 1732023 SHA256 (golang-net-04defd469f4e_GH0.tar.gz) = 6009a6f0989341df975799276ff1c49af650d4a4ed3fd6db3501b91eb601810d diff --git a/security/boringssl/files/patch-ssl_test_handshake__util.cc b/security/boringssl/files/patch-ssl_test_handshake__util.cc deleted file mode 100644 index e30126eda3b8..000000000000 --- a/security/boringssl/files/patch-ssl_test_handshake__util.cc +++ /dev/null @@ -1,28 +0,0 @@ ---- ssl/test/handshake_util.cc.orig 2022-01-03 17:27:50 UTC -+++ ssl/test/handshake_util.cc -@@ -21,8 +21,14 @@ - #include <spawn.h> - #include <sys/socket.h> - #include <sys/stat.h> -+#ifdef __FreeBSD__ -+#include <sys/signal.h> -+#endif - #include <sys/types.h> - #include <sys/wait.h> -+#ifdef __FreeBSD__ -+#include <signal.h> -+#endif - #include <unistd.h> - #endif - -@@ -37,6 +43,10 @@ - - #include <openssl/bytestring.h> - #include <openssl/ssl.h> -+ -+#ifdef __FreeBSD__ -+extern char **environ; -+#endif - - using namespace bssl; - diff --git a/security/boringssl/files/patch-ssl_test_handshake__util.h b/security/boringssl/files/patch-ssl_test_handshake__util.h deleted file mode 100644 index 0c0ef2e8d3bf..000000000000 --- a/security/boringssl/files/patch-ssl_test_handshake__util.h +++ /dev/null @@ -1,11 +0,0 @@ ---- ssl/test/handshake_util.h.orig 2022-01-03 17:26:22 UTC -+++ ssl/test/handshake_util.h -@@ -22,7 +22,7 @@ - #include "settings_writer.h" - - --#if defined(OPENSSL_LINUX) && !defined(OPENSSL_ANDROID) -+#if defined(OPENSSL_LINUX) || defined(OPENSSL_FREEBSD) && !defined(OPENSSL_ANDROID) - #define HANDSHAKER_SUPPORTED - #endif -