gentoo resync : 25.11.2020

3 files changed, 123 insertions, 0 deletions

diff --git a/dev-libs/libressl/Manifest b/dev-libs/libressl/Manifest
index 250619157c0c..0251877936aa 100644
--- a/dev-libs/libressl/Manifest
+++ b/dev-libs/libressl/Manifest
@@ -1,15 +1,18 @@
 AUX libressl-2.8.3-solaris10.patch 1928 BLAKE2B e12372c1fba9c586e5d8c4ccd7af0c3d888dd42f4456e28091424f8c1f0ec0362f9558957752a30fabb7b06e35929cad8fd582deea58d48da4759ee0aec12b08 SHA512 39ab3dea9af735f2485108aa88e7d951563ffbdeb8a002eb76560617583df58c84d5af83a1e51d0a6f71e9709d1f1f83265b030740f6024e5d45aaf0d98290b5
 AUX libressl-2.9.2-non-glibc.patch 981 BLAKE2B c9d208dac68fbe7205617ca667d111d00ab9d2324ba0c91c36f05efba9372a97ca76d844144d886814798e5be29c8e6a1bc0ac0341ee420660282d6d5267970f SHA512 5672b69a6c4ad68eb02e7e2b43dca6b2c557e0b74c29fcd249f46e65b284c740d9979e43fb36a7784ad41e7bbfee79ce18242990e62ecdb80d1a44cf1540dc8c
+AUX libressl-3.2.2-build.patch 2096 BLAKE2B 751a874e6d812ab42326ceb2b304d3910830edc50feca2ff388994b03618e0ec27f269dee43655e49e0a296967cb9f8c2bb80abdfe08a3eaeb76424de0a68fa9 SHA512 2c59af34de6608421371b1b8f8371cf27b22918370e39d3c9c70277905169a3e0f26f584cf0491ec8a0df28dfa4dce3f46250038048ba6cab58355e7afbfd2bb
 DIST libressl-2.9.2.tar.gz 3607549 BLAKE2B 496e993e4f1c85167e0344afab61259d4e3f094a7e5dfac85878191070e2c196753162532efb921fab582481aeda3705fca9a2b48921cba82465192f2c1eef95 SHA512 b43e73e47c1f14da3c702ab42f29f1d67645a4fa425441337bd6c125b481ef78a40fd13e6b34dadb2af337e1c0c190cfb616186d4db9c9a743a37e594b9b8033
 DIST libressl-3.0.2.tar.gz 3669468 BLAKE2B 84ad2c1fea8d2119f191ec8ab3f999fb0354636d48aabb76fa1786139c669c9d8ca105d79cc8416dd20683818eccc84490cdadc9ca94cb2b0e411644e923a3d6 SHA512 19226da3bc9776e1da40b8e94dfa53564d5e6acc80edee539ba12d7a75c1bb8c0603e7633f26a6ef8b12adc56bb677ccda448575aa6be2ad3df5447465a4b080
 DIST libressl-3.1.3.tar.gz 3766345 BLAKE2B 4956fa0ae6030e9e9969d584db3bc0084c4b155207d1472ebfa40c8e68e925214b66ed1bc7e32d98a9a48de0b61909323a0380a973c724422c92bfe88b9fdfb2 SHA512 f9f497fe5d09b8b762175da038a8e67d9d2567462fefc49e434d306a3071ba3a4d369c89143d9d90e3bbcc7b9ba051c9c923a0dfc41d856edc08ae59fa727ee8
 DIST libressl-3.1.4.tar.gz 3767238 BLAKE2B e639349e50f985360f2cef01b16b5c8f3c725d4a9bbee1117787174e4de6eb9b14cc8ad5f1704971057dd0f5000eea01f3b172178c534c70d38921418034d94c SHA512 77a53c4294fc332006502dc3af069346e2c9efc9240de7f91eb48e89043525900b5b23652cfd159221c3a482cc01e263611adb752e23b707f965156e3a7cd895
 DIST libressl-3.2.0.tar.gz 3775925 BLAKE2B 99d74fad16e272be8e3b23b873c35970ce3693e088baf365670ad8e8cbb846e90f4232bbc6c65b70a35060da99b9b210b3debce1c78d531e810de26e3e2f05cb SHA512 e8bf95af4e4e855b0462eb12df8f802102a3bee5bb40fb1859e7c40d9e3ce89f0d2eb0acdd923e7c592b4aeb7ecc556f753c0a12d0dace05d2ef342bffdd9d07
 DIST libressl-3.2.1.tar.gz 3798341 BLAKE2B 25d4d0fa758d92fd781f39000e631d7cec0a5a8210b2b127b7d49ef0e96e1a20a45f60e6231dcbe379f57f19c1ca8a4dde6205b1cc52ee44d17a4a21da34c98a SHA512 0204177ad0291f3fce4c77ab21cce17785d0239f2ae4be8fbdce5575cc98775186caa0e1851b211c05be07e3cc603111eeaac4379c8977e7b140fedee2551f93
+DIST libressl-3.2.2.tar.gz 3839529 BLAKE2B b5c35c85bf9914b49d828963e5089e77ec0b370227f8e36c70eac9a4c9176e90ebec1dccd19fc4d99d58caaba545b78cc5570751bd73a7488e502a9bcca2c5ed SHA512 708f347ec88f0501b5937f1efc8dc15e76a2f99a54f024e21a006349abc9305f64796f7df9fcbc875e13f999a620253b62b138d76f67586f1e432f3956da25e1
 EBUILD libressl-2.9.2.ebuild 1742 BLAKE2B 3ba8f8b51b4b89515c6dadfb4b5975b1d683b04aea39fee7a509953f900d35f62d365896d3a2c7e5a53af943c184c362629c214147a5f4c3115833ba62473b85 SHA512 745a0e3f946ed03e90a876e78cab5e36c59b1c5ffe121499c0c149ad510cc47e62078bf62c0b43d7a0d2aa75c6103c1650193df8ec87ed4354f76080660f7cdb
 EBUILD libressl-3.0.2.ebuild 1700 BLAKE2B 7e504f9f0cd914d6f6377df8a6ee579bc425645fcb86c679d94747aed2d0d35b88e1409fff4ca07f1bb3c002357e1bc6d591c2fa880ec71961987f9af8691990 SHA512 e562c9f2045fc553999e8afbf226c059ec99f96948559a6438f2d147ecf9452ec1c88bcd2303433e7a6c038301d96413ed916df6db03029717d6e50e65cf2bbe
 EBUILD libressl-3.1.3.ebuild 1697 BLAKE2B 3ba25c3976cd351c7551745d6713c484898930d3618a3530d649d39684eb2ef7713239cdd58c8ea1361a7d4e203fdfed71acab7d2ace5fd29723ada307d912cd SHA512 9a492cef92e90941c334522f494504018139fc88bfec721cda493cce9900a87b30bb50206c754535083927172d3038c63cf15199c044f8def76c94de6aa8eb2d
 EBUILD libressl-3.1.4.ebuild 1697 BLAKE2B 3ba25c3976cd351c7551745d6713c484898930d3618a3530d649d39684eb2ef7713239cdd58c8ea1361a7d4e203fdfed71acab7d2ace5fd29723ada307d912cd SHA512 9a492cef92e90941c334522f494504018139fc88bfec721cda493cce9900a87b30bb50206c754535083927172d3038c63cf15199c044f8def76c94de6aa8eb2d
 EBUILD libressl-3.2.0.ebuild 1704 BLAKE2B 5ac0555b7d9418b31d785ab6af057f9cfaa241b687adaa43b0c01ab0f347f69d46127443fe92e9340909fdc4b7326914de2970610d807b23b44e8a96eace48fe SHA512 0aa0400c9a672ab615675cf4694338f5c82b0b9034c9d3321f1880ccf2dfd02bd28ec08939b09d37d55ebecb980e1ad016ecce25ff5fba989dbafc5a19b8d5ac
 EBUILD libressl-3.2.1.ebuild 1704 BLAKE2B 5ac0555b7d9418b31d785ab6af057f9cfaa241b687adaa43b0c01ab0f347f69d46127443fe92e9340909fdc4b7326914de2970610d807b23b44e8a96eace48fe SHA512 0aa0400c9a672ab615675cf4694338f5c82b0b9034c9d3321f1880ccf2dfd02bd28ec08939b09d37d55ebecb980e1ad016ecce25ff5fba989dbafc5a19b8d5ac
+EBUILD libressl-3.2.2.ebuild 1750 BLAKE2B 94c6d20bb8ad277951d2eca51cd5231e871073e919a4a0d545ac65e2c2c82873035beec234fab422106f11865324fe5009c6c4178ced6c5949bacbed83f65251 SHA512 6625fea4cf20deaa6c105181d84753d6866a2a19fa4b25fe840766ee10e8547116d7e41dbaf20d5640bb936af11bd62a9d5fcf3dc8bb379e46db159d26faa96f
 MISC metadata.xml 986 BLAKE2B 1c3f46d2694b17352ec02e1f2c331aae79c677ea638ed6290c51076961ac81f1b472576000fc162115f0ea1f037ac1c6ed0ea80c4603ef6a283e0ac4915fadad SHA512 bd38bf852aebe8dbac58fa324524f2fbbc0da5d22a673f5fa83dafeeee599f4022a46687d10f3d159b0953a0d4b0f1ea88156f7d04c2f1db864569dd29f3e4fe
diff --git a/dev-libs/libressl/files/libressl-3.2.2-build.patch b/dev-libs/libressl/files/libressl-3.2.2-build.patch
new file mode 100644
index 000000000000..586e7a7a423a
--- /dev/null
+++ b/dev-libs/libressl/files/libressl-3.2.2-build.patch
@@ -0,0 +1,56 @@
+From 9abd36e3af5876f67c633f27496ad5660ab7fe24 Mon Sep 17 00:00:00 2001
+From: Brent Cook <busterb@gmail.com>
+Date: Sun, 18 Oct 2020 22:14:03 -0500
+Subject: [PATCH] modify nc build to link libcompat objects directly
+
+Rather than assuming the static version of libcrypto exists for pulling in the compatibility functions, link the compat objects directly. This modifies the object file generation script a bit to handle the empty-case properly as well.
+---
+ apps/nc/Makefile.am | 8 ++++++--
+ crypto/Makefile.am  | 4 ++--
+ 2 files changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/apps/nc/Makefile.am b/apps/nc/Makefile.am
+index d678f1eda..58b5c0118 100644
+--- a/apps/nc/Makefile.am
++++ b/apps/nc/Makefile.am
+@@ -1,5 +1,7 @@
+ include $(top_srcdir)/Makefile.am.common
+ 
++-include $(abs_top_builddir)/crypto/libcrypto_la_objects.mk
++
+ if BUILD_NC
+ 
+ if ENABLE_NC
+@@ -12,11 +14,13 @@ endif
+ EXTRA_DIST = nc.1
+ EXTRA_DIST += CMakeLists.txt
+ 
+-nc_LDFLAGS = $(abs_top_builddir)/crypto/.libs/libcrypto.a
+-
+ nc_LDADD = $(abs_top_builddir)/tls/libtls.la
+ nc_LDADD += $(PLATFORM_LDADD) $(PROG_LDADD)
+ 
++nc_LDADD += $(libcrypto_la_objects)
++nc_LDADD += $(libcompat_la_objects)
++nc_LDADD += $(libcompatnoopt_la_objects)
++
+ AM_CPPFLAGS += -I$(top_srcdir)/apps/nc/compat
+ 
+ nc_SOURCES = atomicio.c
+diff --git a/crypto/Makefile.am b/crypto/Makefile.am
+index 97a84e1a7..e32ca96c3 100644
+--- a/crypto/Makefile.am
++++ b/crypto/Makefile.am
+@@ -99,10 +99,10 @@ libcrypto_la_objects.mk: Makefile
+ 	  | sed 's/  */ $$\(abs_top_builddir\)\/crypto\//g' \
+ 	  > libcrypto_la_objects.mk
+ 	@echo "libcompat_la_objects= $(libcompat_la_OBJECTS)" \
+-	  | sed 's/  */ $$\(abs_top_builddir\)\/crypto\//g' \
++	  | sed 's/compat\// $$\(abs_top_builddir\)\/crypto\/&/g' \
+ 	  >> libcrypto_la_objects.mk
+ 	@echo "libcompatnoopt_la_objects= $(libcompatnoopt_la_OBJECTS)" \
+-	  | sed 's/  */ $$\(abs_top_builddir\)\/crypto\//g' \
++	  | sed 's/compat\// $$\(abs_top_builddir\)\/crypto\/&/g' \
+ 	  >> libcrypto_la_objects.mk
+ 
+ libcrypto_la_LDFLAGS = -version-info @LIBCRYPTO_VERSION@ -no-undefined -export-symbols crypto_portable.sym
diff --git a/dev-libs/libressl/libressl-3.2.2.ebuild b/dev-libs/libressl/libressl-3.2.2.ebuild
new file mode 100644
index 000000000000..d6e5a198531c
--- /dev/null
+++ b/dev-libs/libressl/libressl-3.2.2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal libtool
+
+DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
+HOMEPAGE="https://www.libressl.org/"
+SRC_URI="https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${P}.tar.gz"
+
+LICENSE="ISC openssl"
+# Reflects ABI of libcrypto.so and libssl.so. Since these can differ,
+# we'll try to use the max of either. However, if either change between
+# versions, we have to change the subslot to trigger rebuild of consumers.
+SLOT="0/48"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+asm static-libs test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( static-libs )"
+
+RDEPEND="!dev-libs/openssl:0"
+DEPEND="${RDEPEND}"
+PDEPEND="app-misc/ca-certificates"
+
+src_prepare() {
+	touch crypto/Makefile.in
+
+	sed -i \
+		-e '/^[ \t]*CFLAGS=/s#-g ##' \
+		-e '/^[ \t]*CFLAGS=/s#-g"#"#' \
+		-e '/^[ \t]*CFLAGS=/s#-O2 ##' \
+		-e '/^[ \t]*CFLAGS=/s#-O2"#"#' \
+		-e '/^[ \t]*USER_CFLAGS=/s#-O2 ##' \
+		-e '/^[ \t]*USER_CFLAGS=/s#-O2"#"#' \
+		configure || die "fixing CFLAGS failed"
+
+	if ! use test ; then
+	sed -i \
+		-e '/^[ \t]*SUBDIRS =/s#tests##' \
+		Makefile.in || die "Removing tests failed"
+	fi
+
+	eapply "${FILESDIR}"/${PN}-2.8.3-solaris10.patch
+	eapply "${FILESDIR}"/${PN}-3.2.2-build.patch
+	eapply_user
+
+	elibtoolize  # for Solaris
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable asm) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_test() {
+	emake check
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -exec rm -f {} + || die
+}