1 |
commit: a75bfcf78192b3c2341ef8b93416e05388ab202c |
2 |
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> |
3 |
AuthorDate: Sun May 24 11:26:40 2020 +0000 |
4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon May 25 21:22:43 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a75bfcf7 |
7 |
|
8 |
net-libs/mbedtls: security cleanup |
9 |
|
10 |
Bug: https://bugs.gentoo.org/714582 |
11 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
12 |
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr> |
13 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
14 |
|
15 |
net-libs/mbedtls/Manifest | 2 - |
16 |
net-libs/mbedtls/mbedtls-2.19.1-r2.ebuild | 106 ------------------------------ |
17 |
2 files changed, 108 deletions(-) |
18 |
|
19 |
diff --git a/net-libs/mbedtls/Manifest b/net-libs/mbedtls/Manifest |
20 |
index 69b2642974f..403c222c2c1 100644 |
21 |
--- a/net-libs/mbedtls/Manifest |
22 |
+++ b/net-libs/mbedtls/Manifest |
23 |
@@ -1,4 +1,2 @@ |
24 |
-DIST mbedcrypto-2.0.0.tar.gz 3001813 BLAKE2B 35a01b7cb11a94cb5ef333f5939945b40ecd0da482959980931e389ac5aec3c1c1b2f40970bbde4587454aee5957dce220593bfc31943ec3deddfa70d2386a25 SHA512 3a8fa6b7160065ef175139ba9cb4c8599be11f9d0df5fd60f9f96c425400a0a40eaa31d571ce61d4a00e3b10c1e2b81756c1ad31df6fc32777f40ade7806948a |
25 |
DIST mbedtls-2.16.6.tar.gz 2603563 BLAKE2B a4011bb2b7e3eca554cded05c4650fc16b48d86ae1ac7fefe29df6b29e38c1e76c880f082be83759b4dddd96f831a1238c2df41671bd9794b028402b3dd63f60 SHA512 a4c2e70c0cc6b1f1571a9f2ec27ede2620eb1937361599cab0e05b807068397d25695d5cd23931fd0f4cc051de6367c2b6c77f3507ed8b33cd492589c51eebac |
26 |
-DIST mbedtls-2.19.1.tar.gz 1165843 BLAKE2B c8e6764b493a6ca011e74d7b297d5ae5140d7bdf17c1cfd5b9d37913d615ad3c5a6dbf71d44cbf14c938646e51bbf04cd63cc1657eb3775addb2dee3ee94c587 SHA512 07ec1cdf98e51ed35bb2940e485d7d8422e9fd440d2077d5cd4c80781d73848228386fe9064773ef8bb1a02c1bc060185b9c8310349d695926bd2c9b7cf6582b |
27 |
DIST mbedtls-2.22.0.tar.gz 3822997 BLAKE2B 0857479e89f9850f611cb8c946c489f715a83edba88673b874cd3e6530a7f72c48671e02435087a48aa9a550d0901a5fd2990f9b3a4d69edceecf1fa01772ab6 SHA512 391b99a59ed4edf9625e71e610ea71c6cefa4ea1210d306eb595d85f7408d5decf5fc995d4a411698f1536651ee1230b305dd354df15dbeef9469aa6a7980e09 |
28 |
|
29 |
diff --git a/net-libs/mbedtls/mbedtls-2.19.1-r2.ebuild b/net-libs/mbedtls/mbedtls-2.19.1-r2.ebuild |
30 |
deleted file mode 100644 |
31 |
index f8d6153e970..00000000000 |
32 |
--- a/net-libs/mbedtls/mbedtls-2.19.1-r2.ebuild |
33 |
+++ /dev/null |
34 |
@@ -1,106 +0,0 @@ |
35 |
-# Copyright 1999-2020 Gentoo Authors |
36 |
-# Distributed under the terms of the GNU General Public License v2 |
37 |
- |
38 |
-EAPI=7 |
39 |
- |
40 |
-inherit cmake-utils multilib-minimal |
41 |
- |
42 |
-DESCRIPTION="Cryptographic library for embedded systems" |
43 |
-HOMEPAGE="https://tls.mbed.org/" |
44 |
-CRYPTO_SUBMODULE="mbedcrypto-2.0.0" |
45 |
-SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz |
46 |
- https://github.com/ARMmbed/mbed-crypto/archive/${CRYPTO_SUBMODULE}.tar.gz" |
47 |
-S=${WORKDIR}/${PN}-${P} |
48 |
- |
49 |
-LICENSE="Apache-2.0" |
50 |
-SLOT="0/13" # slot for libmbedtls.so |
51 |
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86" |
52 |
-IUSE="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib" |
53 |
-RESTRICT="!test? ( test )" |
54 |
- |
55 |
-RDEPEND=" |
56 |
- programs? ( |
57 |
- !libressl? ( dev-libs/openssl:0= ) |
58 |
- libressl? ( dev-libs/libressl:0= ) |
59 |
- ) |
60 |
- zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )" |
61 |
-DEPEND="${RDEPEND} |
62 |
- doc? ( app-doc/doxygen media-gfx/graphviz ) |
63 |
- test? ( dev-lang/perl )" |
64 |
- |
65 |
-enable_mbedtls_option() { |
66 |
- local myopt="$@" |
67 |
- # check that config.h syntax is the same at version bump |
68 |
- sed -i \ |
69 |
- -e "s://#define ${myopt}:#define ${myopt}:" \ |
70 |
- include/mbedtls/config.h || die |
71 |
-} |
72 |
- |
73 |
-PATCHES=( |
74 |
- "${FILESDIR}"/${PN}-dont-overwrite-headers.patch |
75 |
- "${FILESDIR}"/${PN}-un-pebcak-705038-wrong-file.patch |
76 |
- "${FILESDIR}"/${PN}-2.19.1-zlib.patch #706112 |
77 |
-) |
78 |
- |
79 |
-src_prepare() { |
80 |
- use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2 |
81 |
- use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT |
82 |
- use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C |
83 |
- use threads && enable_mbedtls_option MBEDTLS_THREADING_C |
84 |
- use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD |
85 |
- |
86 |
- # pretend to be git submodule |
87 |
- rmdir "${S}"/crypto |
88 |
- mv "${WORKDIR}"/mbed-crypto-${CRYPTO_SUBMODULE} "${S}"/crypto |
89 |
- |
90 |
- cmake-utils_src_prepare |
91 |
-} |
92 |
- |
93 |
-multilib_src_configure() { |
94 |
- local mycmakeargs=( |
95 |
- -DENABLE_PROGRAMS=$(multilib_native_usex programs) |
96 |
- -DENABLE_ZLIB_SUPPORT=$(usex zlib) |
97 |
- -DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs) |
98 |
- -DENABLE_TESTING=$(usex test) |
99 |
- -DUSE_SHARED_MBEDTLS_LIBRARY=ON |
100 |
- -DINSTALL_MBEDTLS_HEADERS=ON |
101 |
- -DLIB_INSTALL_DIR="/usr/$(get_libdir)" |
102 |
- ) |
103 |
- |
104 |
- cmake-utils_src_configure |
105 |
-} |
106 |
- |
107 |
-multilib_src_compile() { |
108 |
- cmake-utils_src_compile |
109 |
- use doc && multilib_is_native_abi && cd "${S}" && emake apidoc |
110 |
-} |
111 |
- |
112 |
-multilib_src_test() { |
113 |
- LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \ |
114 |
- cmake-utils_src_test |
115 |
-} |
116 |
- |
117 |
-multilib_src_install() { |
118 |
- cmake-utils_src_install |
119 |
-} |
120 |
- |
121 |
-multilib_src_install_all() { |
122 |
- use doc && HTML_DOCS=( apidoc ) |
123 |
- |
124 |
- einstalldocs |
125 |
- |
126 |
- if use programs ; then |
127 |
- # avoid file collisions with sys-apps/coreutils |
128 |
- local p e |
129 |
- for p in "${ED}"/usr/bin/* ; do |
130 |
- if [[ -x "${p}" && ! -d "${p}" ]] ; then |
131 |
- mv "${p}" "${ED}"/usr/bin/mbedtls_${p##*/} || die |
132 |
- fi |
133 |
- done |
134 |
- for e in aes hash pkey ssl test ; do |
135 |
- docinto "${e}" |
136 |
- dodoc programs/"${e}"/*.c |
137 |
- dodoc programs/"${e}"/*.txt |
138 |
- done |
139 |
- fi |
140 |
-} |