From 5cfef3c94cd7e82136c69a0322f5ba21f7e64632 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 19 Apr 2018 14:14:48 +0100 Subject: gentoo resync : 19.04.2018 --- dev-lang/Manifest.gz | Bin 18999 -> 18991 bytes dev-lang/R/Manifest | 2 +- dev-lang/R/R-3.4.1.ebuild | 4 +- dev-lang/bff/Manifest | 2 +- dev-lang/bff/bff-1.0.5.ebuild | 2 +- dev-lang/go/Manifest | 4 - dev-lang/go/go-1.10.ebuild | 228 --------------------- dev-lang/go/go-1.9.4.ebuild | 227 -------------------- dev-lang/mono-basic/Manifest | 2 + dev-lang/mono-basic/mono-basic-4.7.ebuild | 16 ++ dev-lang/perl/Manifest | 2 +- dev-lang/perl/perl-5.24.3-r1.ebuild | 2 +- dev-lang/python-exec/Manifest | 2 +- dev-lang/python-exec/python-exec-2.4.5.ebuild | 2 +- dev-lang/python/Manifest | 8 +- .../python-3.5.5-libressl-compatibility.patch | 69 +++++++ .../python-3.6.5-libressl-compatibility.patch | 114 +++++++++++ dev-lang/python/python-3.4.8.ebuild | 2 +- dev-lang/python/python-3.5.5.ebuild | 5 +- dev-lang/python/python-3.6.5.ebuild | 5 +- dev-lang/spidermonkey/Manifest | 2 +- .../spidermonkey/spidermonkey-24.2.0-r4.ebuild | 2 +- 22 files changed, 224 insertions(+), 478 deletions(-) delete mode 100644 dev-lang/go/go-1.10.ebuild delete mode 100644 dev-lang/go/go-1.9.4.ebuild create mode 100644 dev-lang/mono-basic/mono-basic-4.7.ebuild create mode 100644 dev-lang/python/files/python-3.5.5-libressl-compatibility.patch create mode 100644 dev-lang/python/files/python-3.6.5-libressl-compatibility.patch (limited to 'dev-lang') diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz index 2ede1b3adbe3..f10b158c5033 100644 Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest index 4ee4eafecb72..701782ca6d8c 100644 --- a/dev-lang/R/Manifest +++ b/dev-lang/R/Manifest @@ -11,5 +11,5 @@ DIST R-3.4.1.tar.gz 30200109 BLAKE2B 03602e9a48759caee8ce047fa6273df7a54af089de4 DIST R-78d6830e28ea90a046da79a9b4f70c39594bb6d6.bash_completion 13596 BLAKE2B 53338e4a1c4f68beb69247216e553dbcac47f660fbf032bfebf7a660e32d2cff5b11ed35411c52de7e1fd6e00bbf5b5ea19369a325fa0a38bd93d63dc3288cbd SHA512 9ccd19bb1b0c18a2f13035ccd6809447429e197e298fb4d1df808ef345d723b42f75a1b91c349f6dbb46e4a82e59ef33e11300c495d79b63d670d0c0f2b16a06 EBUILD R-3.2.2.ebuild 6047 BLAKE2B a2ac4b422ced8ad99a5950f910bcbe8000261a68870e14658bc7509397646114a686925984d9ff80d52a56226ea6da84e252f135bf5e48458bf7763ff92a16ab SHA512 adb3ec5895960448e932fe8e0a77991e8935c02d7e7e703457881a174a67fefe7aa8be26b0fc0591506ee7792476d621499f9393a2e464f14535b95324759d3e EBUILD R-3.3.2.ebuild 6118 BLAKE2B 3abf42aac7e4ab9ed306b56b8da7270f56ac14b900875ff9dfb290d69f42cd30a1e66ad4907c694b2c924156fa96c784f03d9e44e664be8c4cff266399fe8c23 SHA512 c8a92ff88add7f214abbf8a0dad71df8ef015669048ee1a9688fbbd9eb7e10c76f88380f7bb18db4d8901a633fe038e4104deabcb969bffc62fab298b734a150 -EBUILD R-3.4.1.ebuild 6330 BLAKE2B 9b498f9d93b7dbc19d38b0d841c0604d415f96e2a280728922022b204dc0fadcabdc0b286d85a67d9aede759e56fc50fb41d18935bb1a06f83da556172e15f53 SHA512 14587dc493d11abcf35e27ec85f908aebb2874554715953fa57227438aff83341d787393a2728c9761a068ecd0a866501e69c2fb6dc3959551a794aff657dd06 +EBUILD R-3.4.1.ebuild 6329 BLAKE2B 77b9416e9149bc9e76a0c8764dc202e7d67b63a73d013db81c83d359cdbea87a4d54cfa3795a37cc684e8e5d475534782ba245802e08b41f1ea8565e6da26ac7 SHA512 fc8fe83f6a5eb009136cc5df57658271cf684c9fdf7fe025a58706a4763ed3642bd3a41fcaea90de54f3943e8a920a06d010cdd6f28bc0df77185c013802f209 MISC metadata.xml 1140 BLAKE2B 774221eb531b4e80f0650b627b9ce53d9a2daf6342b1f19579d2d046e1c83aa497cc764870406b7ea3cf6cbae899cb6d460af92991d62bc6aea8da026a441822 SHA512 297c7e17998f92fb836b0599ce5221aee1ba1e7b1504edb348a602b695faf381d51f32f6118f5ef4bb353f02e92ffc5b3520b8d317d3e30a68a3cce0254fa6b1 diff --git a/dev-lang/R/R-3.4.1.ebuild b/dev-lang/R/R-3.4.1.ebuild index 85556b03670f..38fe2e291be2 100644 --- a/dev-lang/R/R-3.4.1.ebuild +++ b/dev-lang/R/R-3.4.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -16,7 +16,7 @@ SRC_URI=" LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="~amd64 ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos" IUSE="cairo doc icu java jpeg lapack minimal nls openmp perl png prefix profile readline static-libs tiff tk X" REQUIRED_USE="png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )" diff --git a/dev-lang/bff/Manifest b/dev-lang/bff/Manifest index 2f99948a2842..11756cf995e6 100644 --- a/dev-lang/bff/Manifest +++ b/dev-lang/bff/Manifest @@ -2,5 +2,5 @@ DIST bff-1.0.3.1.tar.gz 2617 BLAKE2B 30a23882fe0d7740bfe0a3e2d75e91130feb4b3da69 DIST bff-1.0.5.tar.gz 4833 BLAKE2B 9e3b44da9cd001552119e25764b171c86027755583f79a13b1d1035ecbab134df0aa31234c1479370599dd56a76a7f1c67eff61d2c1189430bab6a9a22f629d8 SHA512 78e481f6f371421ce6f046041fe6d48be2e11000ddda82f60244c0100665469c4aff4f151d297bb533140d723f68d5a3844e0c29a256b022ac93cafbd2abe9fd DIST mandelbrot.b 11669 BLAKE2B 7f128f7a30faa7d445353da5305424b7a6fa8f8048c955680411bbfda136796721111bd0824e72f679ec83d22c3865866c57b5b272440b5318b090facdb35706 SHA512 3a1950f8be61fd33e563fe17dbc1297deae3ec2d276a6895e4bbb7d55c5bcf33ec7e9024d9776ad5c9c29b25c55bd08dea71403a60f9478fb3b80c22303d0862 EBUILD bff-1.0.3.1.ebuild 905 BLAKE2B fd4899726df5982a0eeff7d831607723cab50a234fcc3434143e167325fc53e626f5b3f905d1349b4241aed891b929965644ff2b71dbaa274fe4d30a87f9274c SHA512 c4bdf46d22a9cb2fd36b90da74a5b5d79f5ed11f226bdb209de7641f6732626d46ad00906f49277b7b29eac9805593096e0c9e5289b30ace894731064f4b4862 -EBUILD bff-1.0.5.ebuild 790 BLAKE2B 2bf71a76a4859cb4d1cac95226ccd42e6fbb3cd322ee54cb33e78ece09ba3256c1f75922f9af539b24fb3afe7aa2b8e31d20a0f2539b4b9435f6efc5a1d85bfe SHA512 951711a1d86a70592acebeca70dfd075bf5b637a79a47cc4fcea2d43d4ec7e1a17d745df30ceed83a0b621d62de5acf8d437d210b58276c4d1302bf4578742bc +EBUILD bff-1.0.5.ebuild 789 BLAKE2B 6c452f1c88fdb6c6daa2c0da42669f03672b278011583acd0d79b762b009a6b40588d6c226e7aa9fdea16d2659043e6885bdda33cb9074973b9b5ec627008475 SHA512 448a68cfa12c226ca68c11cb83b34e908193a7811044ea0af8fd16da6ab3e22c2eabe16fa0047a526ad4cd2a48a037f7225231280390d6b880f7d2b1dfff9056 MISC metadata.xml 358 BLAKE2B 475e8fa2af079096f259abc30d2f886eb2b568182394c5fa3a1c081754be7d151a3d10564315d6006232d6f2e7e68103337377db045c13a4fca1e05723d5ff0d SHA512 dc6a26609f65e38ec703c857c686e555170ad4021a994c3a39af131a9f3a38d6207a70558aae46dc5927dda8a9f735795d879a1ac4088ffeac5d09a068627f9c diff --git a/dev-lang/bff/bff-1.0.5.ebuild b/dev-lang/bff/bff-1.0.5.ebuild index 78bb7f57a4ab..bc35ca2dfcfd 100644 --- a/dev-lang/bff/bff-1.0.5.ebuild +++ b/dev-lang/bff/bff-1.0.5.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/apankrat/bff" SRC_URI="https://github.com/apankrat/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~arm ~hppa ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh x86" +KEYWORDS="amd64 ~arm ~hppa ia64 ~m68k ~ppc ppc64 ~s390 ~sh x86" IUSE="test" DEPEND="" diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest index 0b20b6252081..772e476e1724 100644 --- a/dev-lang/go/Manifest +++ b/dev-lang/go/Manifest @@ -10,10 +10,6 @@ DIST go-linux-ppc64le-bootstrap-1.8.tbz 52211575 BLAKE2B 7a28ec5a381369c4e9415c8 DIST go-linux-s390x-bootstrap-1.8.tbz 57124869 BLAKE2B 920a176b8f4fc3a816e724324bbb30a383d599e31a0d2093d24797dbcd0e799a662a3589dbb87d2f5dd16df07c4cf8f1e444e87b540ec732746bb025dc9271f8 SHA512 d429cae870d66217ab2e07c74209d3031d97baa4f899b4d70ae6283a1a5b1434b037904c4cfca0b2bc798d5ba0b358c3739e000eccbc74809baf564c5686df5a DIST go-solaris-amd64-bootstrap-1.8.tbz 54926326 BLAKE2B 0a45312f090d81ebf46fe5950cb65c059e2801394231e715e94145d1f918eb59b10472b2385e57ebd5cfb9eca0ad7290fb118436486b665520bb540970f971ab SHA512 52b849e5b9a940e10de7ba3df0ebdf6e1c5d631de9581d936c9edf8f38e6bb3314acbc2b2d5202b0528fde2a359d52bc0c6f39acf9b1b614725e4b4a947ed10d DIST go1.10.1.src.tar.gz 18305765 BLAKE2B 61b8db22c50b9a4653244dc18267f405607755932d84ea2c475338a9f4a5421da2bb8cc808dbd166aa35c3c8778180bf47d6e51ebe303bc62e582516919058f9 SHA512 13f6b0643a4f92eeca04444b9fa10de38fc3427daea9aa3227cf9a5738ffee1a3f2e355ba5faf711b8506f7de118bdcd3b9064b65407a22613523e29ffd73415 -DIST go1.10.src.tar.gz 18300467 BLAKE2B 2058c450fb72f008464381443d180902b9a0bb11691d112d16bcc1a3f5177bfc39d15ed4532c0d85997398b2f07e40c1f9fedf46f1d0e08c636af1e44bd8ef10 SHA512 59f089e1ffb2d3aba5ada329d4f0d1181c3c4f01fa64f19d0b753f8a989cb59cf290ad88d215cadc18ef99aba8518e44c9bc258c07eaffc834c55e4a37bd4651 -DIST go1.9.4.src.tar.gz 16392325 BLAKE2B c5a503e8c539f31a1bbef9c6d89263b7214fb433476830c205153aa07ee0debc273eb004dddd662f81cc6cd2d4d949af654a4f4db1c890530feadc90ce05e630 SHA512 1a7c830e07507ff7b89025adfb5c713444d97301f8ad47ef2564722c1e28186e946350f07e22777fbdd6f2f589c334eb01dfd589e97cb8a86f73669547badb0b EBUILD go-1.10.1.ebuild 5647 BLAKE2B 77f2ad0812c75f531b8e05c6295c4708fb359c544b350a4c2e6351a426f080e4be1c8a066028367857e97eca831c4f3bdcafebf98984027f30fb21c73d069cdc SHA512 0eb63b3b9feaa6c83502943f2408d44999ad228c61ceadb178d6db675ddd09464eb115977b88d1c73db7191492059ac646025fa27774e2b893ae9fe3a7da6f64 -EBUILD go-1.10.ebuild 5648 BLAKE2B f9224a1e959a38b43a289c2d52e864d132031302dd77af354b37d560e3b961701173d7a07ca1551acde62605ff018fd262c1620580b2e968537ef82f0d270b60 SHA512 efd46c94c61f2cde931ed64ca7b80500e88f407999e49eb402675ab7f40507e2a5d27e1df23571d85c36fd31b4c8479c6c66c4ae0c25399b99ac5dca008e747f -EBUILD go-1.9.4.ebuild 5581 BLAKE2B 9f6401701cb5a0d81919f3105b52606e93b6c5b7b2dce7d7e5831c5aa2b7eb33fb6ef719b7007bddd64f275d2b9dd71493551ed1f13910744e2286ea1e85832d SHA512 c52898e89d3bd46bb409aca12b6a839aaa4f884ab59b5f1a0bba4761804a89f2d3de7f65e3a9e6d97f2abf7b925540e3f54f12e86eb6952419cda0e045a13028 EBUILD go-9999.ebuild 5650 BLAKE2B ad97b072bf73db28d60b1afb3bc3fea2159d87edc3ed0433b3e010979b01568caf81f7d6f22959ed854b7870ca5e0397a0f71e2e9488c4bb277ce0bc0a591a9f SHA512 a5a1c5037c52422d98b42c5688ba88918e548c8679d722d7d85dc3c51228ac944400a339a8e6a4018f2f438afec8365cd3550b35e6b595b097eecdec08befc84 MISC metadata.xml 538 BLAKE2B 78502c369a490804b2c69eef864276c2be5d0ee84ec189b6cc8584f8f42668a35f3c74bd25ceb53c469716337cbab908c576ca880c492f5961fedafc74cc346f SHA512 514a441a522218fdca543a22370e965a2bfc1f1f2c37e77431143329bb3d3f4f53e99ad5d7f7d7c61877f77387a777f7b4f339b9a3e45322d01d39d3d0ea1309 diff --git a/dev-lang/go/go-1.10.ebuild b/dev-lang/go/go-1.10.ebuild deleted file mode 100644 index ca35487e1011..000000000000 --- a/dev-lang/go/go-1.10.ebuild +++ /dev/null @@ -1,228 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -export CBUILD=${CBUILD:-${CHOST}} -export CTARGET=${CTARGET:-${CHOST}} - -MY_PV=${PV/_/} - -inherit toolchain-funcs - -BOOTSTRAP_DIST="https://dev.gentoo.org/~williamh/dist" -BOOTSTRAP_VERSION="bootstrap-1.8" -BOOTSTRAP_URI=" -amd64? ( ${BOOTSTRAP_DIST}/go-linux-amd64-${BOOTSTRAP_VERSION}.tbz ) -arm? ( ${BOOTSTRAP_DIST}/go-linux-arm-${BOOTSTRAP_VERSION}.tbz ) -arm64? ( ${BOOTSTRAP_DIST}/go-linux-arm64-${BOOTSTRAP_VERSION}.tbz ) -ppc64? ( - ${BOOTSTRAP_DIST}/go-linux-ppc64-${BOOTSTRAP_VERSION}.tbz - ${BOOTSTRAP_DIST}/go-linux-ppc64le-${BOOTSTRAP_VERSION}.tbz -) -s390? ( ${BOOTSTRAP_DIST}/go-linux-s390x-${BOOTSTRAP_VERSION}.tbz ) -x86? ( ${BOOTSTRAP_DIST}/go-linux-386-${BOOTSTRAP_VERSION}.tbz ) -amd64-fbsd? ( ${BOOTSTRAP_DIST}/go-freebsd-amd64-${BOOTSTRAP_VERSION}.tbz ) -x86-fbsd? ( ${BOOTSTRAP_DIST}/go-freebsd-386-${BOOTSTRAP_VERSION}.tbz ) -x64-macos? ( ${BOOTSTRAP_DIST}/go-darwin-amd64-${BOOTSTRAP_VERSION}.tbz ) -x64-solaris? ( ${BOOTSTRAP_DIST}/go-solaris-amd64-${BOOTSTRAP_VERSION}.tbz ) -" - -case ${PV} in -*9999*) - EGIT_REPO_URI="https://github.com/golang/go.git" - inherit git-r3 - ;; -*) - SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz " - S="${WORKDIR}"/go - case ${PV} in - *_beta*|*_rc*) ;; - *) - KEYWORDS="-* amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x64-solaris" - # The upstream tests fail under portage but pass if the build is - # run according to their documentation [1]. - # I am restricting the tests on released versions until this is - # solved. - # [1] https://golang.org/issues/18442 - RESTRICT="test" - ;; - esac -esac -SRC_URI+="!gccgo? ( ${BOOTSTRAP_URI} )" - -DESCRIPTION="A concurrent garbage collected and typesafe programming language" -HOMEPAGE="https://golang.org" - -LICENSE="BSD" -SLOT="0/${PV}" -IUSE="gccgo" - -DEPEND="gccgo? ( >=sys-devel/gcc-5[go] )" -RDEPEND="! +# Date: Sat, 24 Mar 2018 18:38:14 +0100 +# Subject: [PATCH] [3.6] bpo-33127: Compatibility patch for LibreSSL 2.7.0 +# (GH-6210) (GH-6214) +# +# LibreSSL 2.7 introduced OpenSSL 1.1.0 API. The ssl module now detects +# LibreSSL 2.7 and only provides API shims for OpenSSL < 1.1.0 and +# LibreSSL < 2.7. + +# Documentation updates and fixes for failing tests will be provided in +# another patch set. + +# Signed-off-by: Christian Heimes . +# (cherry picked from commit 4ca0739c9d97ac7cd45499e0d31be68dc659d0e1) + +# Co-authored-by: Christian Heimes +# Patch modified by Aaron Bauman for 3.5.5 + +--- a/Modules/_ssl.c 2018-04-13 18:33:17.397649561 -0400 ++++ b/Modules/_ssl.c 2018-04-13 18:40:22.319852014 -0400 +@@ -101,6 +101,12 @@ + + #if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) + # define OPENSSL_VERSION_1_1 1 ++# define PY_OPENSSL_1_1_API 1 ++#endif ++ ++/* LibreSSL 2.7.0 provides necessary OpenSSL 1.1.0 APIs */ ++#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL ++# define PY_OPENSSL_1_1_API 1 + #endif + + /* Openssl comes with TLSv1.1 and TLSv1.2 between 1.0.0h and 1.0.1 +@@ -129,16 +135,18 @@ + #define INVALID_SOCKET (-1) + #endif + +-#ifdef OPENSSL_VERSION_1_1 +-/* OpenSSL 1.1.0+ */ +-#ifndef OPENSSL_NO_SSL2 +-#define OPENSSL_NO_SSL2 +-#endif +-#else /* OpenSSL < 1.1.0 */ +-#if defined(WITH_THREAD) ++/* OpenSSL 1.0.2 and LibreSSL needs extra code for locking */ ++#if !defined(OPENSSL_VERSION_1_1) && defined(WITH_THREAD) + #define HAVE_OPENSSL_CRYPTO_LOCK + #endif + ++#if defined(OPENSSL_VERSION_1_1) && !defined(OPENSSL_NO_SSL2) ++#define OPENSSL_NO_SSL2 ++#endif ++ ++#ifndef PY_OPENSSL_1_1_API ++/* OpenSSL 1.1 API shims for OpenSSL < 1.1.0 and LibreSSL < 2.7.0 */ ++ + #define TLS_method SSLv23_method + + static int X509_NAME_ENTRY_set(const X509_NAME_ENTRY *ne) +@@ -187,7 +195,7 @@ + { + return store->param; + } +-#endif /* OpenSSL < 1.1.0 or LibreSSL */ ++#endif /* OpenSSL < 1.1.0 or LibreSSL < 2.7.0 */ + + + enum py_ssl_error { diff --git a/dev-lang/python/files/python-3.6.5-libressl-compatibility.patch b/dev-lang/python/files/python-3.6.5-libressl-compatibility.patch new file mode 100644 index 000000000000..2f9e6a2bef24 --- /dev/null +++ b/dev-lang/python/files/python-3.6.5-libressl-compatibility.patch @@ -0,0 +1,114 @@ +From 8d89a385b71a2e4cce0fba0cfc8d91b63485edc5 Mon Sep 17 00:00:00 2001 +From: Christian Heimes +Date: Sat, 24 Mar 2018 18:38:14 +0100 +Subject: [PATCH] [3.6] bpo-33127: Compatibility patch for LibreSSL 2.7.0 + (GH-6210) (GH-6214) + +LibreSSL 2.7 introduced OpenSSL 1.1.0 API. The ssl module now detects +LibreSSL 2.7 and only provides API shims for OpenSSL < 1.1.0 and +LibreSSL < 2.7. + +Documentation updates and fixes for failing tests will be provided in +another patch set. + +Signed-off-by: Christian Heimes . +(cherry picked from commit 4ca0739c9d97ac7cd45499e0d31be68dc659d0e1) + +Co-authored-by: Christian Heimes +--- + Lib/test/test_ssl.py | 1 + + .../2018-03-24-15-08-24.bpo-33127.olJmHv.rst | 1 + + Modules/_ssl.c | 24 ++++++++++++------- + Tools/ssl/multissltests.py | 3 ++- + 4 files changed, 20 insertions(+), 9 deletions(-) + create mode 100644 Misc/NEWS.d/next/Library/2018-03-24-15-08-24.bpo-33127.olJmHv.rst + +diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py +index 8dd3b41450..9785a59a7e 100644 +--- a/Lib/test/test_ssl.py ++++ b/Lib/test/test_ssl.py +@@ -1687,6 +1687,7 @@ class SimpleBackgroundTests(unittest.TestCase): + self.assertEqual(len(ctx.get_ca_certs()), 1) + + @needs_sni ++ @unittest.skipUnless(hasattr(ssl, "PROTOCOL_TLSv1_2"), "needs TLS 1.2") + def test_context_setget(self): + # Check that the context of a connected socket can be replaced. + ctx1 = ssl.SSLContext(ssl.PROTOCOL_TLSv1_2) +diff --git a/Misc/NEWS.d/next/Library/2018-03-24-15-08-24.bpo-33127.olJmHv.rst b/Misc/NEWS.d/next/Library/2018-03-24-15-08-24.bpo-33127.olJmHv.rst +new file mode 100644 +index 0000000000..635aabbde0 +--- /dev/null ++++ b/Misc/NEWS.d/next/Library/2018-03-24-15-08-24.bpo-33127.olJmHv.rst +@@ -0,0 +1 @@ ++The ssl module now compiles with LibreSSL 2.7.1. +diff --git a/Modules/_ssl.c b/Modules/_ssl.c +index c54e43c2b4..5e007da858 100644 +--- a/Modules/_ssl.c ++++ b/Modules/_ssl.c +@@ -106,6 +106,12 @@ struct py_ssl_library_code { + + #if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) + # define OPENSSL_VERSION_1_1 1 ++# define PY_OPENSSL_1_1_API 1 ++#endif ++ ++/* LibreSSL 2.7.0 provides necessary OpenSSL 1.1.0 APIs */ ++#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL ++# define PY_OPENSSL_1_1_API 1 + #endif + + /* Openssl comes with TLSv1.1 and TLSv1.2 between 1.0.0h and 1.0.1 +@@ -152,16 +158,18 @@ struct py_ssl_library_code { + #define INVALID_SOCKET (-1) + #endif + +-#ifdef OPENSSL_VERSION_1_1 +-/* OpenSSL 1.1.0+ */ +-#ifndef OPENSSL_NO_SSL2 +-#define OPENSSL_NO_SSL2 +-#endif +-#else /* OpenSSL < 1.1.0 */ +-#if defined(WITH_THREAD) ++/* OpenSSL 1.0.2 and LibreSSL needs extra code for locking */ ++#if !defined(OPENSSL_VERSION_1_1) && defined(WITH_THREAD) + #define HAVE_OPENSSL_CRYPTO_LOCK + #endif + ++#if defined(OPENSSL_VERSION_1_1) && !defined(OPENSSL_NO_SSL2) ++#define OPENSSL_NO_SSL2 ++#endif ++ ++#ifndef PY_OPENSSL_1_1_API ++/* OpenSSL 1.1 API shims for OpenSSL < 1.1.0 and LibreSSL < 2.7.0 */ ++ + #define TLS_method SSLv23_method + #define TLS_client_method SSLv23_client_method + #define TLS_server_method SSLv23_server_method +@@ -227,7 +235,7 @@ SSL_SESSION_get_ticket_lifetime_hint(const SSL_SESSION *s) + return s->tlsext_tick_lifetime_hint; + } + +-#endif /* OpenSSL < 1.1.0 or LibreSSL */ ++#endif /* OpenSSL < 1.1.0 or LibreSSL < 2.7.0 */ + + + enum py_ssl_error { +diff --git a/Tools/ssl/multissltests.py b/Tools/ssl/multissltests.py +index ce5bbd8530..ba4529ae06 100755 +--- a/Tools/ssl/multissltests.py ++++ b/Tools/ssl/multissltests.py +@@ -57,8 +57,9 @@ LIBRESSL_OLD_VERSIONS = [ + ] + + LIBRESSL_RECENT_VERSIONS = [ +- "2.5.3", + "2.5.5", ++ "2.6.4", ++ "2.7.1", + ] + + # store files in ../multissl +-- +2.17.0 + diff --git a/dev-lang/python/python-3.4.8.ebuild b/dev-lang/python/python-3.4.8.ebuild index 0f6328d60306..ad0ac881c61d 100644 --- a/dev-lang/python/python-3.4.8.ebuild +++ b/dev-lang/python/python-3.4.8.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://www.python.org/ftp/python/${PV%_rc*}/${MY_P}.tar.xz LICENSE="PSF-2" SLOT="3.4/3.4m" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd" IUSE="build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk wininst +xml" # Do not add a dependency on dev-lang/python to this ebuild. diff --git a/dev-lang/python/python-3.5.5.ebuild b/dev-lang/python/python-3.5.5.ebuild index 51ef212e0f8a..972c02836e79 100644 --- a/dev-lang/python/python-3.5.5.ebuild +++ b/dev-lang/python/python-3.5.5.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://www.python.org/ftp/python/${PV%_rc*}/${MY_P}.tar.xz LICENSE="PSF-2" SLOT="3.5/3.5m" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd" IUSE="build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml" RESTRICT="!test? ( test )" @@ -38,7 +38,7 @@ RDEPEND="app-arch/bzip2:0= sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) + libressl? ( dev-libs/libressl:0= ) ) tk? ( >=dev-lang/tcl-8.0:0= @@ -74,6 +74,7 @@ src_prepare() { epatch "${FILESDIR}/${PN}-3.4.3-ncurses-pkg-config.patch" epatch "${FILESDIR}/${PN}-3.5-distutils-OO-build.patch" epatch "${FILESDIR}/3.6-disable-nis.patch" + epatch "${FILESDIR}/python-3.5.5-libressl-compatibility.patch" epatch_user diff --git a/dev-lang/python/python-3.6.5.ebuild b/dev-lang/python/python-3.6.5.ebuild index b3c248f7363c..400566cde2dc 100644 --- a/dev-lang/python/python-3.6.5.ebuild +++ b/dev-lang/python/python-3.6.5.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz LICENSE="PSF-2" SLOT="3.6/3.6m" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd" IUSE="build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml" RESTRICT="!test? ( test )" @@ -38,7 +38,7 @@ RDEPEND="app-arch/bzip2:0= sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) + libressl? ( dev-libs/libressl:0= ) ) tk? ( >=dev-lang/tcl-8.0:0= @@ -68,6 +68,7 @@ src_prepare() { "${WORKDIR}/patches" "${FILESDIR}/${PN}-3.5-distutils-OO-build.patch" "${FILESDIR}/3.6.5-disable-nis.patch" + "${FILESDIR}/python-3.6.5-libressl-compatibility.patch" ) default diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest index 3f65a2e91355..b4c27fee6e49 100644 --- a/dev-lang/spidermonkey/Manifest +++ b/dev-lang/spidermonkey/Manifest @@ -19,7 +19,7 @@ EBUILD spidermonkey-1.8.5-r6.ebuild 4379 BLAKE2B a4add6a3f681f9f06f4fb0ad624ce9c EBUILD spidermonkey-17.0.0-r4.ebuild 3546 BLAKE2B 0cf5236b5ee991dc161633db218d428a2498567d9d730dbdaa2bb1b61047e1adbd4713cee6808419c09b6c09c542f8c543db5c5ee6532167126cb69ebe6ae060 SHA512 bdb32474452a0d7b5ab681c27a46de05cb61bc89fac3aaa00e1289a35676bddd7de9e51eb02bed992535a82f75e1dec74c014e900787f356ea8ada58d5b066d0 EBUILD spidermonkey-17.0.0-r5.ebuild 3563 BLAKE2B 4b5294071559ee1e8487dfa5df388e17fb357ec8898f6e4390c1d3540a89647df04245e4c33706e52080236f9fcec7422a2cd0463f1f78feca1afc42f1d29e40 SHA512 6546f0c8bc2e7b1baecd6d616550977d83079c71ee973ab811a9cede0612d95b892a5f4d02a4a4733b5e90fff9795cdf50531e41f278fa210c988467931433bb EBUILD spidermonkey-24.2.0-r3.ebuild 4015 BLAKE2B 6608e66e03d2b606dc0117a46b462778468ac3697e64c44aa8a102c830f32c17e12c8458b2f43b05cf90306e7331407686959141078001534d1e33607d89e1ae SHA512 d715cf8f6ceb2139c14502ebe4c01a5a949fa59937737529dd9a5074444e1c25a2379018d740af2bb2cf99bbb3e35280bc88e68a44fa95d49d24e73f1843f003 -EBUILD spidermonkey-24.2.0-r4.ebuild 3990 BLAKE2B ec02e68fcea94f68b8e75b87a5e1cd156d1a6df16c44baf53f8c6eda555161b4836982c784cd26c303cd776587b583cc6cf52a14fe4cdff6c3e12e4ce0cf048c SHA512 1ba29c753de2107dec6dca4923d5cdeee81e9a788381855a2bc764ead80ad9358321597d213f56cb15d4e3f27b00659ca1bc09c23c8a92e3a132d0e16c8eaf71 +EBUILD spidermonkey-24.2.0-r4.ebuild 3989 BLAKE2B a859c05afcfe262398de5f0b4d0c148eaf2d94f57e9f029814982efcc740acbfc8349e756f75b3ce83a746571e27a31d88c78126b1b1e0cc9154e4b86f53dc8e SHA512 ca080e9993b2c10aed9abd0d54bd0722e8f4a53ed755f60389e9bf6b0d3347115ca7cc347b708592619ef69f6f1f38e5c9778c949f7224e579e7da09cd269067 EBUILD spidermonkey-38.2.1_rc0.ebuild 3868 BLAKE2B ac91f68e8aca7cbcc67a732ed6ca67fbc6b0ef2bdff1c54e742885054d1cc47d186d50f0c3fd0a93f8530ef80678f120b47b646d2699c8b502763560d1557346 SHA512 9fdd8a9bd76020cd2573648ba1f2353265be395a8f438ffedcdf68dc8db7d112c0cae1c384a5122384cf7dfa1910a717d20179746e8181ed6c99b3502034c24e EBUILD spidermonkey-45.0.2.ebuild 3905 BLAKE2B 9bd9a00eb41ac4f61da71b3feed187d1a70a2b4487f305580732ad734e91bf512dba6f8a7a5889814982e70ce25c9c9b0be8b87f05dacef7edfa2e08b53ada3c SHA512 a9a39994674ecdf1a974fbcc20f8c94e1f1f168db4095ba8c21a9d2fd01a6dbd0a59c932419c6b5f6c42b9bd7cc8b2aeaeb81973663a44b23372ea331b65d5db EBUILD spidermonkey-52.4.0_pre20171003-r1.ebuild 3868 BLAKE2B 3c4315cd6c23dffad04093eae078ea3e9878b0a4284aec1baca43617816fdbb3ee711e3c49998041b67f097837d8ce14317ee8eb2aff8bc5ad8376c87f955eae SHA512 5dcddaf5debdee01c4dab41b5088cf4f5375ba7c2f35f35c91f65dce0c3d1db74ce17955effc5002c8147e37fbb873b6a7d2242c0794ee98052e40e9c68b4f11 diff --git a/dev-lang/spidermonkey/spidermonkey-24.2.0-r4.ebuild b/dev-lang/spidermonkey/spidermonkey-24.2.0-r4.ebuild index 86d3de1bc589..6613f6e1b6d9 100644 --- a/dev-lang/spidermonkey/spidermonkey-24.2.0-r4.ebuild +++ b/dev-lang/spidermonkey/spidermonkey-24.2.0-r4.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://archive.mozilla.org/pub/js/${MY_P}.tar.bz2 LICENSE="NPL-1.1" SLOT="24" -KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd" IUSE="debug icu jit minimal static-libs +system-icu test" RESTRICT="ia64? ( test )" -- cgit v1.2.3