1 |
commit: a039f65bedc72889219d1fdd46d18a88949355c0 |
2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Aug 23 17:31:22 2019 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Aug 23 18:10:17 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a039f65b |
7 |
|
8 |
dev-libs/openssl: bump to EAPI 7 |
9 |
|
10 |
Package-Manager: Portage-2.3.72, Repoman-2.3.17 |
11 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
12 |
|
13 |
...nssl-1.0.2s.ebuild => openssl-1.0.2s-r1.ebuild} | 35 ++++++++++---------- |
14 |
dev-libs/openssl/openssl-1.0.2s-r200.ebuild | 26 ++++++++------- |
15 |
...nssl-1.1.0k.ebuild => openssl-1.1.0k-r1.ebuild} | 37 ++++++++++++++-------- |
16 |
3 files changed, 56 insertions(+), 42 deletions(-) |
17 |
|
18 |
diff --git a/dev-libs/openssl/openssl-1.0.2s.ebuild b/dev-libs/openssl/openssl-1.0.2s-r1.ebuild |
19 |
similarity index 92% |
20 |
rename from dev-libs/openssl/openssl-1.0.2s.ebuild |
21 |
rename to dev-libs/openssl/openssl-1.0.2s-r1.ebuild |
22 |
index 57280189ad1..a2cb9f7917e 100644 |
23 |
--- a/dev-libs/openssl/openssl-1.0.2s.ebuild |
24 |
+++ b/dev-libs/openssl/openssl-1.0.2s-r1.ebuild |
25 |
@@ -1,9 +1,9 @@ |
26 |
# Copyright 1999-2019 Gentoo Authors |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
|
29 |
-EAPI="6" |
30 |
+EAPI="7" |
31 |
|
32 |
-inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal |
33 |
+inherit flag-o-matic toolchain-funcs multilib multilib-minimal |
34 |
|
35 |
# openssl-1.0.2-patches-1.6 contain additional CVE patches |
36 |
# which got fixed with this release. |
37 |
@@ -28,9 +28,10 @@ RESTRICT="!bindist? ( bindist )" |
38 |
|
39 |
RDEPEND=">=app-misc/c_rehash-1.7-r1 |
40 |
gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] ) |
41 |
- zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] ) |
42 |
- kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] )" |
43 |
-DEPEND="${RDEPEND} |
44 |
+ kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] ) |
45 |
+ zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )" |
46 |
+DEPEND="${RDEPEND}" |
47 |
+BDEPEND=" |
48 |
>=dev-lang/perl-5 |
49 |
sctp? ( >=net-misc/lksctp-tools-1.0.12 ) |
50 |
test? ( |
51 |
@@ -95,7 +96,9 @@ src_prepare() { |
52 |
rm -f Makefile |
53 |
|
54 |
if ! use vanilla ; then |
55 |
- eapply "${WORKDIR}"/patch/*.patch |
56 |
+ if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then |
57 |
+ [[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}" |
58 |
+ fi |
59 |
fi |
60 |
|
61 |
eapply_user |
62 |
@@ -109,7 +112,7 @@ src_prepare() { |
63 |
-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \ |
64 |
-e $(has noman FEATURES \ |
65 |
&& echo '/^install:/s:install_docs::' \ |
66 |
- || echo '/^MANDIR=/s:=.*:='${EPREFIX%/}'/usr/share/man:') \ |
67 |
+ || echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \ |
68 |
Makefile.org \ |
69 |
|| die |
70 |
# show the actual commands in the log |
71 |
@@ -134,7 +137,7 @@ src_prepare() { |
72 |
append-flags $(test-flags-CC -Wa,--noexecstack) |
73 |
append-cppflags -DOPENSSL_NO_BUF_FREELISTS |
74 |
|
75 |
- sed -i '1s,^:$,#!'${EPREFIX%/}'/usr/bin/perl,' Configure #141906 |
76 |
+ sed -i '1s,^:$,#!'${EPREFIX}'/usr/bin/perl,' Configure #141906 |
77 |
# The config script does stupid stuff to prompt the user. Kill it. |
78 |
sed -i '/stty -icanon min 0 time 50; read waste/d' config || die |
79 |
./config --test-sanity || die "I AM NOT SANE" |
80 |
@@ -206,8 +209,8 @@ multilib_src_configure() { |
81 |
$(use_ssl sslv3 ssl3) \ |
82 |
$(use_ssl tls-heartbeat heartbeats) \ |
83 |
$(use_ssl zlib) \ |
84 |
- --prefix="${EPREFIX%/}"/usr \ |
85 |
- --openssldir="${EPREFIX%/}"${SSL_CNF_DIR} \ |
86 |
+ --prefix="${EPREFIX}"/usr \ |
87 |
+ --openssldir="${EPREFIX}"${SSL_CNF_DIR} \ |
88 |
--libdir=$(get_libdir) \ |
89 |
shared threads \ |
90 |
|| die |
91 |
@@ -243,18 +246,18 @@ multilib_src_test() { |
92 |
|
93 |
multilib_src_install() { |
94 |
# We need to create $ED/usr on our own to avoid a race condition #665130 |
95 |
- if [[ ! -d "${ED%/}/usr" ]]; then |
96 |
+ if [[ ! -d "${ED}/usr" ]]; then |
97 |
# We can only create this directory once |
98 |
- mkdir "${ED%/}"/usr || die |
99 |
+ mkdir "${ED}"/usr || die |
100 |
fi |
101 |
|
102 |
- emake INSTALL_PREFIX="${D%/}" install |
103 |
+ emake INSTALL_PREFIX="${D}" install |
104 |
} |
105 |
|
106 |
multilib_src_install_all() { |
107 |
# openssl installs perl version of c_rehash by default, but |
108 |
# we provide a shell version via app-misc/c_rehash |
109 |
- rm "${ED%/}"/usr/bin/c_rehash || die |
110 |
+ rm "${ED}"/usr/bin/c_rehash || die |
111 |
|
112 |
local -a DOCS=( CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el ) |
113 |
einstalldocs |
114 |
@@ -303,7 +306,7 @@ multilib_src_install_all() { |
115 |
} |
116 |
|
117 |
pkg_postinst() { |
118 |
- ebegin "Running 'c_rehash ${EROOT%/}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069" |
119 |
- c_rehash "${EROOT%/}${SSL_CNF_DIR}/certs" >/dev/null |
120 |
+ ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069" |
121 |
+ c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null |
122 |
eend $? |
123 |
} |
124 |
|
125 |
diff --git a/dev-libs/openssl/openssl-1.0.2s-r200.ebuild b/dev-libs/openssl/openssl-1.0.2s-r200.ebuild |
126 |
index 44b9547d141..281b169b64b 100644 |
127 |
--- a/dev-libs/openssl/openssl-1.0.2s-r200.ebuild |
128 |
+++ b/dev-libs/openssl/openssl-1.0.2s-r200.ebuild |
129 |
@@ -1,9 +1,9 @@ |
130 |
# Copyright 1999-2019 Gentoo Authors |
131 |
# Distributed under the terms of the GNU General Public License v2 |
132 |
|
133 |
-EAPI="6" |
134 |
+EAPI="7" |
135 |
|
136 |
-inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal |
137 |
+inherit flag-o-matic toolchain-funcs multilib multilib-minimal |
138 |
|
139 |
# openssl-1.0.2-patches-1.6 contain additional CVE patches |
140 |
# which got fixed with this release. |
141 |
@@ -22,16 +22,16 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz |
142 |
|
143 |
LICENSE="openssl" |
144 |
SLOT="1.0.0" |
145 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux" |
146 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux" |
147 |
IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib" |
148 |
RESTRICT="!bindist? ( bindist )" |
149 |
|
150 |
-RDEPEND=">=app-misc/c_rehash-1.7-r1 |
151 |
- gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] ) |
152 |
- zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] ) |
153 |
+RDEPEND="gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] ) |
154 |
kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] ) |
155 |
+ zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] ) |
156 |
!=dev-libs/openssl-1.0.2*:0" |
157 |
-DEPEND="${RDEPEND} |
158 |
+DEPEND="${RDEPEND}" |
159 |
+BDEPEND=" |
160 |
>=dev-lang/perl-5 |
161 |
sctp? ( >=net-misc/lksctp-tools-1.0.12 ) |
162 |
test? ( |
163 |
@@ -100,7 +100,9 @@ src_prepare() { |
164 |
rm -f Makefile |
165 |
|
166 |
if ! use vanilla ; then |
167 |
- eapply "${WORKDIR}"/patch/*.patch |
168 |
+ if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then |
169 |
+ [[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}" |
170 |
+ fi |
171 |
fi |
172 |
|
173 |
eapply_user |
174 |
@@ -114,7 +116,7 @@ src_prepare() { |
175 |
-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \ |
176 |
-e $(has noman FEATURES \ |
177 |
&& echo '/^install:/s:install_docs::' \ |
178 |
- || echo '/^MANDIR=/s:=.*:='${EPREFIX%/}'/usr/share/man:') \ |
179 |
+ || echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \ |
180 |
Makefile.org \ |
181 |
|| die |
182 |
# show the actual commands in the log |
183 |
@@ -139,7 +141,7 @@ src_prepare() { |
184 |
append-flags $(test-flags-CC -Wa,--noexecstack) |
185 |
append-cppflags -DOPENSSL_NO_BUF_FREELISTS |
186 |
|
187 |
- sed -i '1s,^:$,#!'${EPREFIX%/}'/usr/bin/perl,' Configure #141906 |
188 |
+ sed -i '1s,^:$,#!'${EPREFIX}'/usr/bin/perl,' Configure #141906 |
189 |
# The config script does stupid stuff to prompt the user. Kill it. |
190 |
sed -i '/stty -icanon min 0 time 50; read waste/d' config || die |
191 |
./config --test-sanity || die "I AM NOT SANE" |
192 |
@@ -211,8 +213,8 @@ multilib_src_configure() { |
193 |
$(use_ssl sslv3 ssl3) \ |
194 |
$(use_ssl tls-heartbeat heartbeats) \ |
195 |
$(use_ssl zlib) \ |
196 |
- --prefix="${EPREFIX%/}"/usr \ |
197 |
- --openssldir="${EPREFIX%/}"${SSL_CNF_DIR} \ |
198 |
+ --prefix="${EPREFIX}"/usr \ |
199 |
+ --openssldir="${EPREFIX}"${SSL_CNF_DIR} \ |
200 |
--libdir=$(get_libdir) \ |
201 |
shared threads \ |
202 |
|| die |
203 |
|
204 |
diff --git a/dev-libs/openssl/openssl-1.1.0k.ebuild b/dev-libs/openssl/openssl-1.1.0k-r1.ebuild |
205 |
similarity index 93% |
206 |
rename from dev-libs/openssl/openssl-1.1.0k.ebuild |
207 |
rename to dev-libs/openssl/openssl-1.1.0k-r1.ebuild |
208 |
index f5af55a9879..5bc111be0f8 100644 |
209 |
--- a/dev-libs/openssl/openssl-1.1.0k.ebuild |
210 |
+++ b/dev-libs/openssl/openssl-1.1.0k-r1.ebuild |
211 |
@@ -1,7 +1,7 @@ |
212 |
# Copyright 1999-2019 Gentoo Authors |
213 |
# Distributed under the terms of the GNU General Public License v2 |
214 |
|
215 |
-EAPI="6" |
216 |
+EAPI="7" |
217 |
|
218 |
inherit flag-o-matic toolchain-funcs multilib multilib-minimal |
219 |
|
220 |
@@ -18,7 +18,8 @@ RESTRICT="!bindist? ( bindist )" |
221 |
|
222 |
RDEPEND=">=app-misc/c_rehash-1.7-r1 |
223 |
zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )" |
224 |
-DEPEND="${RDEPEND} |
225 |
+DEPEND="${RDEPEND}" |
226 |
+BDEPEND=" |
227 |
>=dev-lang/perl-5 |
228 |
sctp? ( >=net-misc/lksctp-tools-1.0.12 ) |
229 |
test? ( |
230 |
@@ -49,17 +50,17 @@ for i in "${FEDORA_PATCH[@]}" ; do # Already have a version prefix |
231 |
done |
232 |
SRC_URI+=" bindist? ( ${FEDORA_SRC_URI[@]} )" |
233 |
|
234 |
+PATCHES=( |
235 |
+ "${FILESDIR}"/${PN}-1.0.2a-x32-asm.patch #542618 |
236 |
+ "${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch #671602 |
237 |
+) |
238 |
+ |
239 |
S="${WORKDIR}/${MY_P}" |
240 |
|
241 |
MULTILIB_WRAPPED_HEADERS=( |
242 |
usr/include/openssl/opensslconf.h |
243 |
) |
244 |
|
245 |
-PATCHES=( |
246 |
- "${FILESDIR}"/${PN}-1.0.2a-x32-asm.patch #542618 |
247 |
- "${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch #671602 |
248 |
-) |
249 |
- |
250 |
src_prepare() { |
251 |
if use bindist; then |
252 |
# we need to patch the patch but we cannot patch in DISTDIR... |
253 |
@@ -98,7 +99,9 @@ src_prepare() { |
254 |
rm -f Makefile |
255 |
|
256 |
if ! use vanilla ; then |
257 |
- eapply "${PATCHES[@]}" |
258 |
+ if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then |
259 |
+ [[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}" |
260 |
+ fi |
261 |
fi |
262 |
|
263 |
eapply_user #332661 |
264 |
@@ -241,13 +244,19 @@ multilib_src_test() { |
265 |
} |
266 |
|
267 |
multilib_src_install() { |
268 |
+ # We need to create $ED/usr on our own to avoid a race condition #665130 |
269 |
+ if [[ ! -d "${ED}/usr" ]]; then |
270 |
+ # We can only create this directory once |
271 |
+ mkdir "${ED}"/usr || die |
272 |
+ fi |
273 |
+ |
274 |
emake DESTDIR="${D}" install |
275 |
} |
276 |
|
277 |
multilib_src_install_all() { |
278 |
# openssl installs perl version of c_rehash by default, but |
279 |
# we provide a shell version via app-misc/c_rehash |
280 |
- rm "${ED%/}"/usr/bin/c_rehash || die |
281 |
+ rm "${ED}"/usr/bin/c_rehash || die |
282 |
|
283 |
dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el |
284 |
|
285 |
@@ -256,13 +265,13 @@ multilib_src_install_all() { |
286 |
# build system: the static archives are built as PIC all the time. |
287 |
# Only way around this would be to manually configure+compile openssl |
288 |
# twice; once with shared lib support enabled and once without. |
289 |
- use static-libs || rm -f "${ED%/}"/usr/lib*/lib*.a |
290 |
+ use static-libs || rm -f "${ED}"/usr/lib*/lib*.a |
291 |
|
292 |
# create the certs directory |
293 |
keepdir ${SSL_CNF_DIR}/certs |
294 |
|
295 |
# Namespace openssl programs to prevent conflicts with other man pages |
296 |
- cd "${ED%/}"/usr/share/man || die |
297 |
+ cd "${ED}"/usr/share/man || die |
298 |
local m d s |
299 |
for m in $(find . -type f | xargs grep -L '#include') ; do |
300 |
d=${m%/*} ; d=${d#./} ; m=${m##*/} |
301 |
@@ -285,14 +294,14 @@ multilib_src_install_all() { |
302 |
[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :(" |
303 |
|
304 |
dodir /etc/sandbox.d #254521 |
305 |
- echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED%/}"/etc/sandbox.d/10openssl |
306 |
+ echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl |
307 |
|
308 |
diropts -m0700 |
309 |
keepdir ${SSL_CNF_DIR}/private |
310 |
} |
311 |
|
312 |
pkg_postinst() { |
313 |
- ebegin "Running 'c_rehash ${EROOT%/}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069" |
314 |
- c_rehash "${EROOT%/}${SSL_CNF_DIR}/certs" >/dev/null |
315 |
+ ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069" |
316 |
+ c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null |
317 |
eend $? |
318 |
} |