boringssl: update to 20220419

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: boringssl: update to 20220419
From: Thomas Klausner <tk%giga.or.at@localhost>
Date: Wed, 20 Apr 2022 14:39:55 +0000
Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <tk%giga.or.at@localhost>
Pushed By:	wiz
Date:		Wed Apr 20 16:39:55 2022 +0200
Changeset:	b5b824d1b78ed0274408401e9967d74efc8b30e0

Modified Files:
	boringssl/Makefile
	boringssl/PLIST
	boringssl/buildlink3.mk
	boringssl/distinfo
Removed Files:
	boringssl/patches/patch-CMakeLists.txt
	boringssl/patches/patch-include__openssl__thread.h

Log Message:
boringssl: update to 20220419

No concise changelog found.

pkgsrc changes: use upstream install target, remove obsolete patches

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b5b824d1b78ed0274408401e9967d74efc8b30e0

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 boringssl/Makefile                                 |  31 ++--
 boringssl/PLIST                                    | 163 +++++++++++----------
 boringssl/buildlink3.mk                            |   5 +-
 boringssl/distinfo                                 |   8 +-
 boringssl/patches/patch-CMakeLists.txt             |  18 ---
 boringssl/patches/patch-include__openssl__thread.h |  16 --
 6 files changed, 100 insertions(+), 141 deletions(-)

diffs:
diff --git a/boringssl/Makefile b/boringssl/Makefile
index 444428391f..0d1cd0d86c 100644
--- a/boringssl/Makefile
+++ b/boringssl/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.8 2017/04/13 15:12:06 bsiegert Exp $
 
-DISTNAME=	boringssl-20170919
+DISTNAME=	boringssl-20220419
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 
@@ -15,35 +15,22 @@ WRKSRC=		${WRKDIR}/boringssl
 
 BUILD_DEPENDS+=	${GO_PACKAGE_DEP}
 
-USE_TOOLS+=	cmake perl
-USE_LANGUAGES+=	c gnu++11
-USE_CMAKE=	yes
-TEST_TARGET=	run_tests
-
-AUTO_MKDIRS=	yes
+USE_TOOLS+=		cmake perl
+USE_LANGUAGES+=		c gnu++11
+USE_CMAKE=		yes
+TEST_TARGET=		run_tests
+CMAKE_INSTALL_PREFIX=	${PREFIX}/boringssl
 
 CFLAGS+=	-D_XOPEN_SOURCE=600 -D_NETBSD_SOURCE
 
+BUILDLINK_TRANSFORM+=	rm:-Werror
+
 SUBST_CLASSES+=		go
-SUBST_STAGE.go=		post-patch
+SUBST_STAGE.go=		pre-configure
 SUBST_FILES.go=		CMakeLists.txt
 SUBST_SED.go=		-e '/find_program.GO_EXECUTABLE/s,go,${GO},'
 
 post-extract:
 	${RUN} mkdir -p ${WRKDIR}/build
 
-do-install:
-	for d in bssl/bin bssl/lib bssl/include/openssl; do		\
-		mkdir -p ${DESTDIR}${PREFIX}/$$d; 			\
-	done
-	${INSTALL_LIB} ${WRKSRC}/crypto/libcrypto.a ${DESTDIR}${PREFIX}/bssl/lib
-	${INSTALL_LIB} ${WRKSRC}/ssl/libssl.a ${DESTDIR}${PREFIX}/bssl/lib
-	${INSTALL_PROGRAM} ${WRKSRC}/ssl/test/bssl_shim ${DESTDIR}${PREFIX}/bssl/bin/bssl_shim
-	${INSTALL_PROGRAM} ${WRKSRC}/ssl/ssl_test ${DESTDIR}${PREFIX}/bssl/bin/ssl_test
-	${INSTALL_PROGRAM} ${WRKSRC}/tool/bssl ${DESTDIR}${PREFIX}/bssl/bin/bssl
-	(cd ${WRKSRC}/include/openssl &&				\
-		for f in *.h; do					\
-			${INSTALL_DATA} $$f ${DESTDIR}${PREFIX}/bssl/include/openssl/$$f; \
-		done)
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/boringssl/PLIST b/boringssl/PLIST
index 7919d28e24..65e92401af 100644
--- a/boringssl/PLIST
+++ b/boringssl/PLIST
@@ -1,79 +1,86 @@
 @comment $NetBSD$
-bssl/bin/bssl
-bssl/bin/bssl_shim
-bssl/bin/ssl_test
-bssl/include/openssl/aead.h
-bssl/include/openssl/aes.h
-bssl/include/openssl/arm_arch.h
-bssl/include/openssl/asn1.h
-bssl/include/openssl/asn1_mac.h
-bssl/include/openssl/asn1t.h
-bssl/include/openssl/base.h
-bssl/include/openssl/base64.h
-bssl/include/openssl/bio.h
-bssl/include/openssl/blowfish.h
-bssl/include/openssl/bn.h
-bssl/include/openssl/buf.h
-bssl/include/openssl/buffer.h
-bssl/include/openssl/bytestring.h
-bssl/include/openssl/cast.h
-bssl/include/openssl/chacha.h
-bssl/include/openssl/cipher.h
-bssl/include/openssl/cmac.h
-bssl/include/openssl/conf.h
-bssl/include/openssl/cpu.h
-bssl/include/openssl/crypto.h
-bssl/include/openssl/curve25519.h
-bssl/include/openssl/des.h
-bssl/include/openssl/dh.h
-bssl/include/openssl/digest.h
-bssl/include/openssl/dsa.h
-bssl/include/openssl/dtls1.h
-bssl/include/openssl/ec.h
-bssl/include/openssl/ec_key.h
-bssl/include/openssl/ecdh.h
-bssl/include/openssl/ecdsa.h
-bssl/include/openssl/engine.h
-bssl/include/openssl/err.h
-bssl/include/openssl/evp.h
-bssl/include/openssl/ex_data.h
-bssl/include/openssl/hkdf.h
-bssl/include/openssl/hmac.h
-bssl/include/openssl/is_boringssl.h
-bssl/include/openssl/lhash.h
-bssl/include/openssl/lhash_macros.h
-bssl/include/openssl/md4.h
-bssl/include/openssl/md5.h
-bssl/include/openssl/mem.h
-bssl/include/openssl/nid.h
-bssl/include/openssl/obj.h
-bssl/include/openssl/obj_mac.h
-bssl/include/openssl/objects.h
-bssl/include/openssl/opensslconf.h
-bssl/include/openssl/opensslv.h
-bssl/include/openssl/ossl_typ.h
-bssl/include/openssl/pem.h
-bssl/include/openssl/pkcs12.h
-bssl/include/openssl/pkcs7.h
-bssl/include/openssl/pkcs8.h
-bssl/include/openssl/poly1305.h
-bssl/include/openssl/pool.h
-bssl/include/openssl/rand.h
-bssl/include/openssl/rc4.h
-bssl/include/openssl/ripemd.h
-bssl/include/openssl/rsa.h
-bssl/include/openssl/safestack.h
-bssl/include/openssl/sha.h
-bssl/include/openssl/span.h
-bssl/include/openssl/srtp.h
-bssl/include/openssl/ssl.h
-bssl/include/openssl/ssl3.h
-bssl/include/openssl/stack.h
-bssl/include/openssl/thread.h
-bssl/include/openssl/tls1.h
-bssl/include/openssl/type_check.h
-bssl/include/openssl/x509.h
-bssl/include/openssl/x509_vfy.h
-bssl/include/openssl/x509v3.h
-bssl/lib/libcrypto.a
-bssl/lib/libssl.a
+boringssl/bin/bssl
+boringssl/include/openssl/aead.h
+boringssl/include/openssl/aes.h
+boringssl/include/openssl/arm_arch.h
+boringssl/include/openssl/asn1.h
+boringssl/include/openssl/asn1_mac.h
+boringssl/include/openssl/asn1t.h
+boringssl/include/openssl/base.h
+boringssl/include/openssl/base64.h
+boringssl/include/openssl/bio.h
+boringssl/include/openssl/blake2.h
+boringssl/include/openssl/blowfish.h
+boringssl/include/openssl/bn.h
+boringssl/include/openssl/buf.h
+boringssl/include/openssl/buffer.h
+boringssl/include/openssl/bytestring.h
+boringssl/include/openssl/cast.h
+boringssl/include/openssl/chacha.h
+boringssl/include/openssl/cipher.h
+boringssl/include/openssl/cmac.h
+boringssl/include/openssl/conf.h
+boringssl/include/openssl/cpu.h
+boringssl/include/openssl/crypto.h
+boringssl/include/openssl/curve25519.h
+boringssl/include/openssl/des.h
+boringssl/include/openssl/dh.h
+boringssl/include/openssl/digest.h
+boringssl/include/openssl/dsa.h
+boringssl/include/openssl/dtls1.h
+boringssl/include/openssl/e_os2.h
+boringssl/include/openssl/ec.h
+boringssl/include/openssl/ec_key.h
+boringssl/include/openssl/ecdh.h
+boringssl/include/openssl/ecdsa.h
+boringssl/include/openssl/engine.h
+boringssl/include/openssl/err.h
+boringssl/include/openssl/evp.h
+boringssl/include/openssl/evp_errors.h
+boringssl/include/openssl/ex_data.h
+boringssl/include/openssl/hkdf.h
+boringssl/include/openssl/hmac.h
+boringssl/include/openssl/hpke.h
+boringssl/include/openssl/hrss.h
+boringssl/include/openssl/is_boringssl.h
+boringssl/include/openssl/lhash.h
+boringssl/include/openssl/md4.h
+boringssl/include/openssl/md5.h
+boringssl/include/openssl/mem.h
+boringssl/include/openssl/nid.h
+boringssl/include/openssl/obj.h
+boringssl/include/openssl/obj_mac.h
+boringssl/include/openssl/objects.h
+boringssl/include/openssl/opensslconf.h
+boringssl/include/openssl/opensslv.h
+boringssl/include/openssl/ossl_typ.h
+boringssl/include/openssl/pem.h
+boringssl/include/openssl/pkcs12.h
+boringssl/include/openssl/pkcs7.h
+boringssl/include/openssl/pkcs8.h
+boringssl/include/openssl/poly1305.h
+boringssl/include/openssl/pool.h
+boringssl/include/openssl/rand.h
+boringssl/include/openssl/rc4.h
+boringssl/include/openssl/ripemd.h
+boringssl/include/openssl/rsa.h
+boringssl/include/openssl/safestack.h
+boringssl/include/openssl/sha.h
+boringssl/include/openssl/siphash.h
+boringssl/include/openssl/span.h
+boringssl/include/openssl/srtp.h
+boringssl/include/openssl/ssl.h
+boringssl/include/openssl/ssl3.h
+boringssl/include/openssl/stack.h
+boringssl/include/openssl/thread.h
+boringssl/include/openssl/tls1.h
+boringssl/include/openssl/trust_token.h
+boringssl/include/openssl/type_check.h
+boringssl/include/openssl/x509.h
+boringssl/include/openssl/x509_vfy.h
+boringssl/include/openssl/x509v3.h
+boringssl/lib/cmake/OpenSSL/OpenSSLConfig.cmake
+boringssl/lib/cmake/OpenSSL/OpenSSLTargets-noconfig.cmake
+boringssl/lib/cmake/OpenSSL/OpenSSLTargets.cmake
+boringssl/lib/libcrypto.a
+boringssl/lib/libssl.a
diff --git a/boringssl/buildlink3.mk b/boringssl/buildlink3.mk
index 1784889146..36dec4279c 100644
--- a/boringssl/buildlink3.mk
+++ b/boringssl/buildlink3.mk
@@ -1,13 +1,14 @@
 # $NetBSD$
 
-BUILDLINK_DEPMETHOD.boringssl?=	build
 BUILDLINK_TREE+=		boringssl
 
 .if !defined(BORINGSSL_BUILDLINK3_MK)
 BORINGSSL_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.boringssl+=	boringssl>=20151230nb6
+BUILDLINK_API_DEPENDS.boringssl+=	boringssl>=20220419
+
 BUILDLINK_PKGSRCDIR.boringssl?=		../../wip/boringssl
+BUILDLINK_DEPMETHOD.boringssl?=		build
 .endif	# BORINGSSL_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-boringssl
diff --git a/boringssl/distinfo b/boringssl/distinfo
index e02cdaf7d2..c8efb24c38 100644
--- a/boringssl/distinfo
+++ b/boringssl/distinfo
@@ -1,7 +1,5 @@
 $NetBSD: distinfo,v 1.2 2016/12/21 13:38:16 joerg Exp $
 
-RMD160 (boringssl-20170919.tar.gz) = cf5facc74cc90471c6a5c0f2ba8ec61d712f4504
-SHA512 (boringssl-20170919.tar.gz) = 199722e9f247bd5172f118309d936139f66ed7b2f254f02dae941629dd0a03755080173ef8bada30281d732e04e02e0945b313a20c5892047773a91de9d719c7
-Size (boringssl-20170919.tar.gz) = 27761764 bytes
-SHA1 (patch-CMakeLists.txt) = a1d04114ffaa7e4e135c9954a16303acd131ca93
-SHA1 (patch-include__openssl__thread.h) = 0faf11db8591026c10ae3271936b1ef6381d977a
+BLAKE2s (boringssl-20220419.tar.gz) = c3693b8b5d710205c70f9fb4759f1d6357df1cdb7b05484c472b30f52f3d52c9
+SHA512 (boringssl-20220419.tar.gz) = f717abf2f9b76bd22a858352a5893828cd42595bd77a8e9ee3608b631dbe3cdb286809b8b46d365601b88fd0ab760c402830d9a4d80792455f6dbfa7821d3cdb
+Size (boringssl-20220419.tar.gz) = 30876058 bytes
diff --git a/boringssl/patches/patch-CMakeLists.txt b/boringssl/patches/patch-CMakeLists.txt
deleted file mode 100644
index 0a54e3277d..0000000000
--- a/boringssl/patches/patch-CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-Avoid defining _XOPEN_SOURCE twice (we're passing it as CFLAGS)
-
---- CMakeLists.txt.orig	2017-09-19 07:08:07.000000000 +0000
-+++ CMakeLists.txt
-@@ -152,11 +152,6 @@ if(CMAKE_COMPILER_IS_GNUCXX)
-   endif()
- endif()
- 
--# pthread_rwlock_t requires a feature flag.
--if(NOT WIN32)
--  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_XOPEN_SOURCE=700")
--endif()
--
- if(FUZZ)
-   if(NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-     message(FATAL_ERROR "You need to build with Clang for fuzzing to work")
diff --git a/boringssl/patches/patch-include__openssl__thread.h b/boringssl/patches/patch-include__openssl__thread.h
deleted file mode 100644
index 1c0ede384c..0000000000
--- a/boringssl/patches/patch-include__openssl__thread.h
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-include__openssl__thread.h,v 1.1.1.1 2015/12/31 02:57:35 agc Exp $
-
-NetBSD portability patches
-
---- include/openssl/thread.h.orig	2015-12-30 15:55:52.000000000 -0800
-+++ include/openssl/thread.h	2015-12-30 18:06:05.000000000 -0800
-@@ -87,6 +87,9 @@
- typedef union crypto_mutex_st {
-   double alignment;
-   uint8_t padding[3*sizeof(int) + 5*sizeof(unsigned) + 16 + 8];
-+#if defined(__NetBSD__)
-+  uint8_t	nbpad[64 + 8];
-+#endif
- } CRYPTO_MUTEX;
- #endif
-
Prev by Date: g/c TODO
Next by Date: microsynteny-tools: Update to 0.1.0.146
Previous by Thread: g/c TODO
Next by Thread: microsynteny-tools: Update to 0.1.0.146
Indexes:
Home | Main Index | Thread Index | Old Index