1 |
commit: 28a471d4c5bbf70a220403206a6a62c0740e0926 |
2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jan 8 02:13:24 2021 +0000 |
4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jan 8 02:13:24 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28a471d4 |
7 |
|
8 |
net-libs/mbedtls: version bumps to 2.16.9 and 2.25.0, bug #764317 |
9 |
|
10 |
Package-Manager: Portage-3.0.12, Repoman-3.0.2 |
11 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
12 |
|
13 |
net-libs/mbedtls/Manifest | 2 + |
14 |
net-libs/mbedtls/mbedtls-2.16.9.ebuild | 94 +++++++++++++++++++++++++++++++++ |
15 |
net-libs/mbedtls/mbedtls-2.25.0.ebuild | 95 ++++++++++++++++++++++++++++++++++ |
16 |
3 files changed, 191 insertions(+) |
17 |
|
18 |
diff --git a/net-libs/mbedtls/Manifest b/net-libs/mbedtls/Manifest |
19 |
index aef009b8f5b..f4394f3b241 100644 |
20 |
--- a/net-libs/mbedtls/Manifest |
21 |
+++ b/net-libs/mbedtls/Manifest |
22 |
@@ -1,2 +1,4 @@ |
23 |
DIST mbedtls-2.16.8.tar.gz 2662927 BLAKE2B 80dabffe644c792ce8a317629950bee71a2376be8f84de29d5cb92047ee433347e7e91be513d638b2954c0c7b2393eaef81b7d449753efffab25694b8a8b52d5 SHA512 645d58d42594a2b547b904634acc1e7e8583465e075c190183e1179638f05e1f8f5c56561ab172fed8dcec4a1742429663abdfdc25d607410ea64a35fbb22168 |
24 |
+DIST mbedtls-2.16.9.tar.gz 2668396 BLAKE2B c637509e8960916bea714b0558b729bf43544d64a560b2e76beba78f8d1355e982f0112bd9e5dd5a14698fa8292d23ed0f41670b220d48d26d6b5a17884481d4 SHA512 f72538851c7a24ac14b5c153220260a49a083bfff44a52e9c1e77c51109bac779b5b4caac21f995176fe8f9d27843f3495692d6c7e9dc733cbcec896823ff0e0 |
25 |
DIST mbedtls-2.24.0.tar.gz 3912697 BLAKE2B 4355fb4db90e3d72e73adcd8ee96c7db2809154c08a00c1a3a8a8f8d6360689f17317a6dd3564c85e1fadece1a49f1ce30561ad21faf48a5bab78e223f2cd070 SHA512 5437ea57eb8b8af9446a796876aa2bfe3c59c88f926b1638c7e8a021a8bef9f4bc6cb1b254e7387e2afe095bd27c518060719726bbaf5478582a56c34315cfb8 |
26 |
+DIST mbedtls-2.25.0.tar.gz 3994272 BLAKE2B 27a326ba08c341ed47ce280401a4b73606138aa8946fd8d8df5d084496eecc6eadf4eedd65270725a360d4b171c86cefeccb6b1515847587f0f11ed15b7dda9b SHA512 78e68dd9a2939fb9e40d796dcc2de36671c900921eac800688bfc3b5f47fda88be2eb4c7dcb34a01628983cd66323b15606ef2a29e7cbfda0d86aa3f6c948647 |
27 |
|
28 |
diff --git a/net-libs/mbedtls/mbedtls-2.16.9.ebuild b/net-libs/mbedtls/mbedtls-2.16.9.ebuild |
29 |
new file mode 100644 |
30 |
index 00000000000..324eaa4202f |
31 |
--- /dev/null |
32 |
+++ b/net-libs/mbedtls/mbedtls-2.16.9.ebuild |
33 |
@@ -0,0 +1,94 @@ |
34 |
+# Copyright 1999-2021 Gentoo Authors |
35 |
+# Distributed under the terms of the GNU General Public License v2 |
36 |
+ |
37 |
+EAPI=7 |
38 |
+ |
39 |
+inherit cmake multilib-minimal |
40 |
+ |
41 |
+DESCRIPTION="Cryptographic library for embedded systems" |
42 |
+HOMEPAGE="https://tls.mbed.org/" |
43 |
+SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz" |
44 |
+S=${WORKDIR}/${PN}-${P} |
45 |
+ |
46 |
+LICENSE="Apache-2.0" |
47 |
+SLOT="0/3.12.0" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so} |
48 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" |
49 |
+IUSE="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib" |
50 |
+RESTRICT="!test? ( test )" |
51 |
+ |
52 |
+RDEPEND=" |
53 |
+ programs? ( |
54 |
+ !libressl? ( dev-libs/openssl:0= ) |
55 |
+ libressl? ( dev-libs/libressl:0= ) |
56 |
+ ) |
57 |
+ zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )" |
58 |
+DEPEND="${RDEPEND} |
59 |
+ doc? ( app-doc/doxygen media-gfx/graphviz ) |
60 |
+ test? ( dev-lang/perl )" |
61 |
+ |
62 |
+enable_mbedtls_option() { |
63 |
+ local myopt="$@" |
64 |
+ # check that config.h syntax is the same at version bump |
65 |
+ sed -i \ |
66 |
+ -e "s://#define ${myopt}:#define ${myopt}:" \ |
67 |
+ include/mbedtls/config.h || die |
68 |
+} |
69 |
+ |
70 |
+src_prepare() { |
71 |
+ use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2 |
72 |
+ use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT |
73 |
+ use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C |
74 |
+ use threads && enable_mbedtls_option MBEDTLS_THREADING_C |
75 |
+ use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD |
76 |
+ |
77 |
+ cmake_src_prepare |
78 |
+} |
79 |
+ |
80 |
+multilib_src_configure() { |
81 |
+ local mycmakeargs=( |
82 |
+ -DENABLE_PROGRAMS=$(multilib_native_usex programs) |
83 |
+ -DENABLE_ZLIB_SUPPORT=$(usex zlib) |
84 |
+ -DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs) |
85 |
+ -DENABLE_TESTING=$(usex test) |
86 |
+ -DUSE_SHARED_MBEDTLS_LIBRARY=ON |
87 |
+ -DINSTALL_MBEDTLS_HEADERS=ON |
88 |
+ -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)" |
89 |
+ ) |
90 |
+ |
91 |
+ cmake_src_configure |
92 |
+} |
93 |
+ |
94 |
+multilib_src_compile() { |
95 |
+ cmake_src_compile |
96 |
+ use doc && multilib_is_native_abi && cd "${S}" && emake apidoc |
97 |
+} |
98 |
+ |
99 |
+multilib_src_test() { |
100 |
+ LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \ |
101 |
+ cmake_src_test |
102 |
+} |
103 |
+ |
104 |
+multilib_src_install() { |
105 |
+ cmake_src_install |
106 |
+} |
107 |
+ |
108 |
+multilib_src_install_all() { |
109 |
+ use doc && HTML_DOCS=( apidoc ) |
110 |
+ |
111 |
+ einstalldocs |
112 |
+ |
113 |
+ if use programs ; then |
114 |
+ # avoid file collisions with sys-apps/coreutils |
115 |
+ local p e |
116 |
+ for p in "${ED}"/usr/bin/* ; do |
117 |
+ if [[ -x "${p}" && ! -d "${p}" ]] ; then |
118 |
+ mv "${p}" "${ED}"/usr/bin/mbedtls_${p##*/} || die |
119 |
+ fi |
120 |
+ done |
121 |
+ for e in aes hash pkey ssl test ; do |
122 |
+ docinto "${e}" |
123 |
+ dodoc programs/"${e}"/*.c |
124 |
+ dodoc programs/"${e}"/*.txt |
125 |
+ done |
126 |
+ fi |
127 |
+} |
128 |
|
129 |
diff --git a/net-libs/mbedtls/mbedtls-2.25.0.ebuild b/net-libs/mbedtls/mbedtls-2.25.0.ebuild |
130 |
new file mode 100644 |
131 |
index 00000000000..c1bb84ede01 |
132 |
--- /dev/null |
133 |
+++ b/net-libs/mbedtls/mbedtls-2.25.0.ebuild |
134 |
@@ -0,0 +1,95 @@ |
135 |
+# Copyright 1999-2021 Gentoo Authors |
136 |
+# Distributed under the terms of the GNU General Public License v2 |
137 |
+ |
138 |
+EAPI=7 |
139 |
+ |
140 |
+inherit cmake multilib-minimal |
141 |
+ |
142 |
+DESCRIPTION="Cryptographic library for embedded systems" |
143 |
+HOMEPAGE="https://tls.mbed.org/" |
144 |
+SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz" |
145 |
+S=${WORKDIR}/${PN}-${P} |
146 |
+ |
147 |
+LICENSE="Apache-2.0" |
148 |
+SLOT="0/6.13.1" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so} |
149 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" |
150 |
+IUSE="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib" |
151 |
+RESTRICT="!test? ( test )" |
152 |
+ |
153 |
+RDEPEND=" |
154 |
+ programs? ( |
155 |
+ !libressl? ( dev-libs/openssl:0= ) |
156 |
+ libressl? ( dev-libs/libressl:0= ) |
157 |
+ ) |
158 |
+ zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )" |
159 |
+DEPEND="${RDEPEND} |
160 |
+ doc? ( app-doc/doxygen media-gfx/graphviz ) |
161 |
+ test? ( dev-lang/perl )" |
162 |
+ |
163 |
+enable_mbedtls_option() { |
164 |
+ local myopt="$@" |
165 |
+ # check that config.h syntax is the same at version bump |
166 |
+ sed -i \ |
167 |
+ -e "s://#define ${myopt}:#define ${myopt}:" \ |
168 |
+ include/mbedtls/config.h || die |
169 |
+} |
170 |
+ |
171 |
+src_prepare() { |
172 |
+ use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2 |
173 |
+ use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT |
174 |
+ use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C |
175 |
+ use threads && enable_mbedtls_option MBEDTLS_THREADING_C |
176 |
+ use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD |
177 |
+ |
178 |
+ cmake_src_prepare |
179 |
+} |
180 |
+ |
181 |
+multilib_src_configure() { |
182 |
+ local mycmakeargs=( |
183 |
+ -DENABLE_PROGRAMS=$(multilib_native_usex programs) |
184 |
+ -DENABLE_ZLIB_SUPPORT=$(usex zlib) |
185 |
+ -DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs) |
186 |
+ -DENABLE_TESTING=$(usex test) |
187 |
+ -DUSE_SHARED_MBEDTLS_LIBRARY=ON |
188 |
+ -DINSTALL_MBEDTLS_HEADERS=ON |
189 |
+ -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)" |
190 |
+ -DMBEDTLS_FATAL_WARNINGS=OFF # Don't use -Werror, #744946 |
191 |
+ ) |
192 |
+ |
193 |
+ cmake_src_configure |
194 |
+} |
195 |
+ |
196 |
+multilib_src_compile() { |
197 |
+ cmake_src_compile |
198 |
+ use doc && multilib_is_native_abi && cd "${S}" && emake apidoc |
199 |
+} |
200 |
+ |
201 |
+multilib_src_test() { |
202 |
+ LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \ |
203 |
+ cmake_src_test |
204 |
+} |
205 |
+ |
206 |
+multilib_src_install() { |
207 |
+ cmake_src_install |
208 |
+} |
209 |
+ |
210 |
+multilib_src_install_all() { |
211 |
+ use doc && HTML_DOCS=( apidoc ) |
212 |
+ |
213 |
+ einstalldocs |
214 |
+ |
215 |
+ if use programs ; then |
216 |
+ # avoid file collisions with sys-apps/coreutils |
217 |
+ local p e |
218 |
+ for p in "${ED}"/usr/bin/* ; do |
219 |
+ if [[ -x "${p}" && ! -d "${p}" ]] ; then |
220 |
+ mv "${p}" "${ED}"/usr/bin/mbedtls_${p##*/} || die |
221 |
+ fi |
222 |
+ done |
223 |
+ for e in aes hash pkey ssl test ; do |
224 |
+ docinto "${e}" |
225 |
+ dodoc programs/"${e}"/*.c |
226 |
+ dodoc programs/"${e}"/*.txt |
227 |
+ done |
228 |
+ fi |
229 |
+} |