| 1 |
commit: dd93cf9c699667de3270dc5f439786f9c1f71c31 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Dec 28 17:44:24 2018 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Dec 28 17:44:24 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=dd93cf9c |
| 7 |
|
| 8 |
dev-libs/openssl: sync 1.1.0j |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.52.2-prefix, Repoman-2.3.12 |
| 11 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-libs/openssl/Manifest | 4 ++++ |
| 14 |
.../files/openssl-1.1.0j-parallel_install_fix.patch | 21 +++++++++++++++++++++ |
| 15 |
dev-libs/openssl/openssl-1.1.0i-r3.ebuild | 3 +-- |
| 16 |
...enssl-1.1.0i-r3.ebuild => openssl-1.1.0j.ebuild} | 9 ++------- |
| 17 |
4 files changed, 28 insertions(+), 9 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest |
| 20 |
index e5ab2701a9..72b6620c97 100644 |
| 21 |
--- a/dev-libs/openssl/Manifest |
| 22 |
+++ b/dev-libs/openssl/Manifest |
| 23 |
@@ -9,3 +9,7 @@ DIST openssl-1.1.0i.tar.gz 5453234 BLAKE2B ae6bec9c116769d98a77165b96fb7d201fe2e |
| 24 |
DIST openssl-1.1.0i_ec_curve.c 18401 BLAKE2B f969071ac1b5d0e43b50d54e50b5c4d9201fc8b94458902e9849f14841b5505a2e43ed57a8c13255f042a211af9ee904776c155c36da838a8ad22e1052b02bc1 SHA512 a1c2bb3c3e3d342bddc8c952985e87fc4bad2e8142d5d760b18f346c44c20f00db61c4856f3dcf879b2098e0c036330762915f65d80a1a2cba717d2caeb95457 |
| 25 |
DIST openssl-1.1.0i_ectest.c 30688 BLAKE2B 6673ef0fd139af82d830794179b19b9e06be25fac4a13b8bdfa5fd5dad25f594ce8eab118aab9ec2aab25001e1de127c03f8e1a04f4f3ef4c464b7fb1811ed4a SHA512 240fc72916caf4a8b0af774ce307abfe9a93a762eba6fae760cec79d619fe3db0d6919fc92a8951cb031f73958237700b45f590aa7f9f2890762cccda1f1e74b |
| 26 |
DIST openssl-1.1.0i_hobble-openssl 1117 BLAKE2B c3a1477e63331e83cf1cbe58e9ef131ec500a311e22d3da55034800ca353c387b2e202575acf3badb00b236ff91d4bac1bb131a33930939646d26bec27be6e04 SHA512 fa9cc70afa11a7a292548b4bddbba8159824a364ce5c279b483768e6ae2aa4b5491d9bf2cc734819f30a11c8ee0d91bcb991c4a7ab357296aeb4c04feac74826 |
| 27 |
+DIST openssl-1.1.0j.tar.gz 5411919 BLAKE2B 0fbd936f38d30b64bea717a67cd59704c5ce44ee19f377a820f89ba66b9e0a7509cf39e0fb00c104ae6440a6bd811e388239b458ffe685d8601235bab2afb2f1 SHA512 e7d30951ebb3cbcb6d59e3eb40f64f5a84634b7f5c380a588d378973f1c415395e3ab71a9aaff6478a89ec6efcc88f17f1882c99c25dcd18165f1435a51e5768 |
| 28 |
+DIST openssl-1.1.0j_ec_curve.c 18401 BLAKE2B f969071ac1b5d0e43b50d54e50b5c4d9201fc8b94458902e9849f14841b5505a2e43ed57a8c13255f042a211af9ee904776c155c36da838a8ad22e1052b02bc1 SHA512 a1c2bb3c3e3d342bddc8c952985e87fc4bad2e8142d5d760b18f346c44c20f00db61c4856f3dcf879b2098e0c036330762915f65d80a1a2cba717d2caeb95457 |
| 29 |
+DIST openssl-1.1.0j_ectest.c 30688 BLAKE2B 6673ef0fd139af82d830794179b19b9e06be25fac4a13b8bdfa5fd5dad25f594ce8eab118aab9ec2aab25001e1de127c03f8e1a04f4f3ef4c464b7fb1811ed4a SHA512 240fc72916caf4a8b0af774ce307abfe9a93a762eba6fae760cec79d619fe3db0d6919fc92a8951cb031f73958237700b45f590aa7f9f2890762cccda1f1e74b |
| 30 |
+DIST openssl-1.1.0j_hobble-openssl 1117 BLAKE2B c3a1477e63331e83cf1cbe58e9ef131ec500a311e22d3da55034800ca353c387b2e202575acf3badb00b236ff91d4bac1bb131a33930939646d26bec27be6e04 SHA512 fa9cc70afa11a7a292548b4bddbba8159824a364ce5c279b483768e6ae2aa4b5491d9bf2cc734819f30a11c8ee0d91bcb991c4a7ab357296aeb4c04feac74826 |
| 31 |
|
| 32 |
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 |
| 33 |
new file mode 100644 |
| 34 |
index 0000000000..c837e208cf |
| 35 |
--- /dev/null |
| 36 |
+++ b/dev-libs/openssl/files/openssl-1.1.0j-parallel_install_fix.patch |
| 37 |
@@ -0,0 +1,21 @@ |
| 38 |
+https://github.com/openssl/openssl/issues/7679 |
| 39 |
+ |
| 40 |
+--- a/Configurations/unix-Makefile.tmpl |
| 41 |
++++ b/Configurations/unix-Makefile.tmpl |
| 42 |
+@@ -77,8 +77,14 @@ |
| 43 |
+ # to. You're welcome. |
| 44 |
+ sub dependmagic { |
| 45 |
+ my $target = shift; |
| 46 |
+- |
| 47 |
+- return "$target: build_generated\n\t\$(MAKE) depend && \$(MAKE) _$target\n_$target"; |
| 48 |
++ my $magic = <<"_____"; |
| 49 |
++$target: build_generated depend |
| 50 |
++ \$(MAKE) _$target |
| 51 |
++_$target |
| 52 |
++_____ |
| 53 |
++ # Remove line ending |
| 54 |
++ $magic =~ s|\R$||; |
| 55 |
++ return $magic; |
| 56 |
+ } |
| 57 |
+ ''; |
| 58 |
+ -} |
| 59 |
|
| 60 |
diff --git a/dev-libs/openssl/openssl-1.1.0i-r3.ebuild b/dev-libs/openssl/openssl-1.1.0i-r3.ebuild |
| 61 |
index 50b63a1a20..348a3a8a12 100644 |
| 62 |
--- a/dev-libs/openssl/openssl-1.1.0i-r3.ebuild |
| 63 |
+++ b/dev-libs/openssl/openssl-1.1.0i-r3.ebuild |
| 64 |
@@ -145,8 +145,7 @@ multilib_src_configure() { |
| 65 |
unset SCRIPTS #312551 |
| 66 |
unset CROSS_COMPILE #311473 |
| 67 |
|
| 68 |
- tc-export CC AR RANLIB RC CPP |
| 69 |
- # for CPP, see: https://github.com/openssl/openssl/issues/5867 |
| 70 |
+ tc-export CC AR RANLIB RC |
| 71 |
|
| 72 |
# Clean out patent-or-otherwise-encumbered code |
| 73 |
# Camellia: Royalty Free https://en.wikipedia.org/wiki/Camellia_(cipher) |
| 74 |
|
| 75 |
diff --git a/dev-libs/openssl/openssl-1.1.0i-r3.ebuild b/dev-libs/openssl/openssl-1.1.0j.ebuild |
| 76 |
similarity index 97% |
| 77 |
copy from dev-libs/openssl/openssl-1.1.0i-r3.ebuild |
| 78 |
copy to dev-libs/openssl/openssl-1.1.0j.ebuild |
| 79 |
index 50b63a1a20..44d04df06b 100644 |
| 80 |
--- a/dev-libs/openssl/openssl-1.1.0i-r3.ebuild |
| 81 |
+++ b/dev-libs/openssl/openssl-1.1.0j.ebuild |
| 82 |
@@ -56,8 +56,7 @@ MULTILIB_WRAPPED_HEADERS=( |
| 83 |
|
| 84 |
PATCHES=( |
| 85 |
"${FILESDIR}"/${PN}-1.0.2a-x32-asm.patch #542618 |
| 86 |
- "${FILESDIR}"/${P}-CVE-2018-0734.patch |
| 87 |
- "${FILESDIR}"/${P}-CVE-2018-0735.patch |
| 88 |
+ "${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch #671602 |
| 89 |
) |
| 90 |
|
| 91 |
src_prepare() { |
| 92 |
@@ -89,9 +88,6 @@ src_prepare() { |
| 93 |
eapply "${PATCHES[@]}" |
| 94 |
fi |
| 95 |
|
| 96 |
- # 2018-06-21 grobian: still necessary/in use? |
| 97 |
- #epatch "${FILESDIR}"/${PN}-1.1.0f-winnt.patch # parity |
| 98 |
- |
| 99 |
eapply_user #332661 |
| 100 |
|
| 101 |
# make sure the man pages are suffixed #302165 |
| 102 |
@@ -145,8 +141,7 @@ multilib_src_configure() { |
| 103 |
unset SCRIPTS #312551 |
| 104 |
unset CROSS_COMPILE #311473 |
| 105 |
|
| 106 |
- tc-export CC AR RANLIB RC CPP |
| 107 |
- # for CPP, see: https://github.com/openssl/openssl/issues/5867 |
| 108 |
+ tc-export CC AR RANLIB RC |
| 109 |
|
| 110 |
# Clean out patent-or-otherwise-encumbered code |
| 111 |
# Camellia: Royalty Free https://en.wikipedia.org/wiki/Camellia_(cipher) |
Archives