From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A422D138335 for ; Fri, 28 Dec 2018 17:44:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B1FC5E0AA5; Fri, 28 Dec 2018 17:44:38 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6E6A8E0AA5 for ; Fri, 28 Dec 2018 17:44:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ADD78335C6F for ; Fri, 28 Dec 2018 17:44:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C480042F for ; Fri, 28 Dec 2018 17:44:33 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1546019064.dd93cf9c699667de3270dc5f439786f9c1f71c31.grobian@gentoo> Subject: [gentoo-commits] repo/proj/prefix:master commit in: dev-libs/openssl/, dev-libs/openssl/files/ X-VCS-Repository: repo/proj/prefix X-VCS-Files: dev-libs/openssl/Manifest dev-libs/openssl/files/openssl-1.1.0j-parallel_install_fix.patch dev-libs/openssl/openssl-1.1.0i-r3.ebuild dev-libs/openssl/openssl-1.1.0j.ebuild X-VCS-Directories: dev-libs/openssl/ dev-libs/openssl/files/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: dd93cf9c699667de3270dc5f439786f9c1f71c31 X-VCS-Branch: master Date: Fri, 28 Dec 2018 17:44:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6d5c1e28-b393-4c17-9981-c3bbf52a43a3 X-Archives-Hash: 6882b98c43dd3789d9254a2de9a35fa7 commit: dd93cf9c699667de3270dc5f439786f9c1f71c31 Author: Fabian Groffen gentoo org> AuthorDate: Fri Dec 28 17:44:24 2018 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Fri Dec 28 17:44:24 2018 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=dd93cf9c dev-libs/openssl: sync 1.1.0j Package-Manager: Portage-2.3.52.2-prefix, Repoman-2.3.12 Signed-off-by: Fabian Groffen gentoo.org> dev-libs/openssl/Manifest | 4 ++++ .../files/openssl-1.1.0j-parallel_install_fix.patch | 21 +++++++++++++++++++++ dev-libs/openssl/openssl-1.1.0i-r3.ebuild | 3 +-- ...enssl-1.1.0i-r3.ebuild => openssl-1.1.0j.ebuild} | 9 ++------- 4 files changed, 28 insertions(+), 9 deletions(-) diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest index e5ab2701a9..72b6620c97 100644 --- a/dev-libs/openssl/Manifest +++ b/dev-libs/openssl/Manifest @@ -9,3 +9,7 @@ DIST openssl-1.1.0i.tar.gz 5453234 BLAKE2B ae6bec9c116769d98a77165b96fb7d201fe2e DIST openssl-1.1.0i_ec_curve.c 18401 BLAKE2B f969071ac1b5d0e43b50d54e50b5c4d9201fc8b94458902e9849f14841b5505a2e43ed57a8c13255f042a211af9ee904776c155c36da838a8ad22e1052b02bc1 SHA512 a1c2bb3c3e3d342bddc8c952985e87fc4bad2e8142d5d760b18f346c44c20f00db61c4856f3dcf879b2098e0c036330762915f65d80a1a2cba717d2caeb95457 DIST openssl-1.1.0i_ectest.c 30688 BLAKE2B 6673ef0fd139af82d830794179b19b9e06be25fac4a13b8bdfa5fd5dad25f594ce8eab118aab9ec2aab25001e1de127c03f8e1a04f4f3ef4c464b7fb1811ed4a SHA512 240fc72916caf4a8b0af774ce307abfe9a93a762eba6fae760cec79d619fe3db0d6919fc92a8951cb031f73958237700b45f590aa7f9f2890762cccda1f1e74b DIST openssl-1.1.0i_hobble-openssl 1117 BLAKE2B c3a1477e63331e83cf1cbe58e9ef131ec500a311e22d3da55034800ca353c387b2e202575acf3badb00b236ff91d4bac1bb131a33930939646d26bec27be6e04 SHA512 fa9cc70afa11a7a292548b4bddbba8159824a364ce5c279b483768e6ae2aa4b5491d9bf2cc734819f30a11c8ee0d91bcb991c4a7ab357296aeb4c04feac74826 +DIST openssl-1.1.0j.tar.gz 5411919 BLAKE2B 0fbd936f38d30b64bea717a67cd59704c5ce44ee19f377a820f89ba66b9e0a7509cf39e0fb00c104ae6440a6bd811e388239b458ffe685d8601235bab2afb2f1 SHA512 e7d30951ebb3cbcb6d59e3eb40f64f5a84634b7f5c380a588d378973f1c415395e3ab71a9aaff6478a89ec6efcc88f17f1882c99c25dcd18165f1435a51e5768 +DIST openssl-1.1.0j_ec_curve.c 18401 BLAKE2B f969071ac1b5d0e43b50d54e50b5c4d9201fc8b94458902e9849f14841b5505a2e43ed57a8c13255f042a211af9ee904776c155c36da838a8ad22e1052b02bc1 SHA512 a1c2bb3c3e3d342bddc8c952985e87fc4bad2e8142d5d760b18f346c44c20f00db61c4856f3dcf879b2098e0c036330762915f65d80a1a2cba717d2caeb95457 +DIST openssl-1.1.0j_ectest.c 30688 BLAKE2B 6673ef0fd139af82d830794179b19b9e06be25fac4a13b8bdfa5fd5dad25f594ce8eab118aab9ec2aab25001e1de127c03f8e1a04f4f3ef4c464b7fb1811ed4a SHA512 240fc72916caf4a8b0af774ce307abfe9a93a762eba6fae760cec79d619fe3db0d6919fc92a8951cb031f73958237700b45f590aa7f9f2890762cccda1f1e74b +DIST openssl-1.1.0j_hobble-openssl 1117 BLAKE2B c3a1477e63331e83cf1cbe58e9ef131ec500a311e22d3da55034800ca353c387b2e202575acf3badb00b236ff91d4bac1bb131a33930939646d26bec27be6e04 SHA512 fa9cc70afa11a7a292548b4bddbba8159824a364ce5c279b483768e6ae2aa4b5491d9bf2cc734819f30a11c8ee0d91bcb991c4a7ab357296aeb4c04feac74826 diff --git a/dev-libs/openssl/files/openssl-1.1.0j-parallel_install_fix.patch b/dev-libs/openssl/files/openssl-1.1.0j-parallel_install_fix.patch new file mode 100644 index 0000000000..c837e208cf --- /dev/null +++ b/dev-libs/openssl/files/openssl-1.1.0j-parallel_install_fix.patch @@ -0,0 +1,21 @@ +https://github.com/openssl/openssl/issues/7679 + +--- a/Configurations/unix-Makefile.tmpl ++++ b/Configurations/unix-Makefile.tmpl +@@ -77,8 +77,14 @@ + # to. You're welcome. + sub dependmagic { + my $target = shift; +- +- return "$target: build_generated\n\t\$(MAKE) depend && \$(MAKE) _$target\n_$target"; ++ my $magic = <<"_____"; ++$target: build_generated depend ++ \$(MAKE) _$target ++_$target ++_____ ++ # Remove line ending ++ $magic =~ s|\R$||; ++ return $magic; + } + ''; + -} diff --git a/dev-libs/openssl/openssl-1.1.0i-r3.ebuild b/dev-libs/openssl/openssl-1.1.0i-r3.ebuild index 50b63a1a20..348a3a8a12 100644 --- a/dev-libs/openssl/openssl-1.1.0i-r3.ebuild +++ b/dev-libs/openssl/openssl-1.1.0i-r3.ebuild @@ -145,8 +145,7 @@ multilib_src_configure() { unset SCRIPTS #312551 unset CROSS_COMPILE #311473 - tc-export CC AR RANLIB RC CPP - # for CPP, see: https://github.com/openssl/openssl/issues/5867 + tc-export CC AR RANLIB RC # Clean out patent-or-otherwise-encumbered code # Camellia: Royalty Free https://en.wikipedia.org/wiki/Camellia_(cipher) diff --git a/dev-libs/openssl/openssl-1.1.0i-r3.ebuild b/dev-libs/openssl/openssl-1.1.0j.ebuild similarity index 97% copy from dev-libs/openssl/openssl-1.1.0i-r3.ebuild copy to dev-libs/openssl/openssl-1.1.0j.ebuild index 50b63a1a20..44d04df06b 100644 --- a/dev-libs/openssl/openssl-1.1.0i-r3.ebuild +++ b/dev-libs/openssl/openssl-1.1.0j.ebuild @@ -56,8 +56,7 @@ MULTILIB_WRAPPED_HEADERS=( PATCHES=( "${FILESDIR}"/${PN}-1.0.2a-x32-asm.patch #542618 - "${FILESDIR}"/${P}-CVE-2018-0734.patch - "${FILESDIR}"/${P}-CVE-2018-0735.patch + "${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch #671602 ) src_prepare() { @@ -89,9 +88,6 @@ src_prepare() { eapply "${PATCHES[@]}" fi - # 2018-06-21 grobian: still necessary/in use? - #epatch "${FILESDIR}"/${PN}-1.1.0f-winnt.patch # parity - eapply_user #332661 # make sure the man pages are suffixed #302165 @@ -145,8 +141,7 @@ multilib_src_configure() { unset SCRIPTS #312551 unset CROSS_COMPILE #311473 - tc-export CC AR RANLIB RC CPP - # for CPP, see: https://github.com/openssl/openssl/issues/5867 + tc-export CC AR RANLIB RC # Clean out patent-or-otherwise-encumbered code # Camellia: Royalty Free https://en.wikipedia.org/wiki/Camellia_(cipher)