git: 76941a47e63c - main - security/boringssl: update to the recent commit.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 04 Jan 2022 22:20:20 UTC
The branch main has been updated by osa:
URL: https://cgit.FreeBSD.org/ports/commit/?id=76941a47e63c8348bf81c3ad933dda4678486b06
commit 76941a47e63c8348bf81c3ad933dda4678486b06
Author: Sergey A. Osokin <osa@FreeBSD.org>
AuthorDate: 2022-01-04 22:19:01 +0000
Commit: Sergey A. Osokin <osa@FreeBSD.org>
CommitDate: 2022-01-04 22:20:11 +0000
security/boringssl: update to the recent commit.
Based on patches submitted by: Ashish SHUKLA <ashish@FreeBSD.org>
---
security/boringssl/Makefile | 19 +++++++++++----
security/boringssl/distinfo | 14 ++++++++---
.../files/patch-ssl_test_handshake__util.cc | 28 ++++++++++++++++++++++
.../files/patch-ssl_test_handshake__util.h | 11 +++++++++
4 files changed, 65 insertions(+), 7 deletions(-)
diff --git a/security/boringssl/Makefile b/security/boringssl/Makefile
index 7fd734050030..5e774a683ecf 100644
--- a/security/boringssl/Makefile
+++ b/security/boringssl/Makefile
@@ -1,6 +1,5 @@
PORTNAME= boringssl
-PORTVERSION= 0.0.0.0.2020.04.29.01
-PORTREVISION= 1
+PORTVERSION= 0.0.0.0.2021.12.21.01
CATEGORIES= security
MAINTAINER= ports@FreeBSD.org
@@ -15,12 +14,24 @@ CPE_VENDOR= google
USE_GITHUB= yes
GH_ACCOUNT= google
-GH_TAGNAME= 6a71840
+GH_TAGNAME= 9bcc12d
+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 \
+ golang:term:7de9c90e9dd1:golang_term/vendor/golang.org/x/term
CMAKE_ARGS+= -DBUILD_SHARED_LIBS=1 \
-DCMAKE_BUILD_TYPE=Release
USE_LDCONFIG= yes
-LDFLAGS+= -Wl,-rpath,${PREFIX}/lib
+LDFLAGS+= -Wl,-rpath,${LOCALBASE}/lib
TEST_TARGET= run_tests
+GO_BUILDFLAGS+= -mod=vendor
+MAKE_ENV+= GOPATH=${WRKSRC}/vendor GOPROXY=off
+
+post-patch:
+ @${GREP} -FRl -- '-D_XOPEN_SOURCE=700' ${WRKSRC} | \
+ ${XARGS} ${REINPLACE_CMD} -e 's,-D_XOPEN_SOURCE=700,,'
+ @${GREP} -FRl '${GO_EXECUTABLE} run ' ${WRKSRC} | \
+ ${XARGS} ${REINPLACE_CMD} -r -e 's,([$][{]GO_EXECUTABLE[}] run),\1 ${GO_BUILDFLAGS},'
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/tool/bssl ${STAGEDIR}${PREFIX}/bin/
diff --git a/security/boringssl/distinfo b/security/boringssl/distinfo
index 5ed4feb25203..e2ac64e11294 100644
--- a/security/boringssl/distinfo
+++ b/security/boringssl/distinfo
@@ -1,3 +1,11 @@
-TIMESTAMP = 1588184752
-SHA256 (google-boringssl-0.0.0.0.2020.04.29.01-6a71840_GH0.tar.gz) = 2d4c0c64b59ca1346b7e9f4ab3ace7e62a8e7b98b6a778b16016e23d5b94e859
-SIZE (google-boringssl-0.0.0.0.2020.04.29.01-6a71840_GH0.tar.gz) = 26708723
+TIMESTAMP = 1641280446
+SHA256 (google-boringssl-0.0.0.0.2021.12.21.01-9bcc12d_GH0.tar.gz) = 529e77f24d8a1e5286ab9cd1fc649e8ffe484d7d149c4889650067bc2537f274
+SIZE (google-boringssl-0.0.0.0.2021.12.21.01-9bcc12d_GH0.tar.gz) = 30725757
+SHA256 (golang-crypto-c07d793c2f9a_GH0.tar.gz) = bd1e0856c43287c6ebd20d59e2b4f2ffa91c5cc275dbb02bb2cfc822e6dc18a4
+SIZE (golang-crypto-c07d793c2f9a_GH0.tar.gz) = 1732023
+SHA256 (golang-net-04defd469f4e_GH0.tar.gz) = 6009a6f0989341df975799276ff1c49af650d4a4ed3fd6db3501b91eb601810d
+SIZE (golang-net-04defd469f4e_GH0.tar.gz) = 1252122
+SHA256 (golang-sys-04245dca01da_GH0.tar.gz) = b90ec2bae1f7e395eb368638a6627199efdc28fa9c592a72aac0ae32351fd5d7
+SIZE (golang-sys-04245dca01da_GH0.tar.gz) = 1231301
+SHA256 (golang-term-7de9c90e9dd1_GH0.tar.gz) = 73603eaab2ab2bfe05061d64ad09f8ed7469de6964a672398f7bf82cffb4b1da
+SIZE (golang-term-7de9c90e9dd1_GH0.tar.gz) = 15239
diff --git a/security/boringssl/files/patch-ssl_test_handshake__util.cc b/security/boringssl/files/patch-ssl_test_handshake__util.cc
new file mode 100644
index 000000000000..e30126eda3b8
--- /dev/null
+++ b/security/boringssl/files/patch-ssl_test_handshake__util.cc
@@ -0,0 +1,28 @@
+--- 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
new file mode 100644
index 000000000000..0c0ef2e8d3bf
--- /dev/null
+++ b/security/boringssl/files/patch-ssl_test_handshake__util.h
@@ -0,0 +1,11 @@
+--- 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
+