Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/openssl/, dev-libs/openssl/files/
Date: Tue, 03 May 2016 14:21:33
Message-Id: 1462285275.4ccd01d073a744eb69271f5e5f252af9a3fc5ecb.polynomial-c@gentoo
1 commit: 4ccd01d073a744eb69271f5e5f252af9a3fc5ecb
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Tue May 3 14:21:15 2016 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Tue May 3 14:21:15 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ccd01d0
7
8 dev-libs/openssl: Removed old.
9
10 Package-Manager: portage-2.2.28
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 dev-libs/openssl/Manifest | 1 -
14 .../files/openssl-1.0.2e-parallel-build.patch | 314 ---------------------
15 dev-libs/openssl/openssl-1.0.2f.ebuild | 265 -----------------
16 3 files changed, 580 deletions(-)
17
18 diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
19 index e2c25ea..7ca6bf7 100644
20 --- a/dev-libs/openssl/Manifest
21 +++ b/dev-libs/openssl/Manifest
22 @@ -1,4 +1,3 @@
23 DIST openssl-0.9.8zh.tar.gz 3818524 SHA256 f1d9f3ed1b85a82ecf80d0e2d389e1fda3fca9a4dba0bf07adbf231e1a5e2fd6 SHA512 b97fa2468211f86c0719c68ad1781eff84f772c479ed5193d6da14bac086b4ca706e7d851209d9df3f0962943b5e5333ab0def00110fb2e517caa73c0c6674c6 WHIRLPOOL 8ed3362e6aed89cd6ae02438bc3fb58ff3a91afb8a2d401d1d66c1ee4fd96f4befb50558131dd03a60fc15b588172fc1ede5d56bb1f68e184453bfe3b34f9abf
24 -DIST openssl-1.0.2f.tar.gz 5258384 SHA256 932b4ee4def2b434f85435d9e3e19ca8ba99ce9a065a61524b429a9d5e9b2e9c SHA512 50abf6dc94cafd06e7fd20770808bdc675c88daa369e4f752bd584ab17f72a57357c1ca1eca3c83e6745b5a3c9c73c99dce70adaa904d73f6df4c75bc7138351 WHIRLPOOL 179e1b5ad38c50a4c8110024aa7b33c53634c39690917e3bf5c2099548430beef96132ae9f9588ff0cedd6e08bb216a8d36835baaaa04e506fb3fbaed37d31c9
25 DIST openssl-1.0.2g.tar.gz 5266102 SHA256 b784b1b3907ce39abf4098702dade6365522a253ad1552e267a9a0e89594aa33 SHA512 4d96b6c8a232203483d6e8bee81da01ba10977bfbac92f25304a36dec9ea584b7ef917bc45e097cc7dbe681d71a4570d649c22244c178393ae91fab48323f735 WHIRLPOOL aedbd82af0a550e8329a84312fae492f3bb3cb04af763fc9ef532099b2b2e61a55e4a7cfb06085f045740e2b692bbdb3ecb8bf5ca82f46325c3caf22d2317ffb
26 DIST openssl-1.0.2h.tar.gz 5274412 SHA256 1d4007e53aad94a5b2002fe045ee7bb0b3d98f1a47f8b2bc851dcd1c74332919 SHA512 780601f6f3f32f42b6d7bbc4c593db39a3575f9db80294a10a68b2b0bb79448d9bd529ca700b9977354cbdfc65887c76af0aa7b90d3ee421f74ab53e6f15c303 WHIRLPOOL 41b6cf0c08b547f1432dc8167a4c7835da0b6907f8932969e0a352fab8bdbb4d8f612a5bf431e415d93ff1c8238652b2ee3ce0bd935cc2f59e8ea4f40fe6b5d6
27
28 diff --git a/dev-libs/openssl/files/openssl-1.0.2e-parallel-build.patch b/dev-libs/openssl/files/openssl-1.0.2e-parallel-build.patch
29 deleted file mode 100644
30 index 53d4baa..0000000
31 --- a/dev-libs/openssl/files/openssl-1.0.2e-parallel-build.patch
32 +++ /dev/null
33 @@ -1,314 +0,0 @@
34 ---- openssl-1.0.2e/crypto/Makefile
35 -+++ openssl-1.0.2e/crypto/Makefile
36 -@@ -85,11 +85,11 @@
37 - @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
38 -
39 - subdirs:
40 -- @target=all; $(RECURSIVE_MAKE)
41 -+ +@target=all; $(RECURSIVE_MAKE)
42 -
43 - files:
44 - $(PERL) $(TOP)/util/files.pl "CPUID_OBJ=$(CPUID_OBJ)" Makefile >> $(TOP)/MINFO
45 -- @target=files; $(RECURSIVE_MAKE)
46 -+ +@target=files; $(RECURSIVE_MAKE)
47 -
48 - links:
49 - @$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER)
50 -@@ -100,7 +100,7 @@
51 - # lib: $(LIB): are splitted to avoid end-less loop
52 - lib: $(LIB)
53 - @touch lib
54 --$(LIB): $(LIBOBJ)
55 -+$(LIB): $(LIBOBJ) | subdirs
56 - $(AR) $(LIB) $(LIBOBJ)
57 - test -z "$(FIPSLIBDIR)" || $(AR) $(LIB) $(FIPSLIBDIR)fipscanister.o
58 - $(RANLIB) $(LIB) || echo Never mind.
59 -@@ -111,7 +111,7 @@
60 - fi
61 -
62 - libs:
63 -- @target=lib; $(RECURSIVE_MAKE)
64 -+ +@target=lib; $(RECURSIVE_MAKE)
65 -
66 - install:
67 - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
68 -@@ -120,7 +120,7 @@
69 - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
70 - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
71 - done;
72 -- @target=install; $(RECURSIVE_MAKE)
73 -+ +@target=install; $(RECURSIVE_MAKE)
74 -
75 - lint:
76 - @target=lint; $(RECURSIVE_MAKE)
77 ---- openssl-1.0.2e/engines/Makefile
78 -+++ openssl-1.0.2e/engines/Makefile
79 -@@ -72,7 +72,7 @@
80 -
81 - all: lib subdirs
82 -
83 --lib: $(LIBOBJ)
84 -+lib: $(LIBOBJ) | subdirs
85 - @if [ -n "$(SHARED_LIBS)" ]; then \
86 - set -e; \
87 - for l in $(LIBNAMES); do \
88 -@@ -89,7 +89,7 @@
89 -
90 - subdirs:
91 - echo $(EDIRS)
92 -- @target=all; $(RECURSIVE_MAKE)
93 -+ +@target=all; $(RECURSIVE_MAKE)
94 -
95 - files:
96 - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
97 -@@ -128,7 +128,7 @@
98 - mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \
99 - done; \
100 - fi
101 -- @target=install; $(RECURSIVE_MAKE)
102 -+ +@target=install; $(RECURSIVE_MAKE)
103 -
104 - tags:
105 - ctags $(SRC)
106 ---- openssl-1.0.2e/Makefile.org
107 -+++ openssl-1.0.2e/Makefile.org
108 -@@ -280,17 +280,17 @@
109 - build_libssl: build_ssl libssl.pc
110 -
111 - build_crypto:
112 -- @dir=crypto; target=all; $(BUILD_ONE_CMD)
113 -+ +@dir=crypto; target=all; $(BUILD_ONE_CMD)
114 - build_ssl: build_crypto
115 -- @dir=ssl; target=all; $(BUILD_ONE_CMD)
116 -+ +@dir=ssl; target=all; $(BUILD_ONE_CMD)
117 - build_engines: build_crypto
118 -- @dir=engines; target=all; $(BUILD_ONE_CMD)
119 -+ +@dir=engines; target=all; $(BUILD_ONE_CMD)
120 - build_apps: build_libs
121 -- @dir=apps; target=all; $(BUILD_ONE_CMD)
122 -+ +@dir=apps; target=all; $(BUILD_ONE_CMD)
123 - build_tests: build_libs
124 -- @dir=test; target=all; $(BUILD_ONE_CMD)
125 -+ +@dir=test; target=all; $(BUILD_ONE_CMD)
126 - build_tools: build_libs
127 -- @dir=tools; target=all; $(BUILD_ONE_CMD)
128 -+ +@dir=tools; target=all; $(BUILD_ONE_CMD)
129 -
130 - all_testapps: build_libs build_testapps
131 - build_testapps:
132 -@@ -548,7 +548,7 @@
133 - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
134 - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
135 - done;
136 -- @set -e; target=install; $(RECURSIVE_BUILD_CMD)
137 -+ +@set -e; target=install; $(RECURSIVE_BUILD_CMD)
138 - @set -e; liblist="$(LIBS)"; for i in $$liblist ;\
139 - do \
140 - if [ -f "$$i" ]; then \
141 ---- openssl-1.0.2e/Makefile.shared
142 -+++ openssl-1.0.2e/Makefile.shared
143 -@@ -105,6 +105,7 @@
144 - SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \
145 - LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \
146 - LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
147 -+ [ -e $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX ] && exit 0; \
148 - LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
149 - $${SHAREDCMD} $${SHAREDFLAGS} \
150 - -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
151 -@@ -122,6 +123,7 @@
152 - done; \
153 - fi; \
154 - if [ -n "$$SHLIB_SOVER" ]; then \
155 -+ [ -e "$$SHLIB$$SHLIB_SUFFIX" ] || \
156 - ( $(SET_X); rm -f $$SHLIB$$SHLIB_SUFFIX; \
157 - ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \
158 - fi; \
159 ---- openssl-1.0.2e/test/Makefile
160 -+++ openssl-1.0.2e/test/Makefile
161 -@@ -138,7 +138,7 @@
162 - tags:
163 - ctags $(SRC)
164 -
165 --tests: exe apps $(TESTS)
166 -+tests: exe $(TESTS)
167 -
168 - apps:
169 - @(cd ..; $(MAKE) DIRS=apps all)
170 -@@ -416,127 +416,127 @@
171 - link_app.$${shlib_target}
172 -
173 - $(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO)
174 -- @target=$(RSATEST); $(BUILD_CMD)
175 -+ +@target=$(RSATEST); $(BUILD_CMD)
176 -
177 - $(BNTEST)$(EXE_EXT): $(BNTEST).o $(DLIBCRYPTO)
178 -- @target=$(BNTEST); $(BUILD_CMD)
179 -+ +@target=$(BNTEST); $(BUILD_CMD)
180 -
181 - $(ECTEST)$(EXE_EXT): $(ECTEST).o $(DLIBCRYPTO)
182 -- @target=$(ECTEST); $(BUILD_CMD)
183 -+ +@target=$(ECTEST); $(BUILD_CMD)
184 -
185 - $(EXPTEST)$(EXE_EXT): $(EXPTEST).o $(DLIBCRYPTO)
186 -- @target=$(EXPTEST); $(BUILD_CMD)
187 -+ +@target=$(EXPTEST); $(BUILD_CMD)
188 -
189 - $(IDEATEST)$(EXE_EXT): $(IDEATEST).o $(DLIBCRYPTO)
190 -- @target=$(IDEATEST); $(BUILD_CMD)
191 -+ +@target=$(IDEATEST); $(BUILD_CMD)
192 -
193 - $(MD2TEST)$(EXE_EXT): $(MD2TEST).o $(DLIBCRYPTO)
194 -- @target=$(MD2TEST); $(BUILD_CMD)
195 -+ +@target=$(MD2TEST); $(BUILD_CMD)
196 -
197 - $(SHATEST)$(EXE_EXT): $(SHATEST).o $(DLIBCRYPTO)
198 -- @target=$(SHATEST); $(BUILD_CMD)
199 -+ +@target=$(SHATEST); $(BUILD_CMD)
200 -
201 - $(SHA1TEST)$(EXE_EXT): $(SHA1TEST).o $(DLIBCRYPTO)
202 -- @target=$(SHA1TEST); $(BUILD_CMD)
203 -+ +@target=$(SHA1TEST); $(BUILD_CMD)
204 -
205 - $(SHA256TEST)$(EXE_EXT): $(SHA256TEST).o $(DLIBCRYPTO)
206 -- @target=$(SHA256TEST); $(BUILD_CMD)
207 -+ +@target=$(SHA256TEST); $(BUILD_CMD)
208 -
209 - $(SHA512TEST)$(EXE_EXT): $(SHA512TEST).o $(DLIBCRYPTO)
210 -- @target=$(SHA512TEST); $(BUILD_CMD)
211 -+ +@target=$(SHA512TEST); $(BUILD_CMD)
212 -
213 - $(RMDTEST)$(EXE_EXT): $(RMDTEST).o $(DLIBCRYPTO)
214 -- @target=$(RMDTEST); $(BUILD_CMD)
215 -+ +@target=$(RMDTEST); $(BUILD_CMD)
216 -
217 - $(MDC2TEST)$(EXE_EXT): $(MDC2TEST).o $(DLIBCRYPTO)
218 -- @target=$(MDC2TEST); $(BUILD_CMD)
219 -+ +@target=$(MDC2TEST); $(BUILD_CMD)
220 -
221 - $(MD4TEST)$(EXE_EXT): $(MD4TEST).o $(DLIBCRYPTO)
222 -- @target=$(MD4TEST); $(BUILD_CMD)
223 -+ +@target=$(MD4TEST); $(BUILD_CMD)
224 -
225 - $(MD5TEST)$(EXE_EXT): $(MD5TEST).o $(DLIBCRYPTO)
226 -- @target=$(MD5TEST); $(BUILD_CMD)
227 -+ +@target=$(MD5TEST); $(BUILD_CMD)
228 -
229 - $(HMACTEST)$(EXE_EXT): $(HMACTEST).o $(DLIBCRYPTO)
230 -- @target=$(HMACTEST); $(BUILD_CMD)
231 -+ +@target=$(HMACTEST); $(BUILD_CMD)
232 -
233 - $(WPTEST)$(EXE_EXT): $(WPTEST).o $(DLIBCRYPTO)
234 -- @target=$(WPTEST); $(BUILD_CMD)
235 -+ +@target=$(WPTEST); $(BUILD_CMD)
236 -
237 - $(RC2TEST)$(EXE_EXT): $(RC2TEST).o $(DLIBCRYPTO)
238 -- @target=$(RC2TEST); $(BUILD_CMD)
239 -+ +@target=$(RC2TEST); $(BUILD_CMD)
240 -
241 - $(BFTEST)$(EXE_EXT): $(BFTEST).o $(DLIBCRYPTO)
242 -- @target=$(BFTEST); $(BUILD_CMD)
243 -+ +@target=$(BFTEST); $(BUILD_CMD)
244 -
245 - $(CASTTEST)$(EXE_EXT): $(CASTTEST).o $(DLIBCRYPTO)
246 -- @target=$(CASTTEST); $(BUILD_CMD)
247 -+ +@target=$(CASTTEST); $(BUILD_CMD)
248 -
249 - $(RC4TEST)$(EXE_EXT): $(RC4TEST).o $(DLIBCRYPTO)
250 -- @target=$(RC4TEST); $(BUILD_CMD)
251 -+ +@target=$(RC4TEST); $(BUILD_CMD)
252 -
253 - $(RC5TEST)$(EXE_EXT): $(RC5TEST).o $(DLIBCRYPTO)
254 -- @target=$(RC5TEST); $(BUILD_CMD)
255 -+ +@target=$(RC5TEST); $(BUILD_CMD)
256 -
257 - $(DESTEST)$(EXE_EXT): $(DESTEST).o $(DLIBCRYPTO)
258 -- @target=$(DESTEST); $(BUILD_CMD)
259 -+ +@target=$(DESTEST); $(BUILD_CMD)
260 -
261 - $(RANDTEST)$(EXE_EXT): $(RANDTEST).o $(DLIBCRYPTO)
262 -- @target=$(RANDTEST); $(BUILD_CMD)
263 -+ +@target=$(RANDTEST); $(BUILD_CMD)
264 -
265 - $(DHTEST)$(EXE_EXT): $(DHTEST).o $(DLIBCRYPTO)
266 -- @target=$(DHTEST); $(BUILD_CMD)
267 -+ +@target=$(DHTEST); $(BUILD_CMD)
268 -
269 - $(DSATEST)$(EXE_EXT): $(DSATEST).o $(DLIBCRYPTO)
270 -- @target=$(DSATEST); $(BUILD_CMD)
271 -+ +@target=$(DSATEST); $(BUILD_CMD)
272 -
273 - $(METHTEST)$(EXE_EXT): $(METHTEST).o $(DLIBCRYPTO)
274 -- @target=$(METHTEST); $(BUILD_CMD)
275 -+ +@target=$(METHTEST); $(BUILD_CMD)
276 -
277 - $(SSLTEST)$(EXE_EXT): $(SSLTEST).o $(DLIBSSL) $(DLIBCRYPTO)
278 -- @target=$(SSLTEST); $(FIPS_BUILD_CMD)
279 -+ +@target=$(SSLTEST); $(FIPS_BUILD_CMD)
280 -
281 - $(ENGINETEST)$(EXE_EXT): $(ENGINETEST).o $(DLIBCRYPTO)
282 -- @target=$(ENGINETEST); $(BUILD_CMD)
283 -+ +@target=$(ENGINETEST); $(BUILD_CMD)
284 -
285 - $(EVPTEST)$(EXE_EXT): $(EVPTEST).o $(DLIBCRYPTO)
286 -- @target=$(EVPTEST); $(BUILD_CMD)
287 -+ +@target=$(EVPTEST); $(BUILD_CMD)
288 -
289 - $(EVPEXTRATEST)$(EXE_EXT): $(EVPEXTRATEST).o $(DLIBCRYPTO)
290 -- @target=$(EVPEXTRATEST); $(BUILD_CMD)
291 -+ +@target=$(EVPEXTRATEST); $(BUILD_CMD)
292 -
293 - $(ECDSATEST)$(EXE_EXT): $(ECDSATEST).o $(DLIBCRYPTO)
294 -- @target=$(ECDSATEST); $(BUILD_CMD)
295 -+ +@target=$(ECDSATEST); $(BUILD_CMD)
296 -
297 - $(ECDHTEST)$(EXE_EXT): $(ECDHTEST).o $(DLIBCRYPTO)
298 -- @target=$(ECDHTEST); $(BUILD_CMD)
299 -+ +@target=$(ECDHTEST); $(BUILD_CMD)
300 -
301 - $(IGETEST)$(EXE_EXT): $(IGETEST).o $(DLIBCRYPTO)
302 -- @target=$(IGETEST); $(BUILD_CMD)
303 -+ +@target=$(IGETEST); $(BUILD_CMD)
304 -
305 - $(JPAKETEST)$(EXE_EXT): $(JPAKETEST).o $(DLIBCRYPTO)
306 -- @target=$(JPAKETEST); $(BUILD_CMD)
307 -+ +@target=$(JPAKETEST); $(BUILD_CMD)
308 -
309 - $(ASN1TEST)$(EXE_EXT): $(ASN1TEST).o $(DLIBCRYPTO)
310 -- @target=$(ASN1TEST); $(BUILD_CMD)
311 -+ +@target=$(ASN1TEST); $(BUILD_CMD)
312 -
313 - $(SRPTEST)$(EXE_EXT): $(SRPTEST).o $(DLIBCRYPTO)
314 -- @target=$(SRPTEST); $(BUILD_CMD)
315 -+ +@target=$(SRPTEST); $(BUILD_CMD)
316 -
317 - $(V3NAMETEST)$(EXE_EXT): $(V3NAMETEST).o $(DLIBCRYPTO)
318 -- @target=$(V3NAMETEST); $(BUILD_CMD)
319 -+ +@target=$(V3NAMETEST); $(BUILD_CMD)
320 -
321 - $(HEARTBEATTEST)$(EXE_EXT): $(HEARTBEATTEST).o $(DLIBCRYPTO)
322 -- @target=$(HEARTBEATTEST); $(BUILD_CMD_STATIC)
323 -+ +@target=$(HEARTBEATTEST); $(BUILD_CMD_STATIC)
324 -
325 - $(CONSTTIMETEST)$(EXE_EXT): $(CONSTTIMETEST).o
326 -- @target=$(CONSTTIMETEST) $(BUILD_CMD)
327 -+ +@target=$(CONSTTIMETEST) $(BUILD_CMD)
328 -
329 - $(VERIFYEXTRATEST)$(EXE_EXT): $(VERIFYEXTRATEST).o
330 -- @target=$(VERIFYEXTRATEST) $(BUILD_CMD)
331 -+ +@target=$(VERIFYEXTRATEST) $(BUILD_CMD)
332 -
333 - $(CLIENTHELLOTEST)$(EXE_EXT): $(CLIENTHELLOTEST).o
334 -- @target=$(CLIENTHELLOTEST) $(BUILD_CMD)
335 -+ +@target=$(CLIENTHELLOTEST) $(BUILD_CMD)
336 -
337 - #$(AESTEST).o: $(AESTEST).c
338 - # $(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c
339 -@@ -549,7 +549,7 @@
340 - # fi
341 -
342 - dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO)
343 -- @target=dummytest; $(BUILD_CMD)
344 -+ +@target=dummytest; $(BUILD_CMD)
345 -
346 - # DO NOT DELETE THIS LINE -- make depend depends on it.
347 -
348
349 diff --git a/dev-libs/openssl/openssl-1.0.2f.ebuild b/dev-libs/openssl/openssl-1.0.2f.ebuild
350 deleted file mode 100644
351 index a7c3eb6..0000000
352 --- a/dev-libs/openssl/openssl-1.0.2f.ebuild
353 +++ /dev/null
354 @@ -1,265 +0,0 @@
355 -# Copyright 1999-2016 Gentoo Foundation
356 -# Distributed under the terms of the GNU General Public License v2
357 -# $Id$
358 -
359 -EAPI=5
360 -
361 -inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal
362 -
363 -MY_P=${P/_/-}
364 -DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
365 -HOMEPAGE="http://www.openssl.org/"
366 -SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
367 -
368 -LICENSE="openssl"
369 -SLOT="0"
370 -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
371 -IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 static-libs test +tls-heartbeat vanilla zlib"
372 -RESTRICT="!bindist? ( bindist )"
373 -
374 -# The blocks are temporary just to make sure people upgrade to a
375 -# version that lack runtime version checking. We'll drop them in
376 -# the future.
377 -RDEPEND=">=app-misc/c_rehash-1.7-r1
378 - gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
379 - zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
380 - kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] )
381 - abi_x86_32? (
382 - !<=app-emulation/emul-linux-x86-baselibs-20140508
383 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
384 - )
385 - !<net-misc/openssh-5.9_p1-r4
386 - !<net-libs/neon-0.29.6-r1"
387 -DEPEND="${RDEPEND}
388 - >=dev-lang/perl-5
389 - sctp? ( >=net-misc/lksctp-tools-1.0.12 )
390 - test? (
391 - sys-apps/diffutils
392 - sys-devel/bc
393 - )"
394 -PDEPEND="app-misc/ca-certificates"
395 -
396 -S="${WORKDIR}/${MY_P}"
397 -
398 -MULTILIB_WRAPPED_HEADERS=(
399 - usr/include/openssl/opensslconf.h
400 -)
401 -
402 -src_prepare() {
403 - # keep this in sync with app-misc/c_rehash
404 - SSL_CNF_DIR="/etc/ssl"
405 -
406 - # Make sure we only ever touch Makefile.org and avoid patching a file
407 - # that gets blown away anyways by the Configure script in src_configure
408 - rm -f Makefile
409 -
410 - if ! use vanilla ; then
411 - epatch "${FILESDIR}"/${PN}-1.0.0a-ldflags.patch #327421
412 - epatch "${FILESDIR}"/${PN}-1.0.0d-windres.patch #373743
413 - epatch "${FILESDIR}"/${PN}-1.0.2e-parallel-build.patch
414 - epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-obj-headers.patch
415 - epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-install-dirs.patch
416 - epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-symlinking.patch #545028
417 - epatch "${FILESDIR}"/${PN}-1.0.2-ipv6.patch
418 - epatch "${FILESDIR}"/${PN}-1.0.2a-x32-asm.patch #542618
419 - epatch "${FILESDIR}"/${PN}-1.0.1p-default-source.patch #554338
420 -
421 - epatch_user #332661
422 - fi
423 -
424 - # disable fips in the build
425 - # make sure the man pages are suffixed #302165
426 - # don't bother building man pages if they're disabled
427 - sed -i \
428 - -e '/DIRS/s: fips : :g' \
429 - -e '/^MANSUFFIX/s:=.*:=ssl:' \
430 - -e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
431 - -e $(has noman FEATURES \
432 - && echo '/^install:/s:install_docs::' \
433 - || echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
434 - Makefile.org \
435 - || die
436 - # show the actual commands in the log
437 - sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
438 -
439 - # since we're forcing $(CC) as makedep anyway, just fix
440 - # the conditional as always-on
441 - # helps clang (#417795), and versioned gcc (#499818)
442 - sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || die
443 -
444 - # quiet out unknown driver argument warnings since openssl
445 - # doesn't have well-split CFLAGS and we're making it even worse
446 - # and 'make depend' uses -Werror for added fun (#417795 again)
447 - [[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
448 -
449 - # allow openssl to be cross-compiled
450 - cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
451 - chmod a+rx gentoo.config
452 -
453 - append-flags -fno-strict-aliasing
454 - append-flags $(test-flags-CC -Wa,--noexecstack)
455 - append-cppflags -DOPENSSL_NO_BUF_FREELISTS
456 -
457 - sed -i '1s,^:$,#!'${EPREFIX}'/usr/bin/perl,' Configure #141906
458 - # The config script does stupid stuff to prompt the user. Kill it.
459 - sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
460 - ./config --test-sanity || die "I AM NOT SANE"
461 -
462 - multilib_copy_sources
463 -}
464 -
465 -multilib_src_configure() {
466 - unset APPS #197996
467 - unset SCRIPTS #312551
468 - unset CROSS_COMPILE #311473
469 -
470 - tc-export CC AR RANLIB RC
471 -
472 - # Clean out patent-or-otherwise-encumbered code
473 - # Camellia: Royalty Free http://en.wikipedia.org/wiki/Camellia_(cipher)
474 - # IDEA: Expired http://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
475 - # EC: ????????? ??/??/2015 http://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
476 - # MDC2: Expired http://en.wikipedia.org/wiki/MDC-2
477 - # RC5: Expired http://en.wikipedia.org/wiki/RC5
478 -
479 - use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
480 - echoit() { echo "$@" ; "$@" ; }
481 -
482 - local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
483 -
484 - # See if our toolchain supports __uint128_t. If so, it's 64bit
485 - # friendly and can use the nicely optimized code paths. #460790
486 - local ec_nistp_64_gcc_128
487 - # Disable it for now though #469976
488 - #if ! use bindist ; then
489 - # echo "__uint128_t i;" > "${T}"/128.c
490 - # if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
491 - # ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
492 - # fi
493 - #fi
494 -
495 - local sslout=$(./gentoo.config)
496 - einfo "Use configuration ${sslout:-(openssl knows best)}"
497 - local config="Configure"
498 - [[ -z ${sslout} ]] && config="config"
499 -
500 - echoit \
501 - ./${config} \
502 - ${sslout} \
503 - $(use cpu_flags_x86_sse2 || echo "no-sse2") \
504 - enable-camellia \
505 - $(use_ssl !bindist ec) \
506 - ${ec_nistp_64_gcc_128} \
507 - enable-idea \
508 - enable-mdc2 \
509 - enable-rc5 \
510 - enable-tlsext \
511 - $(use_ssl asm) \
512 - $(use_ssl gmp gmp -lgmp) \
513 - $(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
514 - $(use_ssl rfc3779) \
515 - $(use_ssl sctp) \
516 - $(use_ssl tls-heartbeat heartbeats) \
517 - $(use_ssl zlib) \
518 - --prefix="${EPREFIX}"/usr \
519 - --openssldir="${EPREFIX}"${SSL_CNF_DIR} \
520 - --libdir=$(get_libdir) \
521 - shared threads \
522 - || die
523 -
524 - # Clean out hardcoded flags that openssl uses
525 - local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
526 - -e 's:^CFLAG=::' \
527 - -e 's:-fomit-frame-pointer ::g' \
528 - -e 's:-O[0-9] ::g' \
529 - -e 's:-march=[-a-z0-9]* ::g' \
530 - -e 's:-mcpu=[-a-z0-9]* ::g' \
531 - -e 's:-m[a-z0-9]* ::g' \
532 - )
533 - sed -i \
534 - -e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \
535 - -e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \
536 - Makefile || die
537 -}
538 -
539 -multilib_src_compile() {
540 - # depend is needed to use $confopts; it also doesn't matter
541 - # that it's -j1 as the code itself serializes subdirs
542 - emake -j1 depend
543 - emake all
544 - # rehash is needed to prep the certs/ dir; do this
545 - # separately to avoid parallel build issues.
546 - emake rehash
547 -}
548 -
549 -multilib_src_test() {
550 - emake -j1 test
551 -}
552 -
553 -multilib_src_install() {
554 - emake INSTALL_PREFIX="${D}" install
555 -}
556 -
557 -multilib_src_install_all() {
558 - # openssl installs perl version of c_rehash by default, but
559 - # we provide a shell version via app-misc/c_rehash
560 - rm "${ED}"/usr/bin/c_rehash || die
561 -
562 - dodoc CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el
563 - dohtml -r doc/*
564 - use rfc3779 && dodoc engines/ccgost/README.gost
565 -
566 - # This is crappy in that the static archives are still built even
567 - # when USE=static-libs. But this is due to a failing in the openssl
568 - # build system: the static archives are built as PIC all the time.
569 - # Only way around this would be to manually configure+compile openssl
570 - # twice; once with shared lib support enabled and once without.
571 - use static-libs || rm -f "${ED}"/usr/lib*/lib*.a
572 -
573 - # create the certs directory
574 - dodir ${SSL_CNF_DIR}/certs
575 - cp -RP certs/* "${ED}"${SSL_CNF_DIR}/certs/ || die
576 - rm -r "${ED}"${SSL_CNF_DIR}/certs/{demo,expired}
577 -
578 - # Namespace openssl programs to prevent conflicts with other man pages
579 - cd "${ED}"/usr/share/man
580 - local m d s
581 - for m in $(find . -type f | xargs grep -L '#include') ; do
582 - d=${m%/*} ; d=${d#./} ; m=${m##*/}
583 - [[ ${m} == openssl.1* ]] && continue
584 - [[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
585 - mv ${d}/{,ssl-}${m}
586 - # fix up references to renamed man pages
587 - sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
588 - ln -s ssl-${m} ${d}/openssl-${m}
589 - # locate any symlinks that point to this man page ... we assume
590 - # that any broken links are due to the above renaming
591 - for s in $(find -L ${d} -type l) ; do
592 - s=${s##*/}
593 - rm -f ${d}/${s}
594 - ln -s ssl-${m} ${d}/ssl-${s}
595 - ln -s ssl-${s} ${d}/openssl-${s}
596 - done
597 - done
598 - [[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
599 -
600 - dodir /etc/sandbox.d #254521
601 - echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
602 -
603 - diropts -m0700
604 - keepdir ${SSL_CNF_DIR}/private
605 -}
606 -
607 -pkg_preinst() {
608 - has_version ${CATEGORY}/${PN}:0.9.8 && return 0
609 - preserve_old_lib /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8
610 -}
611 -
612 -pkg_postinst() {
613 - ebegin "Running 'c_rehash ${EROOT%/}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
614 - c_rehash "${EROOT%/}${SSL_CNF_DIR}/certs" >/dev/null
615 - eend $?
616 -
617 - has_version ${CATEGORY}/${PN}:0.9.8 && return 0
618 - preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8
619 -}