1 |
commit: a4af1cd3c4fb7b99b468903efbdc652e2a5bf9c2 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jan 29 06:58:41 2016 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jan 29 06:59:01 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4af1cd3 |
7 |
|
8 |
dev-libs/openssl: Removed old. |
9 |
|
10 |
Package-Manager: portage-2.2.27 |
11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
12 |
|
13 |
dev-libs/openssl/Manifest | 4 - |
14 |
.../files/openssl-1.0.2-s_client-verify.patch | 17 -- |
15 |
.../openssl/files/openssl-1.0.2a-malloc-typo.patch | 38 --- |
16 |
.../files/openssl-1.0.2a-parallel-build.patch | 314 --------------------- |
17 |
.../files/openssl-1.0.2d-parallel-build.patch | 309 -------------------- |
18 |
dev-libs/openssl/openssl-1.0.2a.ebuild | 266 ----------------- |
19 |
dev-libs/openssl/openssl-1.0.2b.ebuild | 264 ----------------- |
20 |
dev-libs/openssl/openssl-1.0.2c.ebuild | 264 ----------------- |
21 |
dev-libs/openssl/openssl-1.0.2d-r2.ebuild | 265 ----------------- |
22 |
dev-libs/openssl/openssl-1.0.2d.ebuild | 267 ------------------ |
23 |
10 files changed, 2008 deletions(-) |
24 |
|
25 |
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest |
26 |
index 17b0441..ddc4c31 100644 |
27 |
--- a/dev-libs/openssl/Manifest |
28 |
+++ b/dev-libs/openssl/Manifest |
29 |
@@ -2,10 +2,6 @@ DIST openssl-0.9.8zg.tar.gz 3826891 SHA256 06500060639930e471050474f537fcd28ec93 |
30 |
DIST openssl-0.9.8zh.tar.gz 3818524 SHA256 f1d9f3ed1b85a82ecf80d0e2d389e1fda3fca9a4dba0bf07adbf231e1a5e2fd6 SHA512 b97fa2468211f86c0719c68ad1781eff84f772c479ed5193d6da14bac086b4ca706e7d851209d9df3f0962943b5e5333ab0def00110fb2e517caa73c0c6674c6 WHIRLPOOL 8ed3362e6aed89cd6ae02438bc3fb58ff3a91afb8a2d401d1d66c1ee4fd96f4befb50558131dd03a60fc15b588172fc1ede5d56bb1f68e184453bfe3b34f9abf |
31 |
DIST openssl-1.0.1p.tar.gz 4560208 SHA256 bd5ee6803165c0fb60bbecbacacf244f1f90d2aa0d71353af610c29121e9b2f1 SHA512 64e475c53a85b78de7c5aa71a22d4bb3a456142842373ebf8f22e9857cb0352b646e591b21af866933baecdbdb5ac4a22aeb64914440c53a0f30cd25914029e5 WHIRLPOOL 2a81f3b9274e3fef37a2a88e3084d8283159b3a61db08e7805879905c87a74faa85bc6e570d18525741bd5c27c34fe09eeb58b2bfe500545d0f304716e14f819 |
32 |
DIST openssl-1.0.1r.tar.gz 4547786 SHA256 784bd8d355ed01ce98b812f873f8b2313da61df7c7b5677fcf2e57b0863a3346 SHA512 7a5a2efe5d9421ea6f4f86f75ed40b4459b3825355ad18da3bdba28393bc50a6f457b2e1f11a31828f1af0d62a716d258ac7868fb719c9997f3bc750a1723e86 WHIRLPOOL de9c92f5ddb9bcaac967ac735696e739f5762b7d3a0b2430dbfa0c6cd7ac021fdf3c3257255a2fe995f24aa3550d59ce3067f030f09acc5d43b61dfda627686a |
33 |
-DIST openssl-1.0.2a.tar.gz 5262089 SHA256 15b6393c20030aab02c8e2fe0243cb1d1d18062f6c095d67bca91871dc7f324a SHA512 02d228578824add52b73433d64697706e6503c2334933fe8dd6b477f59c430977012c3c34da207096229a425e1dcb6f3ae806043894b5ac98c27bbcddb794dd4 WHIRLPOOL a590c71794f5d29b80afa28b18621b7535e96b714b3690d793c1422a90b09a89cbcb912841d400c5982a8197bb02c13051190e96ba0e4d530509b48b43067cd7 |
34 |
-DIST openssl-1.0.2b.tar.gz 5281009 SHA256 d5d488cc9f0a07974195a7427094ea3cab9800a4e90178b989aa621fbc238e3f SHA512 563eb662113668bb9ccf17a6e36697ad6392321ac1a32aa2cada9d8f4047651c2fa4da61f508ee3e1834fea343dbba189e09c1d6cabe5d1de5e3e6d022c31f4f WHIRLPOOL d828dc76842d25f02f211031b3ab9a2a8fd44975e9aaf87d0fd5fca9935a27b61c3e4f896a2186194f1a7b4d668fc48cafc5be9f7c670017ba342ce40113935f |
35 |
-DIST openssl-1.0.2c.tar.gz 5280670 SHA256 0038ba37f35a6367c58f17a7a7f687953ef8ce4f9684bbdec63e62515ed36a83 SHA512 2a68e8b017d0d3e34e4f9d33b77abd960b3d04e418f106e852684a2ff247dc8ea390b7d6a42d130fd84d821a15e84e77b68b3677433433ef5c10d156333b9dae WHIRLPOOL c59878c3bd5e8904913b97d71a15ef1eaafcfb4eb58c691ba4fb38bf81752308d0ef4a902e53aec4c6e7585677f2404d29cdea0832d14206fabf28d744af2622 |
36 |
-DIST openssl-1.0.2d.tar.gz 5295447 SHA256 671c36487785628a703374c652ad2cebea45fa920ae5681515df25d9f2c9a8c8 SHA512 68a051e92aaed0e7a8b218c185427c534c32f30f50c45f5d2c1f5b7a26d1416e83863d2953c77486acde3b636a148f39faf48246d28a207607ec069f62b13d75 WHIRLPOOL e3d8f0784903c8d6aa05ada7b8b410517c99157a3c2f4ac34c8a9d80c77408bd6ff9e820ded47f6223ccac4a77413174aa625303166ec28fdbf8374a7d4659ec |
37 |
DIST openssl-1.0.2e.tar.gz 5256555 SHA256 e23ccafdb75cfcde782da0151731aa2185195ac745eea3846133f2e05c0e0bff SHA512 b73f114a117ccab284cf5891dac050e3016d28e0b1fc71639442cdb42accef676115af90a12deff4bcc1f599cc0cbdeb38142cbf4570bd7d03634786ad32c95f WHIRLPOOL 8e1c1800a66f57fa78dc391e717e4b2bdf0e6e37a837c5ac033d7a4b1a6437451c7e7540c4ec2f75f936a2d2ef4f9293b42c76f51b0c9c93706639589612f196 |
38 |
DIST openssl-1.0.2f.tar.gz 5258384 SHA256 932b4ee4def2b434f85435d9e3e19ca8ba99ce9a065a61524b429a9d5e9b2e9c SHA512 50abf6dc94cafd06e7fd20770808bdc675c88daa369e4f752bd584ab17f72a57357c1ca1eca3c83e6745b5a3c9c73c99dce70adaa904d73f6df4c75bc7138351 WHIRLPOOL 179e1b5ad38c50a4c8110024aa7b33c53634c39690917e3bf5c2099548430beef96132ae9f9588ff0cedd6e08bb216a8d36835baaaa04e506fb3fbaed37d31c9 |
39 |
DIST openssl-c_rehash.sh.1.7 4167 SHA256 4999ee79892f52bd6a4a7baba9fac62262454d573bbffd72685d3aae9e48cee0 SHA512 55e8c2e827750a4f375cb83c86bfe2d166c01ffa5d7e9b16657b72b38b747c8985dd2c98f854c911dfbbee2ff3e92aff39fdf089d979b2e3534b7685ee8b80da WHIRLPOOL c88f06a3b8651f76b6289552cccceb64e13f6697c5f0ce3ff114c781ce1c218912b8ee308af9d087cd76a9600fdacda1953175bff07d7d3eb21b0c0b7f4f1ce1 |
40 |
|
41 |
diff --git a/dev-libs/openssl/files/openssl-1.0.2-s_client-verify.patch b/dev-libs/openssl/files/openssl-1.0.2-s_client-verify.patch |
42 |
deleted file mode 100644 |
43 |
index 803a91d..0000000 |
44 |
--- a/dev-libs/openssl/files/openssl-1.0.2-s_client-verify.patch |
45 |
+++ /dev/null |
46 |
@@ -1,17 +0,0 @@ |
47 |
-https://bugs.gentoo.org/472584 |
48 |
-http://rt.openssl.org/Ticket/Display.html?id=2387&user=guest&pass=guest |
49 |
- |
50 |
-fix verification handling in s_client. when loading paths, make sure |
51 |
-we properly fallback to setting the default paths. |
52 |
- |
53 |
---- openssl-1.0.2/apps/s_client.c |
54 |
-+++ openssl-1.0.2/apps/s_client.c |
55 |
-@@ -1337,7 +1337,7 @@ |
56 |
- |
57 |
- SSL_CTX_set_verify(ctx, verify, verify_callback); |
58 |
- |
59 |
-- if ((!SSL_CTX_load_verify_locations(ctx, CAfile, CApath)) || |
60 |
-+ if ((!SSL_CTX_load_verify_locations(ctx, CAfile, CApath)) && |
61 |
- (!SSL_CTX_set_default_verify_paths(ctx))) { |
62 |
- /* |
63 |
- * BIO_printf(bio_err,"error setting default verify locations\n"); |
64 |
|
65 |
diff --git a/dev-libs/openssl/files/openssl-1.0.2a-malloc-typo.patch b/dev-libs/openssl/files/openssl-1.0.2a-malloc-typo.patch |
66 |
deleted file mode 100644 |
67 |
index 831e575..0000000 |
68 |
--- a/dev-libs/openssl/files/openssl-1.0.2a-malloc-typo.patch |
69 |
+++ /dev/null |
70 |
@@ -1,38 +0,0 @@ |
71 |
-https://rt.openssl.org/Ticket/Display.html?id=3758 |
72 |
- |
73 |
-From 7b4152089fe39c3495508076ab81ed4aca3d65ba Mon Sep 17 00:00:00 2001 |
74 |
-From: Mike Frysinger <vapier@g.o> |
75 |
-Date: Sat, 21 Mar 2015 05:08:41 -0400 |
76 |
-Subject: [PATCH] fix malloc define typo |
77 |
- |
78 |
-Reported-by: Conrad Kostecki <ck+gentoobugzilla@××××××××.de> |
79 |
-URL: https://bugs.gentoo.org/543828 |
80 |
---- |
81 |
- crypto/bio/bss_dgram.c | 4 ++-- |
82 |
- 1 file changed, 2 insertions(+), 2 deletions(-) |
83 |
- |
84 |
-diff --git a/crypto/bio/bss_dgram.c b/crypto/bio/bss_dgram.c |
85 |
-index aef8149..ed275d1 100644 |
86 |
---- a/crypto/bio/bss_dgram.c |
87 |
-+++ b/crypto/bio/bss_dgram.c |
88 |
-@@ -1338,7 +1338,7 @@ static int dgram_sctp_read(BIO *b, char *out, int outl) |
89 |
- (socklen_t) (sizeof(sctp_assoc_t) + 256 * sizeof(uint8_t)); |
90 |
- authchunks = OPENSSL_malloc(optlen); |
91 |
- if (!authchunks) { |
92 |
-- BIOerr(BIO_F_DGRAM_SCTP_READ, ERR_R_MALLOC_ERROR); |
93 |
-+ BIOerr(BIO_F_DGRAM_SCTP_READ, ERR_R_MALLOC_FAILURE); |
94 |
- return -1; |
95 |
- } |
96 |
- memset(authchunks, 0, optlen); |
97 |
-@@ -1410,7 +1410,7 @@ static int dgram_sctp_write(BIO *b, const char *in, int inl) |
98 |
- char *tmp; |
99 |
- data->saved_message.bio = b; |
100 |
- if(!(tmp = OPENSSL_malloc(inl))) { |
101 |
-- BIOerr(BIO_F_DGRAM_SCTP_WRITE, ERR_R_MALLOC_ERROR); |
102 |
-+ BIOerr(BIO_F_DGRAM_SCTP_WRITE, ERR_R_MALLOC_FAILURE); |
103 |
- return -1; |
104 |
- } |
105 |
- if (data->saved_message.data) |
106 |
--- |
107 |
-2.3.3 |
108 |
- |
109 |
|
110 |
diff --git a/dev-libs/openssl/files/openssl-1.0.2a-parallel-build.patch b/dev-libs/openssl/files/openssl-1.0.2a-parallel-build.patch |
111 |
deleted file mode 100644 |
112 |
index f4226c3..0000000 |
113 |
--- a/dev-libs/openssl/files/openssl-1.0.2a-parallel-build.patch |
114 |
+++ /dev/null |
115 |
@@ -1,314 +0,0 @@ |
116 |
-https://rt.openssl.org/Ticket/Display.html?id=2084&user=guest&pass=guest |
117 |
-https://rt.openssl.org/Ticket/Display.html?id=3738&user=guest&pass=guest |
118 |
- |
119 |
---- openssl-1.0.2a/crypto/Makefile |
120 |
-+++ openssl-1.0.2a/crypto/Makefile |
121 |
-@@ -85,11 +85,11 @@ |
122 |
- @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi |
123 |
- |
124 |
- subdirs: |
125 |
-- @target=all; $(RECURSIVE_MAKE) |
126 |
-+ +@target=all; $(RECURSIVE_MAKE) |
127 |
- |
128 |
- files: |
129 |
- $(PERL) $(TOP)/util/files.pl "CPUID_OBJ=$(CPUID_OBJ)" Makefile >> $(TOP)/MINFO |
130 |
-- @target=files; $(RECURSIVE_MAKE) |
131 |
-+ +@target=files; $(RECURSIVE_MAKE) |
132 |
- |
133 |
- links: |
134 |
- @$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER) |
135 |
-@@ -100,7 +100,7 @@ |
136 |
- # lib: $(LIB): are splitted to avoid end-less loop |
137 |
- lib: $(LIB) |
138 |
- @touch lib |
139 |
--$(LIB): $(LIBOBJ) |
140 |
-+$(LIB): $(LIBOBJ) | subdirs |
141 |
- $(AR) $(LIB) $(LIBOBJ) |
142 |
- test -z "$(FIPSLIBDIR)" || $(AR) $(LIB) $(FIPSLIBDIR)fipscanister.o |
143 |
- $(RANLIB) $(LIB) || echo Never mind. |
144 |
-@@ -111,7 +111,7 @@ |
145 |
- fi |
146 |
- |
147 |
- libs: |
148 |
-- @target=lib; $(RECURSIVE_MAKE) |
149 |
-+ +@target=lib; $(RECURSIVE_MAKE) |
150 |
- |
151 |
- install: |
152 |
- @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... |
153 |
-@@ -120,7 +120,7 @@ |
154 |
- (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ |
155 |
- chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ |
156 |
- done; |
157 |
-- @target=install; $(RECURSIVE_MAKE) |
158 |
-+ +@target=install; $(RECURSIVE_MAKE) |
159 |
- |
160 |
- lint: |
161 |
- @target=lint; $(RECURSIVE_MAKE) |
162 |
---- openssl-1.0.2a/engines/Makefile |
163 |
-+++ openssl-1.0.2a/engines/Makefile |
164 |
-@@ -72,7 +72,7 @@ |
165 |
- |
166 |
- all: lib subdirs |
167 |
- |
168 |
--lib: $(LIBOBJ) |
169 |
-+lib: $(LIBOBJ) | subdirs |
170 |
- @if [ -n "$(SHARED_LIBS)" ]; then \ |
171 |
- set -e; \ |
172 |
- for l in $(LIBNAMES); do \ |
173 |
-@@ -89,7 +89,7 @@ |
174 |
- |
175 |
- subdirs: |
176 |
- echo $(EDIRS) |
177 |
-- @target=all; $(RECURSIVE_MAKE) |
178 |
-+ +@target=all; $(RECURSIVE_MAKE) |
179 |
- |
180 |
- files: |
181 |
- $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO |
182 |
-@@ -128,7 +128,7 @@ |
183 |
- mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \ |
184 |
- done; \ |
185 |
- fi |
186 |
-- @target=install; $(RECURSIVE_MAKE) |
187 |
-+ +@target=install; $(RECURSIVE_MAKE) |
188 |
- |
189 |
- tags: |
190 |
- ctags $(SRC) |
191 |
---- openssl-1.0.2a/Makefile.org |
192 |
-+++ openssl-1.0.2a/Makefile.org |
193 |
-@@ -274,17 +274,17 @@ |
194 |
- build_libs: build_crypto build_ssl build_engines |
195 |
- |
196 |
- build_crypto: |
197 |
-- @dir=crypto; target=all; $(BUILD_ONE_CMD) |
198 |
-+ +@dir=crypto; target=all; $(BUILD_ONE_CMD) |
199 |
--build_ssl: |
200 |
-+build_ssl: build_crypto |
201 |
-- @dir=ssl; target=all; $(BUILD_ONE_CMD) |
202 |
-+ +@dir=ssl; target=all; $(BUILD_ONE_CMD) |
203 |
--build_engines: |
204 |
-+build_engines: build_crypto |
205 |
-- @dir=engines; target=all; $(BUILD_ONE_CMD) |
206 |
-+ +@dir=engines; target=all; $(BUILD_ONE_CMD) |
207 |
--build_apps: |
208 |
-+build_apps: build_libs |
209 |
-- @dir=apps; target=all; $(BUILD_ONE_CMD) |
210 |
-+ +@dir=apps; target=all; $(BUILD_ONE_CMD) |
211 |
--build_tests: |
212 |
-+build_tests: build_libs |
213 |
-- @dir=test; target=all; $(BUILD_ONE_CMD) |
214 |
-+ +@dir=test; target=all; $(BUILD_ONE_CMD) |
215 |
--build_tools: |
216 |
-+build_tools: build_libs |
217 |
-- @dir=tools; target=all; $(BUILD_ONE_CMD) |
218 |
-+ +@dir=tools; target=all; $(BUILD_ONE_CMD) |
219 |
- |
220 |
- all_testapps: build_libs build_testapps |
221 |
- build_testapps: |
222 |
-@@ -555,7 +555,7 @@ |
223 |
- (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ |
224 |
- chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ |
225 |
- done; |
226 |
-- @set -e; target=install; $(RECURSIVE_BUILD_CMD) |
227 |
-+ +@set -e; target=install; $(RECURSIVE_BUILD_CMD) |
228 |
- @set -e; liblist="$(LIBS)"; for i in $$liblist ;\ |
229 |
- do \ |
230 |
- if [ -f "$$i" ]; then \ |
231 |
---- openssl-1.0.2a/Makefile.shared |
232 |
-+++ openssl-1.0.2a/Makefile.shared |
233 |
-@@ -105,6 +105,7 @@ |
234 |
- SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \ |
235 |
- LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \ |
236 |
- LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \ |
237 |
-+ [ -e $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX ] && exit 0; \ |
238 |
- LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \ |
239 |
- $${SHAREDCMD} $${SHAREDFLAGS} \ |
240 |
- -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \ |
241 |
-@@ -122,6 +123,7 @@ |
242 |
- done; \ |
243 |
- fi; \ |
244 |
- if [ -n "$$SHLIB_SOVER" ]; then \ |
245 |
-+ [ -e "$$SHLIB$$SHLIB_SUFFIX" ] || \ |
246 |
- ( $(SET_X); rm -f $$SHLIB$$SHLIB_SUFFIX; \ |
247 |
- ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \ |
248 |
- fi; \ |
249 |
---- openssl-1.0.2a/test/Makefile |
250 |
-+++ openssl-1.0.2a/test/Makefile |
251 |
-@@ -133,7 +133,7 @@ |
252 |
- tags: |
253 |
- ctags $(SRC) |
254 |
- |
255 |
--tests: exe apps $(TESTS) |
256 |
-+tests: exe $(TESTS) |
257 |
- |
258 |
- apps: |
259 |
- @(cd ..; $(MAKE) DIRS=apps all) |
260 |
-@@ -402,121 +402,121 @@ |
261 |
- link_app.$${shlib_target} |
262 |
- |
263 |
- $(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO) |
264 |
-- @target=$(RSATEST); $(BUILD_CMD) |
265 |
-+ +@target=$(RSATEST); $(BUILD_CMD) |
266 |
- |
267 |
- $(BNTEST)$(EXE_EXT): $(BNTEST).o $(DLIBCRYPTO) |
268 |
-- @target=$(BNTEST); $(BUILD_CMD) |
269 |
-+ +@target=$(BNTEST); $(BUILD_CMD) |
270 |
- |
271 |
- $(ECTEST)$(EXE_EXT): $(ECTEST).o $(DLIBCRYPTO) |
272 |
-- @target=$(ECTEST); $(BUILD_CMD) |
273 |
-+ +@target=$(ECTEST); $(BUILD_CMD) |
274 |
- |
275 |
- $(EXPTEST)$(EXE_EXT): $(EXPTEST).o $(DLIBCRYPTO) |
276 |
-- @target=$(EXPTEST); $(BUILD_CMD) |
277 |
-+ +@target=$(EXPTEST); $(BUILD_CMD) |
278 |
- |
279 |
- $(IDEATEST)$(EXE_EXT): $(IDEATEST).o $(DLIBCRYPTO) |
280 |
-- @target=$(IDEATEST); $(BUILD_CMD) |
281 |
-+ +@target=$(IDEATEST); $(BUILD_CMD) |
282 |
- |
283 |
- $(MD2TEST)$(EXE_EXT): $(MD2TEST).o $(DLIBCRYPTO) |
284 |
-- @target=$(MD2TEST); $(BUILD_CMD) |
285 |
-+ +@target=$(MD2TEST); $(BUILD_CMD) |
286 |
- |
287 |
- $(SHATEST)$(EXE_EXT): $(SHATEST).o $(DLIBCRYPTO) |
288 |
-- @target=$(SHATEST); $(BUILD_CMD) |
289 |
-+ +@target=$(SHATEST); $(BUILD_CMD) |
290 |
- |
291 |
- $(SHA1TEST)$(EXE_EXT): $(SHA1TEST).o $(DLIBCRYPTO) |
292 |
-- @target=$(SHA1TEST); $(BUILD_CMD) |
293 |
-+ +@target=$(SHA1TEST); $(BUILD_CMD) |
294 |
- |
295 |
- $(SHA256TEST)$(EXE_EXT): $(SHA256TEST).o $(DLIBCRYPTO) |
296 |
-- @target=$(SHA256TEST); $(BUILD_CMD) |
297 |
-+ +@target=$(SHA256TEST); $(BUILD_CMD) |
298 |
- |
299 |
- $(SHA512TEST)$(EXE_EXT): $(SHA512TEST).o $(DLIBCRYPTO) |
300 |
-- @target=$(SHA512TEST); $(BUILD_CMD) |
301 |
-+ +@target=$(SHA512TEST); $(BUILD_CMD) |
302 |
- |
303 |
- $(RMDTEST)$(EXE_EXT): $(RMDTEST).o $(DLIBCRYPTO) |
304 |
-- @target=$(RMDTEST); $(BUILD_CMD) |
305 |
-+ +@target=$(RMDTEST); $(BUILD_CMD) |
306 |
- |
307 |
- $(MDC2TEST)$(EXE_EXT): $(MDC2TEST).o $(DLIBCRYPTO) |
308 |
-- @target=$(MDC2TEST); $(BUILD_CMD) |
309 |
-+ +@target=$(MDC2TEST); $(BUILD_CMD) |
310 |
- |
311 |
- $(MD4TEST)$(EXE_EXT): $(MD4TEST).o $(DLIBCRYPTO) |
312 |
-- @target=$(MD4TEST); $(BUILD_CMD) |
313 |
-+ +@target=$(MD4TEST); $(BUILD_CMD) |
314 |
- |
315 |
- $(MD5TEST)$(EXE_EXT): $(MD5TEST).o $(DLIBCRYPTO) |
316 |
-- @target=$(MD5TEST); $(BUILD_CMD) |
317 |
-+ +@target=$(MD5TEST); $(BUILD_CMD) |
318 |
- |
319 |
- $(HMACTEST)$(EXE_EXT): $(HMACTEST).o $(DLIBCRYPTO) |
320 |
-- @target=$(HMACTEST); $(BUILD_CMD) |
321 |
-+ +@target=$(HMACTEST); $(BUILD_CMD) |
322 |
- |
323 |
- $(WPTEST)$(EXE_EXT): $(WPTEST).o $(DLIBCRYPTO) |
324 |
-- @target=$(WPTEST); $(BUILD_CMD) |
325 |
-+ +@target=$(WPTEST); $(BUILD_CMD) |
326 |
- |
327 |
- $(RC2TEST)$(EXE_EXT): $(RC2TEST).o $(DLIBCRYPTO) |
328 |
-- @target=$(RC2TEST); $(BUILD_CMD) |
329 |
-+ +@target=$(RC2TEST); $(BUILD_CMD) |
330 |
- |
331 |
- $(BFTEST)$(EXE_EXT): $(BFTEST).o $(DLIBCRYPTO) |
332 |
-- @target=$(BFTEST); $(BUILD_CMD) |
333 |
-+ +@target=$(BFTEST); $(BUILD_CMD) |
334 |
- |
335 |
- $(CASTTEST)$(EXE_EXT): $(CASTTEST).o $(DLIBCRYPTO) |
336 |
-- @target=$(CASTTEST); $(BUILD_CMD) |
337 |
-+ +@target=$(CASTTEST); $(BUILD_CMD) |
338 |
- |
339 |
- $(RC4TEST)$(EXE_EXT): $(RC4TEST).o $(DLIBCRYPTO) |
340 |
-- @target=$(RC4TEST); $(BUILD_CMD) |
341 |
-+ +@target=$(RC4TEST); $(BUILD_CMD) |
342 |
- |
343 |
- $(RC5TEST)$(EXE_EXT): $(RC5TEST).o $(DLIBCRYPTO) |
344 |
-- @target=$(RC5TEST); $(BUILD_CMD) |
345 |
-+ +@target=$(RC5TEST); $(BUILD_CMD) |
346 |
- |
347 |
- $(DESTEST)$(EXE_EXT): $(DESTEST).o $(DLIBCRYPTO) |
348 |
-- @target=$(DESTEST); $(BUILD_CMD) |
349 |
-+ +@target=$(DESTEST); $(BUILD_CMD) |
350 |
- |
351 |
- $(RANDTEST)$(EXE_EXT): $(RANDTEST).o $(DLIBCRYPTO) |
352 |
-- @target=$(RANDTEST); $(BUILD_CMD) |
353 |
-+ +@target=$(RANDTEST); $(BUILD_CMD) |
354 |
- |
355 |
- $(DHTEST)$(EXE_EXT): $(DHTEST).o $(DLIBCRYPTO) |
356 |
-- @target=$(DHTEST); $(BUILD_CMD) |
357 |
-+ +@target=$(DHTEST); $(BUILD_CMD) |
358 |
- |
359 |
- $(DSATEST)$(EXE_EXT): $(DSATEST).o $(DLIBCRYPTO) |
360 |
-- @target=$(DSATEST); $(BUILD_CMD) |
361 |
-+ +@target=$(DSATEST); $(BUILD_CMD) |
362 |
- |
363 |
- $(METHTEST)$(EXE_EXT): $(METHTEST).o $(DLIBCRYPTO) |
364 |
-- @target=$(METHTEST); $(BUILD_CMD) |
365 |
-+ +@target=$(METHTEST); $(BUILD_CMD) |
366 |
- |
367 |
- $(SSLTEST)$(EXE_EXT): $(SSLTEST).o $(DLIBSSL) $(DLIBCRYPTO) |
368 |
-- @target=$(SSLTEST); $(FIPS_BUILD_CMD) |
369 |
-+ +@target=$(SSLTEST); $(FIPS_BUILD_CMD) |
370 |
- |
371 |
- $(ENGINETEST)$(EXE_EXT): $(ENGINETEST).o $(DLIBCRYPTO) |
372 |
-- @target=$(ENGINETEST); $(BUILD_CMD) |
373 |
-+ +@target=$(ENGINETEST); $(BUILD_CMD) |
374 |
- |
375 |
- $(EVPTEST)$(EXE_EXT): $(EVPTEST).o $(DLIBCRYPTO) |
376 |
-- @target=$(EVPTEST); $(BUILD_CMD) |
377 |
-+ +@target=$(EVPTEST); $(BUILD_CMD) |
378 |
- |
379 |
- $(EVPEXTRATEST)$(EXE_EXT): $(EVPEXTRATEST).o $(DLIBCRYPTO) |
380 |
-- @target=$(EVPEXTRATEST); $(BUILD_CMD) |
381 |
-+ +@target=$(EVPEXTRATEST); $(BUILD_CMD) |
382 |
- |
383 |
- $(ECDSATEST)$(EXE_EXT): $(ECDSATEST).o $(DLIBCRYPTO) |
384 |
-- @target=$(ECDSATEST); $(BUILD_CMD) |
385 |
-+ +@target=$(ECDSATEST); $(BUILD_CMD) |
386 |
- |
387 |
- $(ECDHTEST)$(EXE_EXT): $(ECDHTEST).o $(DLIBCRYPTO) |
388 |
-- @target=$(ECDHTEST); $(BUILD_CMD) |
389 |
-+ +@target=$(ECDHTEST); $(BUILD_CMD) |
390 |
- |
391 |
- $(IGETEST)$(EXE_EXT): $(IGETEST).o $(DLIBCRYPTO) |
392 |
-- @target=$(IGETEST); $(BUILD_CMD) |
393 |
-+ +@target=$(IGETEST); $(BUILD_CMD) |
394 |
- |
395 |
- $(JPAKETEST)$(EXE_EXT): $(JPAKETEST).o $(DLIBCRYPTO) |
396 |
-- @target=$(JPAKETEST); $(BUILD_CMD) |
397 |
-+ +@target=$(JPAKETEST); $(BUILD_CMD) |
398 |
- |
399 |
- $(ASN1TEST)$(EXE_EXT): $(ASN1TEST).o $(DLIBCRYPTO) |
400 |
-- @target=$(ASN1TEST); $(BUILD_CMD) |
401 |
-+ +@target=$(ASN1TEST); $(BUILD_CMD) |
402 |
- |
403 |
- $(SRPTEST)$(EXE_EXT): $(SRPTEST).o $(DLIBCRYPTO) |
404 |
-- @target=$(SRPTEST); $(BUILD_CMD) |
405 |
-+ +@target=$(SRPTEST); $(BUILD_CMD) |
406 |
- |
407 |
- $(V3NAMETEST)$(EXE_EXT): $(V3NAMETEST).o $(DLIBCRYPTO) |
408 |
-- @target=$(V3NAMETEST); $(BUILD_CMD) |
409 |
-+ +@target=$(V3NAMETEST); $(BUILD_CMD) |
410 |
- |
411 |
- $(HEARTBEATTEST)$(EXE_EXT): $(HEARTBEATTEST).o $(DLIBCRYPTO) |
412 |
-- @target=$(HEARTBEATTEST); $(BUILD_CMD_STATIC) |
413 |
-+ +@target=$(HEARTBEATTEST); $(BUILD_CMD_STATIC) |
414 |
- |
415 |
- $(CONSTTIMETEST)$(EXE_EXT): $(CONSTTIMETEST).o |
416 |
-- @target=$(CONSTTIMETEST) $(BUILD_CMD) |
417 |
-+ +@target=$(CONSTTIMETEST) $(BUILD_CMD) |
418 |
- |
419 |
- #$(AESTEST).o: $(AESTEST).c |
420 |
- # $(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c |
421 |
-@@ -529,7 +529,7 @@ |
422 |
- # fi |
423 |
- |
424 |
- dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO) |
425 |
-- @target=dummytest; $(BUILD_CMD) |
426 |
-+ +@target=dummytest; $(BUILD_CMD) |
427 |
- |
428 |
- # DO NOT DELETE THIS LINE -- make depend depends on it. |
429 |
- |
430 |
|
431 |
diff --git a/dev-libs/openssl/files/openssl-1.0.2d-parallel-build.patch b/dev-libs/openssl/files/openssl-1.0.2d-parallel-build.patch |
432 |
deleted file mode 100644 |
433 |
index b7aa0ea..0000000 |
434 |
--- a/dev-libs/openssl/files/openssl-1.0.2d-parallel-build.patch |
435 |
+++ /dev/null |
436 |
@@ -1,309 +0,0 @@ |
437 |
-https://rt.openssl.org/Ticket/Display.html?id=2084&user=guest&pass=guest |
438 |
-https://rt.openssl.org/Ticket/Display.html?id=3738&user=guest&pass=guest |
439 |
- |
440 |
---- openssl-1.0.2d/crypto/Makefile |
441 |
-+++ openssl-1.0.2d/crypto/Makefile |
442 |
-@@ -85,11 +85,11 @@ |
443 |
- @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi |
444 |
- |
445 |
- subdirs: |
446 |
-- @target=all; $(RECURSIVE_MAKE) |
447 |
-+ +@target=all; $(RECURSIVE_MAKE) |
448 |
- |
449 |
- files: |
450 |
- $(PERL) $(TOP)/util/files.pl "CPUID_OBJ=$(CPUID_OBJ)" Makefile >> $(TOP)/MINFO |
451 |
-- @target=files; $(RECURSIVE_MAKE) |
452 |
-+ +@target=files; $(RECURSIVE_MAKE) |
453 |
- |
454 |
- links: |
455 |
- @$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER) |
456 |
-@@ -100,7 +100,7 @@ |
457 |
- # lib: $(LIB): are splitted to avoid end-less loop |
458 |
- lib: $(LIB) |
459 |
- @touch lib |
460 |
--$(LIB): $(LIBOBJ) |
461 |
-+$(LIB): $(LIBOBJ) | subdirs |
462 |
- $(AR) $(LIB) $(LIBOBJ) |
463 |
- test -z "$(FIPSLIBDIR)" || $(AR) $(LIB) $(FIPSLIBDIR)fipscanister.o |
464 |
- $(RANLIB) $(LIB) || echo Never mind. |
465 |
-@@ -111,7 +111,7 @@ |
466 |
- fi |
467 |
- |
468 |
- libs: |
469 |
-- @target=lib; $(RECURSIVE_MAKE) |
470 |
-+ +@target=lib; $(RECURSIVE_MAKE) |
471 |
- |
472 |
- install: |
473 |
- @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... |
474 |
-@@ -120,7 +120,7 @@ |
475 |
- (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ |
476 |
- chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ |
477 |
- done; |
478 |
-- @target=install; $(RECURSIVE_MAKE) |
479 |
-+ +@target=install; $(RECURSIVE_MAKE) |
480 |
- |
481 |
- lint: |
482 |
- @target=lint; $(RECURSIVE_MAKE) |
483 |
---- openssl-1.0.2d/engines/Makefile |
484 |
-+++ openssl-1.0.2d/engines/Makefile |
485 |
-@@ -72,7 +72,7 @@ |
486 |
- |
487 |
- all: lib subdirs |
488 |
- |
489 |
--lib: $(LIBOBJ) |
490 |
-+lib: $(LIBOBJ) | subdirs |
491 |
- @if [ -n "$(SHARED_LIBS)" ]; then \ |
492 |
- set -e; \ |
493 |
- for l in $(LIBNAMES); do \ |
494 |
-@@ -89,7 +89,7 @@ |
495 |
- |
496 |
- subdirs: |
497 |
- echo $(EDIRS) |
498 |
-- @target=all; $(RECURSIVE_MAKE) |
499 |
-+ +@target=all; $(RECURSIVE_MAKE) |
500 |
- |
501 |
- files: |
502 |
- $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO |
503 |
-@@ -128,7 +128,7 @@ |
504 |
- mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \ |
505 |
- done; \ |
506 |
- fi |
507 |
-- @target=install; $(RECURSIVE_MAKE) |
508 |
-+ +@target=install; $(RECURSIVE_MAKE) |
509 |
- |
510 |
- tags: |
511 |
- ctags $(SRC) |
512 |
---- openssl-1.0.2d/Makefile.org |
513 |
-+++ openssl-1.0.2d/Makefile.org |
514 |
-@@ -274,17 +274,17 @@ |
515 |
- build_libs: build_crypto build_ssl build_engines |
516 |
- |
517 |
- build_crypto: |
518 |
-- @dir=crypto; target=all; $(BUILD_ONE_CMD) |
519 |
-+ +@dir=crypto; target=all; $(BUILD_ONE_CMD) |
520 |
- build_ssl: build_crypto |
521 |
-- @dir=ssl; target=all; $(BUILD_ONE_CMD) |
522 |
-+ +@dir=ssl; target=all; $(BUILD_ONE_CMD) |
523 |
- build_engines: build_crypto |
524 |
-- @dir=engines; target=all; $(BUILD_ONE_CMD) |
525 |
-+ +@dir=engines; target=all; $(BUILD_ONE_CMD) |
526 |
- build_apps: build_libs |
527 |
-- @dir=apps; target=all; $(BUILD_ONE_CMD) |
528 |
-+ +@dir=apps; target=all; $(BUILD_ONE_CMD) |
529 |
- build_tests: build_libs |
530 |
-- @dir=test; target=all; $(BUILD_ONE_CMD) |
531 |
-+ +@dir=test; target=all; $(BUILD_ONE_CMD) |
532 |
- build_tools: build_libs |
533 |
-- @dir=tools; target=all; $(BUILD_ONE_CMD) |
534 |
-+ +@dir=tools; target=all; $(BUILD_ONE_CMD) |
535 |
- |
536 |
- all_testapps: build_libs build_testapps |
537 |
- build_testapps: |
538 |
-@@ -555,7 +555,7 @@ |
539 |
- (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ |
540 |
- chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ |
541 |
- done; |
542 |
-- @set -e; target=install; $(RECURSIVE_BUILD_CMD) |
543 |
-+ +@set -e; target=install; $(RECURSIVE_BUILD_CMD) |
544 |
- @set -e; liblist="$(LIBS)"; for i in $$liblist ;\ |
545 |
- do \ |
546 |
- if [ -f "$$i" ]; then \ |
547 |
---- openssl-1.0.2d/Makefile.shared |
548 |
-+++ openssl-1.0.2d/Makefile.shared |
549 |
-@@ -105,6 +105,7 @@ |
550 |
- SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \ |
551 |
- LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \ |
552 |
- LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \ |
553 |
-+ [ -e $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX ] && exit 0; \ |
554 |
- LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \ |
555 |
- $${SHAREDCMD} $${SHAREDFLAGS} \ |
556 |
- -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \ |
557 |
-@@ -122,6 +123,7 @@ |
558 |
- done; \ |
559 |
- fi; \ |
560 |
- if [ -n "$$SHLIB_SOVER" ]; then \ |
561 |
-+ [ -e "$$SHLIB$$SHLIB_SUFFIX" ] || \ |
562 |
- ( $(SET_X); rm -f $$SHLIB$$SHLIB_SUFFIX; \ |
563 |
- ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \ |
564 |
- fi; \ |
565 |
---- openssl-1.0.2d/test/Makefile |
566 |
-+++ openssl-1.0.2d/test/Makefile |
567 |
-@@ -133,7 +133,7 @@ |
568 |
- tags: |
569 |
- ctags $(SRC) |
570 |
- |
571 |
--tests: exe apps $(TESTS) |
572 |
-+tests: exe $(TESTS) |
573 |
- |
574 |
- apps: |
575 |
- @(cd ..; $(MAKE) DIRS=apps all) |
576 |
-@@ -402,121 +402,121 @@ |
577 |
- link_app.$${shlib_target} |
578 |
- |
579 |
- $(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO) |
580 |
-- @target=$(RSATEST); $(BUILD_CMD) |
581 |
-+ +@target=$(RSATEST); $(BUILD_CMD) |
582 |
- |
583 |
- $(BNTEST)$(EXE_EXT): $(BNTEST).o $(DLIBCRYPTO) |
584 |
-- @target=$(BNTEST); $(BUILD_CMD) |
585 |
-+ +@target=$(BNTEST); $(BUILD_CMD) |
586 |
- |
587 |
- $(ECTEST)$(EXE_EXT): $(ECTEST).o $(DLIBCRYPTO) |
588 |
-- @target=$(ECTEST); $(BUILD_CMD) |
589 |
-+ +@target=$(ECTEST); $(BUILD_CMD) |
590 |
- |
591 |
- $(EXPTEST)$(EXE_EXT): $(EXPTEST).o $(DLIBCRYPTO) |
592 |
-- @target=$(EXPTEST); $(BUILD_CMD) |
593 |
-+ +@target=$(EXPTEST); $(BUILD_CMD) |
594 |
- |
595 |
- $(IDEATEST)$(EXE_EXT): $(IDEATEST).o $(DLIBCRYPTO) |
596 |
-- @target=$(IDEATEST); $(BUILD_CMD) |
597 |
-+ +@target=$(IDEATEST); $(BUILD_CMD) |
598 |
- |
599 |
- $(MD2TEST)$(EXE_EXT): $(MD2TEST).o $(DLIBCRYPTO) |
600 |
-- @target=$(MD2TEST); $(BUILD_CMD) |
601 |
-+ +@target=$(MD2TEST); $(BUILD_CMD) |
602 |
- |
603 |
- $(SHATEST)$(EXE_EXT): $(SHATEST).o $(DLIBCRYPTO) |
604 |
-- @target=$(SHATEST); $(BUILD_CMD) |
605 |
-+ +@target=$(SHATEST); $(BUILD_CMD) |
606 |
- |
607 |
- $(SHA1TEST)$(EXE_EXT): $(SHA1TEST).o $(DLIBCRYPTO) |
608 |
-- @target=$(SHA1TEST); $(BUILD_CMD) |
609 |
-+ +@target=$(SHA1TEST); $(BUILD_CMD) |
610 |
- |
611 |
- $(SHA256TEST)$(EXE_EXT): $(SHA256TEST).o $(DLIBCRYPTO) |
612 |
-- @target=$(SHA256TEST); $(BUILD_CMD) |
613 |
-+ +@target=$(SHA256TEST); $(BUILD_CMD) |
614 |
- |
615 |
- $(SHA512TEST)$(EXE_EXT): $(SHA512TEST).o $(DLIBCRYPTO) |
616 |
-- @target=$(SHA512TEST); $(BUILD_CMD) |
617 |
-+ +@target=$(SHA512TEST); $(BUILD_CMD) |
618 |
- |
619 |
- $(RMDTEST)$(EXE_EXT): $(RMDTEST).o $(DLIBCRYPTO) |
620 |
-- @target=$(RMDTEST); $(BUILD_CMD) |
621 |
-+ +@target=$(RMDTEST); $(BUILD_CMD) |
622 |
- |
623 |
- $(MDC2TEST)$(EXE_EXT): $(MDC2TEST).o $(DLIBCRYPTO) |
624 |
-- @target=$(MDC2TEST); $(BUILD_CMD) |
625 |
-+ +@target=$(MDC2TEST); $(BUILD_CMD) |
626 |
- |
627 |
- $(MD4TEST)$(EXE_EXT): $(MD4TEST).o $(DLIBCRYPTO) |
628 |
-- @target=$(MD4TEST); $(BUILD_CMD) |
629 |
-+ +@target=$(MD4TEST); $(BUILD_CMD) |
630 |
- |
631 |
- $(MD5TEST)$(EXE_EXT): $(MD5TEST).o $(DLIBCRYPTO) |
632 |
-- @target=$(MD5TEST); $(BUILD_CMD) |
633 |
-+ +@target=$(MD5TEST); $(BUILD_CMD) |
634 |
- |
635 |
- $(HMACTEST)$(EXE_EXT): $(HMACTEST).o $(DLIBCRYPTO) |
636 |
-- @target=$(HMACTEST); $(BUILD_CMD) |
637 |
-+ +@target=$(HMACTEST); $(BUILD_CMD) |
638 |
- |
639 |
- $(WPTEST)$(EXE_EXT): $(WPTEST).o $(DLIBCRYPTO) |
640 |
-- @target=$(WPTEST); $(BUILD_CMD) |
641 |
-+ +@target=$(WPTEST); $(BUILD_CMD) |
642 |
- |
643 |
- $(RC2TEST)$(EXE_EXT): $(RC2TEST).o $(DLIBCRYPTO) |
644 |
-- @target=$(RC2TEST); $(BUILD_CMD) |
645 |
-+ +@target=$(RC2TEST); $(BUILD_CMD) |
646 |
- |
647 |
- $(BFTEST)$(EXE_EXT): $(BFTEST).o $(DLIBCRYPTO) |
648 |
-- @target=$(BFTEST); $(BUILD_CMD) |
649 |
-+ +@target=$(BFTEST); $(BUILD_CMD) |
650 |
- |
651 |
- $(CASTTEST)$(EXE_EXT): $(CASTTEST).o $(DLIBCRYPTO) |
652 |
-- @target=$(CASTTEST); $(BUILD_CMD) |
653 |
-+ +@target=$(CASTTEST); $(BUILD_CMD) |
654 |
- |
655 |
- $(RC4TEST)$(EXE_EXT): $(RC4TEST).o $(DLIBCRYPTO) |
656 |
-- @target=$(RC4TEST); $(BUILD_CMD) |
657 |
-+ +@target=$(RC4TEST); $(BUILD_CMD) |
658 |
- |
659 |
- $(RC5TEST)$(EXE_EXT): $(RC5TEST).o $(DLIBCRYPTO) |
660 |
-- @target=$(RC5TEST); $(BUILD_CMD) |
661 |
-+ +@target=$(RC5TEST); $(BUILD_CMD) |
662 |
- |
663 |
- $(DESTEST)$(EXE_EXT): $(DESTEST).o $(DLIBCRYPTO) |
664 |
-- @target=$(DESTEST); $(BUILD_CMD) |
665 |
-+ +@target=$(DESTEST); $(BUILD_CMD) |
666 |
- |
667 |
- $(RANDTEST)$(EXE_EXT): $(RANDTEST).o $(DLIBCRYPTO) |
668 |
-- @target=$(RANDTEST); $(BUILD_CMD) |
669 |
-+ +@target=$(RANDTEST); $(BUILD_CMD) |
670 |
- |
671 |
- $(DHTEST)$(EXE_EXT): $(DHTEST).o $(DLIBCRYPTO) |
672 |
-- @target=$(DHTEST); $(BUILD_CMD) |
673 |
-+ +@target=$(DHTEST); $(BUILD_CMD) |
674 |
- |
675 |
- $(DSATEST)$(EXE_EXT): $(DSATEST).o $(DLIBCRYPTO) |
676 |
-- @target=$(DSATEST); $(BUILD_CMD) |
677 |
-+ +@target=$(DSATEST); $(BUILD_CMD) |
678 |
- |
679 |
- $(METHTEST)$(EXE_EXT): $(METHTEST).o $(DLIBCRYPTO) |
680 |
-- @target=$(METHTEST); $(BUILD_CMD) |
681 |
-+ +@target=$(METHTEST); $(BUILD_CMD) |
682 |
- |
683 |
- $(SSLTEST)$(EXE_EXT): $(SSLTEST).o $(DLIBSSL) $(DLIBCRYPTO) |
684 |
-- @target=$(SSLTEST); $(FIPS_BUILD_CMD) |
685 |
-+ +@target=$(SSLTEST); $(FIPS_BUILD_CMD) |
686 |
- |
687 |
- $(ENGINETEST)$(EXE_EXT): $(ENGINETEST).o $(DLIBCRYPTO) |
688 |
-- @target=$(ENGINETEST); $(BUILD_CMD) |
689 |
-+ +@target=$(ENGINETEST); $(BUILD_CMD) |
690 |
- |
691 |
- $(EVPTEST)$(EXE_EXT): $(EVPTEST).o $(DLIBCRYPTO) |
692 |
-- @target=$(EVPTEST); $(BUILD_CMD) |
693 |
-+ +@target=$(EVPTEST); $(BUILD_CMD) |
694 |
- |
695 |
- $(EVPEXTRATEST)$(EXE_EXT): $(EVPEXTRATEST).o $(DLIBCRYPTO) |
696 |
-- @target=$(EVPEXTRATEST); $(BUILD_CMD) |
697 |
-+ +@target=$(EVPEXTRATEST); $(BUILD_CMD) |
698 |
- |
699 |
- $(ECDSATEST)$(EXE_EXT): $(ECDSATEST).o $(DLIBCRYPTO) |
700 |
-- @target=$(ECDSATEST); $(BUILD_CMD) |
701 |
-+ +@target=$(ECDSATEST); $(BUILD_CMD) |
702 |
- |
703 |
- $(ECDHTEST)$(EXE_EXT): $(ECDHTEST).o $(DLIBCRYPTO) |
704 |
-- @target=$(ECDHTEST); $(BUILD_CMD) |
705 |
-+ +@target=$(ECDHTEST); $(BUILD_CMD) |
706 |
- |
707 |
- $(IGETEST)$(EXE_EXT): $(IGETEST).o $(DLIBCRYPTO) |
708 |
-- @target=$(IGETEST); $(BUILD_CMD) |
709 |
-+ +@target=$(IGETEST); $(BUILD_CMD) |
710 |
- |
711 |
- $(JPAKETEST)$(EXE_EXT): $(JPAKETEST).o $(DLIBCRYPTO) |
712 |
-- @target=$(JPAKETEST); $(BUILD_CMD) |
713 |
-+ +@target=$(JPAKETEST); $(BUILD_CMD) |
714 |
- |
715 |
- $(ASN1TEST)$(EXE_EXT): $(ASN1TEST).o $(DLIBCRYPTO) |
716 |
-- @target=$(ASN1TEST); $(BUILD_CMD) |
717 |
-+ +@target=$(ASN1TEST); $(BUILD_CMD) |
718 |
- |
719 |
- $(SRPTEST)$(EXE_EXT): $(SRPTEST).o $(DLIBCRYPTO) |
720 |
-- @target=$(SRPTEST); $(BUILD_CMD) |
721 |
-+ +@target=$(SRPTEST); $(BUILD_CMD) |
722 |
- |
723 |
- $(V3NAMETEST)$(EXE_EXT): $(V3NAMETEST).o $(DLIBCRYPTO) |
724 |
-- @target=$(V3NAMETEST); $(BUILD_CMD) |
725 |
-+ +@target=$(V3NAMETEST); $(BUILD_CMD) |
726 |
- |
727 |
- $(HEARTBEATTEST)$(EXE_EXT): $(HEARTBEATTEST).o $(DLIBCRYPTO) |
728 |
-- @target=$(HEARTBEATTEST); $(BUILD_CMD_STATIC) |
729 |
-+ +@target=$(HEARTBEATTEST); $(BUILD_CMD_STATIC) |
730 |
- |
731 |
- $(CONSTTIMETEST)$(EXE_EXT): $(CONSTTIMETEST).o |
732 |
-- @target=$(CONSTTIMETEST) $(BUILD_CMD) |
733 |
-+ +@target=$(CONSTTIMETEST) $(BUILD_CMD) |
734 |
- |
735 |
- #$(AESTEST).o: $(AESTEST).c |
736 |
- # $(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c |
737 |
-@@ -529,7 +529,7 @@ |
738 |
- # fi |
739 |
- |
740 |
- dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO) |
741 |
-- @target=dummytest; $(BUILD_CMD) |
742 |
-+ +@target=dummytest; $(BUILD_CMD) |
743 |
- |
744 |
- # DO NOT DELETE THIS LINE -- make depend depends on it. |
745 |
- |
746 |
|
747 |
diff --git a/dev-libs/openssl/openssl-1.0.2a.ebuild b/dev-libs/openssl/openssl-1.0.2a.ebuild |
748 |
deleted file mode 100644 |
749 |
index 6c22a2e..0000000 |
750 |
--- a/dev-libs/openssl/openssl-1.0.2a.ebuild |
751 |
+++ /dev/null |
752 |
@@ -1,266 +0,0 @@ |
753 |
-# Copyright 1999-2015 Gentoo Foundation |
754 |
-# Distributed under the terms of the GNU General Public License v2 |
755 |
-# $Id$ |
756 |
- |
757 |
-EAPI="4" |
758 |
- |
759 |
-inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal |
760 |
- |
761 |
-REV="1.7" |
762 |
-MY_P=${P/_/-} |
763 |
-DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)" |
764 |
-HOMEPAGE="http://www.openssl.org/" |
765 |
-SRC_URI="mirror://openssl/source/${MY_P}.tar.gz |
766 |
- http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/${PN}/${PN}-c_rehash.sh?rev=${REV} -> ${PN}-c_rehash.sh.${REV}" |
767 |
- |
768 |
-LICENSE="openssl" |
769 |
-SLOT="0" |
770 |
-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" |
771 |
-IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 static-libs test +tls-heartbeat vanilla zlib" |
772 |
-RESTRICT="!bindist? ( bindist )" |
773 |
- |
774 |
-# The blocks are temporary just to make sure people upgrade to a |
775 |
-# version that lack runtime version checking. We'll drop them in |
776 |
-# the future. |
777 |
-RDEPEND="gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] ) |
778 |
- zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] ) |
779 |
- kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] ) |
780 |
- abi_x86_32? ( |
781 |
- !<=app-emulation/emul-linux-x86-baselibs-20140508 |
782 |
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] |
783 |
- ) |
784 |
- !<net-misc/openssh-5.9_p1-r4 |
785 |
- !<net-libs/neon-0.29.6-r1" |
786 |
-DEPEND="${RDEPEND} |
787 |
- sys-apps/diffutils |
788 |
- >=dev-lang/perl-5 |
789 |
- sctp? ( >=net-misc/lksctp-tools-1.0.12 ) |
790 |
- test? ( sys-devel/bc )" |
791 |
-PDEPEND="app-misc/ca-certificates" |
792 |
- |
793 |
-S="${WORKDIR}/${MY_P}" |
794 |
- |
795 |
-MULTILIB_WRAPPED_HEADERS=( |
796 |
- usr/include/openssl/opensslconf.h |
797 |
-) |
798 |
- |
799 |
-src_prepare() { |
800 |
- SSL_CNF_DIR="/etc/ssl" |
801 |
- sed \ |
802 |
- -e "/^DIR=/s:=.*:=${EPREFIX}${SSL_CNF_DIR}:" \ |
803 |
- -e "s:SSL_CMD=/usr:SSL_CMD=${EPREFIX}/usr:" \ |
804 |
- "${DISTDIR}"/${PN}-c_rehash.sh.${REV} \ |
805 |
- > "${WORKDIR}"/c_rehash || die #416717 |
806 |
- |
807 |
- # Make sure we only ever touch Makefile.org and avoid patching a file |
808 |
- # that gets blown away anyways by the Configure script in src_configure |
809 |
- rm -f Makefile |
810 |
- |
811 |
- if ! use vanilla ; then |
812 |
- epatch "${FILESDIR}"/${PN}-1.0.0a-ldflags.patch #327421 |
813 |
- epatch "${FILESDIR}"/${PN}-1.0.0d-windres.patch #373743 |
814 |
- epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-build.patch |
815 |
- epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-obj-headers.patch |
816 |
- epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-install-dirs.patch |
817 |
- epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-symlinking.patch #545028 |
818 |
- epatch "${FILESDIR}"/${PN}-1.0.2-ipv6.patch |
819 |
- epatch "${FILESDIR}"/${PN}-1.0.2-s_client-verify.patch #472584 |
820 |
- epatch "${FILESDIR}"/${P}-malloc-typo.patch #543828 |
821 |
- epatch "${FILESDIR}"/${PN}-1.0.2a-x32-asm.patch #542618 |
822 |
- |
823 |
- epatch_user #332661 |
824 |
- fi |
825 |
- |
826 |
- # disable fips in the build |
827 |
- # make sure the man pages are suffixed #302165 |
828 |
- # don't bother building man pages if they're disabled |
829 |
- sed -i \ |
830 |
- -e '/DIRS/s: fips : :g' \ |
831 |
- -e '/^MANSUFFIX/s:=.*:=ssl:' \ |
832 |
- -e '/^MAKEDEPPROG/s:=.*:=$(CC):' \ |
833 |
- -e $(has noman FEATURES \ |
834 |
- && echo '/^install:/s:install_docs::' \ |
835 |
- || echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \ |
836 |
- Makefile.org \ |
837 |
- || die |
838 |
- # show the actual commands in the log |
839 |
- sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared |
840 |
- |
841 |
- # since we're forcing $(CC) as makedep anyway, just fix |
842 |
- # the conditional as always-on |
843 |
- # helps clang (#417795), and versioned gcc (#499818) |
844 |
- sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || die |
845 |
- |
846 |
- # quiet out unknown driver argument warnings since openssl |
847 |
- # doesn't have well-split CFLAGS and we're making it even worse |
848 |
- # and 'make depend' uses -Werror for added fun (#417795 again) |
849 |
- [[ ${CC} == *clang* ]] && append-flags -Qunused-arguments |
850 |
- |
851 |
- # allow openssl to be cross-compiled |
852 |
- cp "${FILESDIR}"/gentoo.config-1.0.1 gentoo.config || die |
853 |
- chmod a+rx gentoo.config |
854 |
- |
855 |
- append-flags -fno-strict-aliasing |
856 |
- append-flags $(test-flags-CC -Wa,--noexecstack) |
857 |
- append-cppflags -DOPENSSL_NO_BUF_FREELISTS |
858 |
- |
859 |
- sed -i '1s,^:$,#!'${EPREFIX}'/usr/bin/perl,' Configure #141906 |
860 |
- # The config script does stupid stuff to prompt the user. Kill it. |
861 |
- sed -i '/stty -icanon min 0 time 50; read waste/d' config || die |
862 |
- ./config --test-sanity || die "I AM NOT SANE" |
863 |
- |
864 |
- multilib_copy_sources |
865 |
-} |
866 |
- |
867 |
-multilib_src_configure() { |
868 |
- unset APPS #197996 |
869 |
- unset SCRIPTS #312551 |
870 |
- unset CROSS_COMPILE #311473 |
871 |
- |
872 |
- tc-export CC AR RANLIB RC |
873 |
- |
874 |
- # Clean out patent-or-otherwise-encumbered code |
875 |
- # Camellia: Royalty Free http://en.wikipedia.org/wiki/Camellia_(cipher) |
876 |
- # IDEA: Expired http://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm |
877 |
- # EC: ????????? ??/??/2015 http://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography |
878 |
- # MDC2: Expired http://en.wikipedia.org/wiki/MDC-2 |
879 |
- # RC5: Expired http://en.wikipedia.org/wiki/RC5 |
880 |
- |
881 |
- use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; } |
882 |
- echoit() { echo "$@" ; "$@" ; } |
883 |
- |
884 |
- local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal") |
885 |
- |
886 |
- # See if our toolchain supports __uint128_t. If so, it's 64bit |
887 |
- # friendly and can use the nicely optimized code paths. #460790 |
888 |
- local ec_nistp_64_gcc_128 |
889 |
- # Disable it for now though #469976 |
890 |
- #if ! use bindist ; then |
891 |
- # echo "__uint128_t i;" > "${T}"/128.c |
892 |
- # if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then |
893 |
- # ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128" |
894 |
- # fi |
895 |
- #fi |
896 |
- |
897 |
- local sslout=$(./gentoo.config) |
898 |
- einfo "Use configuration ${sslout:-(openssl knows best)}" |
899 |
- local config="Configure" |
900 |
- [[ -z ${sslout} ]] && config="config" |
901 |
- |
902 |
- echoit \ |
903 |
- ./${config} \ |
904 |
- ${sslout} \ |
905 |
- $(use cpu_flags_x86_sse2 || echo "no-sse2") \ |
906 |
- enable-camellia \ |
907 |
- $(use_ssl !bindist ec) \ |
908 |
- ${ec_nistp_64_gcc_128} \ |
909 |
- enable-idea \ |
910 |
- enable-mdc2 \ |
911 |
- enable-rc5 \ |
912 |
- enable-tlsext \ |
913 |
- $(use_ssl asm) \ |
914 |
- $(use_ssl gmp gmp -lgmp) \ |
915 |
- $(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \ |
916 |
- $(use_ssl rfc3779) \ |
917 |
- $(use_ssl sctp) \ |
918 |
- $(use_ssl tls-heartbeat heartbeats) \ |
919 |
- $(use_ssl zlib) \ |
920 |
- --prefix="${EPREFIX}"/usr \ |
921 |
- --openssldir="${EPREFIX}"${SSL_CNF_DIR} \ |
922 |
- --libdir=$(get_libdir) \ |
923 |
- shared threads \ |
924 |
- || die |
925 |
- |
926 |
- # Clean out hardcoded flags that openssl uses |
927 |
- local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \ |
928 |
- -e 's:^CFLAG=::' \ |
929 |
- -e 's:-fomit-frame-pointer ::g' \ |
930 |
- -e 's:-O[0-9] ::g' \ |
931 |
- -e 's:-march=[-a-z0-9]* ::g' \ |
932 |
- -e 's:-mcpu=[-a-z0-9]* ::g' \ |
933 |
- -e 's:-m[a-z0-9]* ::g' \ |
934 |
- ) |
935 |
- sed -i \ |
936 |
- -e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \ |
937 |
- -e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \ |
938 |
- Makefile || die |
939 |
-} |
940 |
- |
941 |
-multilib_src_compile() { |
942 |
- # depend is needed to use $confopts; it also doesn't matter |
943 |
- # that it's -j1 as the code itself serializes subdirs |
944 |
- emake -j1 depend |
945 |
- emake all |
946 |
- # rehash is needed to prep the certs/ dir; do this |
947 |
- # separately to avoid parallel build issues. |
948 |
- emake rehash |
949 |
-} |
950 |
- |
951 |
-multilib_src_test() { |
952 |
- emake -j1 test |
953 |
-} |
954 |
- |
955 |
-multilib_src_install() { |
956 |
- emake INSTALL_PREFIX="${D}" install |
957 |
-} |
958 |
- |
959 |
-multilib_src_install_all() { |
960 |
- dobin "${WORKDIR}"/c_rehash #333117 |
961 |
- dodoc CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el |
962 |
- dohtml -r doc/* |
963 |
- use rfc3779 && dodoc engines/ccgost/README.gost |
964 |
- |
965 |
- # This is crappy in that the static archives are still built even |
966 |
- # when USE=static-libs. But this is due to a failing in the openssl |
967 |
- # build system: the static archives are built as PIC all the time. |
968 |
- # Only way around this would be to manually configure+compile openssl |
969 |
- # twice; once with shared lib support enabled and once without. |
970 |
- use static-libs || rm -f "${ED}"/usr/lib*/lib*.a |
971 |
- |
972 |
- # create the certs directory |
973 |
- dodir ${SSL_CNF_DIR}/certs |
974 |
- cp -RP certs/* "${ED}"${SSL_CNF_DIR}/certs/ || die |
975 |
- rm -r "${ED}"${SSL_CNF_DIR}/certs/{demo,expired} |
976 |
- |
977 |
- # Namespace openssl programs to prevent conflicts with other man pages |
978 |
- cd "${ED}"/usr/share/man |
979 |
- local m d s |
980 |
- for m in $(find . -type f | xargs grep -L '#include') ; do |
981 |
- d=${m%/*} ; d=${d#./} ; m=${m##*/} |
982 |
- [[ ${m} == openssl.1* ]] && continue |
983 |
- [[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!" |
984 |
- mv ${d}/{,ssl-}${m} |
985 |
- # fix up references to renamed man pages |
986 |
- sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m} |
987 |
- ln -s ssl-${m} ${d}/openssl-${m} |
988 |
- # locate any symlinks that point to this man page ... we assume |
989 |
- # that any broken links are due to the above renaming |
990 |
- for s in $(find -L ${d} -type l) ; do |
991 |
- s=${s##*/} |
992 |
- rm -f ${d}/${s} |
993 |
- ln -s ssl-${m} ${d}/ssl-${s} |
994 |
- ln -s ssl-${s} ${d}/openssl-${s} |
995 |
- done |
996 |
- done |
997 |
- [[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :(" |
998 |
- |
999 |
- dodir /etc/sandbox.d #254521 |
1000 |
- echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl |
1001 |
- |
1002 |
- diropts -m0700 |
1003 |
- keepdir ${SSL_CNF_DIR}/private |
1004 |
-} |
1005 |
- |
1006 |
-pkg_preinst() { |
1007 |
- has_version ${CATEGORY}/${PN}:0.9.8 && return 0 |
1008 |
- preserve_old_lib /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8 |
1009 |
-} |
1010 |
- |
1011 |
-pkg_postinst() { |
1012 |
- ebegin "Running 'c_rehash ${EROOT%/}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069" |
1013 |
- c_rehash "${EROOT%/}${SSL_CNF_DIR}/certs" >/dev/null |
1014 |
- eend $? |
1015 |
- |
1016 |
- has_version ${CATEGORY}/${PN}:0.9.8 && return 0 |
1017 |
- preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8 |
1018 |
-} |
1019 |
|
1020 |
diff --git a/dev-libs/openssl/openssl-1.0.2b.ebuild b/dev-libs/openssl/openssl-1.0.2b.ebuild |
1021 |
deleted file mode 100644 |
1022 |
index 3ede9dd..0000000 |
1023 |
--- a/dev-libs/openssl/openssl-1.0.2b.ebuild |
1024 |
+++ /dev/null |
1025 |
@@ -1,264 +0,0 @@ |
1026 |
-# Copyright 1999-2015 Gentoo Foundation |
1027 |
-# Distributed under the terms of the GNU General Public License v2 |
1028 |
-# $Id$ |
1029 |
- |
1030 |
-EAPI="4" |
1031 |
- |
1032 |
-inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal |
1033 |
- |
1034 |
-REV="1.7" |
1035 |
-MY_P=${P/_/-} |
1036 |
-DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)" |
1037 |
-HOMEPAGE="http://www.openssl.org/" |
1038 |
-SRC_URI="mirror://openssl/source/${MY_P}.tar.gz |
1039 |
- http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/${PN}/${PN}-c_rehash.sh?rev=${REV} -> ${PN}-c_rehash.sh.${REV}" |
1040 |
- |
1041 |
-LICENSE="openssl" |
1042 |
-SLOT="0" |
1043 |
-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" |
1044 |
-IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 static-libs test +tls-heartbeat vanilla zlib" |
1045 |
-RESTRICT="!bindist? ( bindist )" |
1046 |
- |
1047 |
-# The blocks are temporary just to make sure people upgrade to a |
1048 |
-# version that lack runtime version checking. We'll drop them in |
1049 |
-# the future. |
1050 |
-RDEPEND="gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] ) |
1051 |
- zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] ) |
1052 |
- kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] ) |
1053 |
- abi_x86_32? ( |
1054 |
- !<=app-emulation/emul-linux-x86-baselibs-20140508 |
1055 |
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] |
1056 |
- ) |
1057 |
- !<net-misc/openssh-5.9_p1-r4 |
1058 |
- !<net-libs/neon-0.29.6-r1" |
1059 |
-DEPEND="${RDEPEND} |
1060 |
- sys-apps/diffutils |
1061 |
- >=dev-lang/perl-5 |
1062 |
- sctp? ( >=net-misc/lksctp-tools-1.0.12 ) |
1063 |
- test? ( sys-devel/bc )" |
1064 |
-PDEPEND="app-misc/ca-certificates" |
1065 |
- |
1066 |
-S="${WORKDIR}/${MY_P}" |
1067 |
- |
1068 |
-MULTILIB_WRAPPED_HEADERS=( |
1069 |
- usr/include/openssl/opensslconf.h |
1070 |
-) |
1071 |
- |
1072 |
-src_prepare() { |
1073 |
- SSL_CNF_DIR="/etc/ssl" |
1074 |
- sed \ |
1075 |
- -e "/^DIR=/s:=.*:=${EPREFIX}${SSL_CNF_DIR}:" \ |
1076 |
- -e "s:SSL_CMD=/usr:SSL_CMD=${EPREFIX}/usr:" \ |
1077 |
- "${DISTDIR}"/${PN}-c_rehash.sh.${REV} \ |
1078 |
- > "${WORKDIR}"/c_rehash || die #416717 |
1079 |
- |
1080 |
- # Make sure we only ever touch Makefile.org and avoid patching a file |
1081 |
- # that gets blown away anyways by the Configure script in src_configure |
1082 |
- rm -f Makefile |
1083 |
- |
1084 |
- if ! use vanilla ; then |
1085 |
- epatch "${FILESDIR}"/${PN}-1.0.0a-ldflags.patch #327421 |
1086 |
- epatch "${FILESDIR}"/${PN}-1.0.0d-windres.patch #373743 |
1087 |
- epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-build.patch |
1088 |
- epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-obj-headers.patch |
1089 |
- epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-install-dirs.patch |
1090 |
- epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-symlinking.patch #545028 |
1091 |
- epatch "${FILESDIR}"/${PN}-1.0.2-ipv6.patch |
1092 |
- epatch "${FILESDIR}"/${PN}-1.0.2a-x32-asm.patch #542618 |
1093 |
- |
1094 |
- epatch_user #332661 |
1095 |
- fi |
1096 |
- |
1097 |
- # disable fips in the build |
1098 |
- # make sure the man pages are suffixed #302165 |
1099 |
- # don't bother building man pages if they're disabled |
1100 |
- sed -i \ |
1101 |
- -e '/DIRS/s: fips : :g' \ |
1102 |
- -e '/^MANSUFFIX/s:=.*:=ssl:' \ |
1103 |
- -e '/^MAKEDEPPROG/s:=.*:=$(CC):' \ |
1104 |
- -e $(has noman FEATURES \ |
1105 |
- && echo '/^install:/s:install_docs::' \ |
1106 |
- || echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \ |
1107 |
- Makefile.org \ |
1108 |
- || die |
1109 |
- # show the actual commands in the log |
1110 |
- sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared |
1111 |
- |
1112 |
- # since we're forcing $(CC) as makedep anyway, just fix |
1113 |
- # the conditional as always-on |
1114 |
- # helps clang (#417795), and versioned gcc (#499818) |
1115 |
- sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || die |
1116 |
- |
1117 |
- # quiet out unknown driver argument warnings since openssl |
1118 |
- # doesn't have well-split CFLAGS and we're making it even worse |
1119 |
- # and 'make depend' uses -Werror for added fun (#417795 again) |
1120 |
- [[ ${CC} == *clang* ]] && append-flags -Qunused-arguments |
1121 |
- |
1122 |
- # allow openssl to be cross-compiled |
1123 |
- cp "${FILESDIR}"/gentoo.config-1.0.1 gentoo.config || die |
1124 |
- chmod a+rx gentoo.config |
1125 |
- |
1126 |
- append-flags -fno-strict-aliasing |
1127 |
- append-flags $(test-flags-CC -Wa,--noexecstack) |
1128 |
- append-cppflags -DOPENSSL_NO_BUF_FREELISTS |
1129 |
- |
1130 |
- sed -i '1s,^:$,#!'${EPREFIX}'/usr/bin/perl,' Configure #141906 |
1131 |
- # The config script does stupid stuff to prompt the user. Kill it. |
1132 |
- sed -i '/stty -icanon min 0 time 50; read waste/d' config || die |
1133 |
- ./config --test-sanity || die "I AM NOT SANE" |
1134 |
- |
1135 |
- multilib_copy_sources |
1136 |
-} |
1137 |
- |
1138 |
-multilib_src_configure() { |
1139 |
- unset APPS #197996 |
1140 |
- unset SCRIPTS #312551 |
1141 |
- unset CROSS_COMPILE #311473 |
1142 |
- |
1143 |
- tc-export CC AR RANLIB RC |
1144 |
- |
1145 |
- # Clean out patent-or-otherwise-encumbered code |
1146 |
- # Camellia: Royalty Free http://en.wikipedia.org/wiki/Camellia_(cipher) |
1147 |
- # IDEA: Expired http://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm |
1148 |
- # EC: ????????? ??/??/2015 http://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography |
1149 |
- # MDC2: Expired http://en.wikipedia.org/wiki/MDC-2 |
1150 |
- # RC5: Expired http://en.wikipedia.org/wiki/RC5 |
1151 |
- |
1152 |
- use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; } |
1153 |
- echoit() { echo "$@" ; "$@" ; } |
1154 |
- |
1155 |
- local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal") |
1156 |
- |
1157 |
- # See if our toolchain supports __uint128_t. If so, it's 64bit |
1158 |
- # friendly and can use the nicely optimized code paths. #460790 |
1159 |
- local ec_nistp_64_gcc_128 |
1160 |
- # Disable it for now though #469976 |
1161 |
- #if ! use bindist ; then |
1162 |
- # echo "__uint128_t i;" > "${T}"/128.c |
1163 |
- # if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then |
1164 |
- # ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128" |
1165 |
- # fi |
1166 |
- #fi |
1167 |
- |
1168 |
- local sslout=$(./gentoo.config) |
1169 |
- einfo "Use configuration ${sslout:-(openssl knows best)}" |
1170 |
- local config="Configure" |
1171 |
- [[ -z ${sslout} ]] && config="config" |
1172 |
- |
1173 |
- echoit \ |
1174 |
- ./${config} \ |
1175 |
- ${sslout} \ |
1176 |
- $(use cpu_flags_x86_sse2 || echo "no-sse2") \ |
1177 |
- enable-camellia \ |
1178 |
- $(use_ssl !bindist ec) \ |
1179 |
- ${ec_nistp_64_gcc_128} \ |
1180 |
- enable-idea \ |
1181 |
- enable-mdc2 \ |
1182 |
- enable-rc5 \ |
1183 |
- enable-tlsext \ |
1184 |
- $(use_ssl asm) \ |
1185 |
- $(use_ssl gmp gmp -lgmp) \ |
1186 |
- $(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \ |
1187 |
- $(use_ssl rfc3779) \ |
1188 |
- $(use_ssl sctp) \ |
1189 |
- $(use_ssl tls-heartbeat heartbeats) \ |
1190 |
- $(use_ssl zlib) \ |
1191 |
- --prefix="${EPREFIX}"/usr \ |
1192 |
- --openssldir="${EPREFIX}"${SSL_CNF_DIR} \ |
1193 |
- --libdir=$(get_libdir) \ |
1194 |
- shared threads \ |
1195 |
- || die |
1196 |
- |
1197 |
- # Clean out hardcoded flags that openssl uses |
1198 |
- local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \ |
1199 |
- -e 's:^CFLAG=::' \ |
1200 |
- -e 's:-fomit-frame-pointer ::g' \ |
1201 |
- -e 's:-O[0-9] ::g' \ |
1202 |
- -e 's:-march=[-a-z0-9]* ::g' \ |
1203 |
- -e 's:-mcpu=[-a-z0-9]* ::g' \ |
1204 |
- -e 's:-m[a-z0-9]* ::g' \ |
1205 |
- ) |
1206 |
- sed -i \ |
1207 |
- -e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \ |
1208 |
- -e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \ |
1209 |
- Makefile || die |
1210 |
-} |
1211 |
- |
1212 |
-multilib_src_compile() { |
1213 |
- # depend is needed to use $confopts; it also doesn't matter |
1214 |
- # that it's -j1 as the code itself serializes subdirs |
1215 |
- emake -j1 depend |
1216 |
- emake all |
1217 |
- # rehash is needed to prep the certs/ dir; do this |
1218 |
- # separately to avoid parallel build issues. |
1219 |
- emake rehash |
1220 |
-} |
1221 |
- |
1222 |
-multilib_src_test() { |
1223 |
- emake -j1 test |
1224 |
-} |
1225 |
- |
1226 |
-multilib_src_install() { |
1227 |
- emake INSTALL_PREFIX="${D}" install |
1228 |
-} |
1229 |
- |
1230 |
-multilib_src_install_all() { |
1231 |
- dobin "${WORKDIR}"/c_rehash #333117 |
1232 |
- dodoc CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el |
1233 |
- dohtml -r doc/* |
1234 |
- use rfc3779 && dodoc engines/ccgost/README.gost |
1235 |
- |
1236 |
- # This is crappy in that the static archives are still built even |
1237 |
- # when USE=static-libs. But this is due to a failing in the openssl |
1238 |
- # build system: the static archives are built as PIC all the time. |
1239 |
- # Only way around this would be to manually configure+compile openssl |
1240 |
- # twice; once with shared lib support enabled and once without. |
1241 |
- use static-libs || rm -f "${ED}"/usr/lib*/lib*.a |
1242 |
- |
1243 |
- # create the certs directory |
1244 |
- dodir ${SSL_CNF_DIR}/certs |
1245 |
- cp -RP certs/* "${ED}"${SSL_CNF_DIR}/certs/ || die |
1246 |
- rm -r "${ED}"${SSL_CNF_DIR}/certs/{demo,expired} |
1247 |
- |
1248 |
- # Namespace openssl programs to prevent conflicts with other man pages |
1249 |
- cd "${ED}"/usr/share/man |
1250 |
- local m d s |
1251 |
- for m in $(find . -type f | xargs grep -L '#include') ; do |
1252 |
- d=${m%/*} ; d=${d#./} ; m=${m##*/} |
1253 |
- [[ ${m} == openssl.1* ]] && continue |
1254 |
- [[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!" |
1255 |
- mv ${d}/{,ssl-}${m} |
1256 |
- # fix up references to renamed man pages |
1257 |
- sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m} |
1258 |
- ln -s ssl-${m} ${d}/openssl-${m} |
1259 |
- # locate any symlinks that point to this man page ... we assume |
1260 |
- # that any broken links are due to the above renaming |
1261 |
- for s in $(find -L ${d} -type l) ; do |
1262 |
- s=${s##*/} |
1263 |
- rm -f ${d}/${s} |
1264 |
- ln -s ssl-${m} ${d}/ssl-${s} |
1265 |
- ln -s ssl-${s} ${d}/openssl-${s} |
1266 |
- done |
1267 |
- done |
1268 |
- [[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :(" |
1269 |
- |
1270 |
- dodir /etc/sandbox.d #254521 |
1271 |
- echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl |
1272 |
- |
1273 |
- diropts -m0700 |
1274 |
- keepdir ${SSL_CNF_DIR}/private |
1275 |
-} |
1276 |
- |
1277 |
-pkg_preinst() { |
1278 |
- has_version ${CATEGORY}/${PN}:0.9.8 && return 0 |
1279 |
- preserve_old_lib /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8 |
1280 |
-} |
1281 |
- |
1282 |
-pkg_postinst() { |
1283 |
- ebegin "Running 'c_rehash ${EROOT%/}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069" |
1284 |
- c_rehash "${EROOT%/}${SSL_CNF_DIR}/certs" >/dev/null |
1285 |
- eend $? |
1286 |
- |
1287 |
- has_version ${CATEGORY}/${PN}:0.9.8 && return 0 |
1288 |
- preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8 |
1289 |
-} |
1290 |
|
1291 |
diff --git a/dev-libs/openssl/openssl-1.0.2c.ebuild b/dev-libs/openssl/openssl-1.0.2c.ebuild |
1292 |
deleted file mode 100644 |
1293 |
index 3ede9dd..0000000 |
1294 |
--- a/dev-libs/openssl/openssl-1.0.2c.ebuild |
1295 |
+++ /dev/null |
1296 |
@@ -1,264 +0,0 @@ |
1297 |
-# Copyright 1999-2015 Gentoo Foundation |
1298 |
-# Distributed under the terms of the GNU General Public License v2 |
1299 |
-# $Id$ |
1300 |
- |
1301 |
-EAPI="4" |
1302 |
- |
1303 |
-inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal |
1304 |
- |
1305 |
-REV="1.7" |
1306 |
-MY_P=${P/_/-} |
1307 |
-DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)" |
1308 |
-HOMEPAGE="http://www.openssl.org/" |
1309 |
-SRC_URI="mirror://openssl/source/${MY_P}.tar.gz |
1310 |
- http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/${PN}/${PN}-c_rehash.sh?rev=${REV} -> ${PN}-c_rehash.sh.${REV}" |
1311 |
- |
1312 |
-LICENSE="openssl" |
1313 |
-SLOT="0" |
1314 |
-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" |
1315 |
-IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 static-libs test +tls-heartbeat vanilla zlib" |
1316 |
-RESTRICT="!bindist? ( bindist )" |
1317 |
- |
1318 |
-# The blocks are temporary just to make sure people upgrade to a |
1319 |
-# version that lack runtime version checking. We'll drop them in |
1320 |
-# the future. |
1321 |
-RDEPEND="gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] ) |
1322 |
- zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] ) |
1323 |
- kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] ) |
1324 |
- abi_x86_32? ( |
1325 |
- !<=app-emulation/emul-linux-x86-baselibs-20140508 |
1326 |
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] |
1327 |
- ) |
1328 |
- !<net-misc/openssh-5.9_p1-r4 |
1329 |
- !<net-libs/neon-0.29.6-r1" |
1330 |
-DEPEND="${RDEPEND} |
1331 |
- sys-apps/diffutils |
1332 |
- >=dev-lang/perl-5 |
1333 |
- sctp? ( >=net-misc/lksctp-tools-1.0.12 ) |
1334 |
- test? ( sys-devel/bc )" |
1335 |
-PDEPEND="app-misc/ca-certificates" |
1336 |
- |
1337 |
-S="${WORKDIR}/${MY_P}" |
1338 |
- |
1339 |
-MULTILIB_WRAPPED_HEADERS=( |
1340 |
- usr/include/openssl/opensslconf.h |
1341 |
-) |
1342 |
- |
1343 |
-src_prepare() { |
1344 |
- SSL_CNF_DIR="/etc/ssl" |
1345 |
- sed \ |
1346 |
- -e "/^DIR=/s:=.*:=${EPREFIX}${SSL_CNF_DIR}:" \ |
1347 |
- -e "s:SSL_CMD=/usr:SSL_CMD=${EPREFIX}/usr:" \ |
1348 |
- "${DISTDIR}"/${PN}-c_rehash.sh.${REV} \ |
1349 |
- > "${WORKDIR}"/c_rehash || die #416717 |
1350 |
- |
1351 |
- # Make sure we only ever touch Makefile.org and avoid patching a file |
1352 |
- # that gets blown away anyways by the Configure script in src_configure |
1353 |
- rm -f Makefile |
1354 |
- |
1355 |
- if ! use vanilla ; then |
1356 |
- epatch "${FILESDIR}"/${PN}-1.0.0a-ldflags.patch #327421 |
1357 |
- epatch "${FILESDIR}"/${PN}-1.0.0d-windres.patch #373743 |
1358 |
- epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-build.patch |
1359 |
- epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-obj-headers.patch |
1360 |
- epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-install-dirs.patch |
1361 |
- epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-symlinking.patch #545028 |
1362 |
- epatch "${FILESDIR}"/${PN}-1.0.2-ipv6.patch |
1363 |
- epatch "${FILESDIR}"/${PN}-1.0.2a-x32-asm.patch #542618 |
1364 |
- |
1365 |
- epatch_user #332661 |
1366 |
- fi |
1367 |
- |
1368 |
- # disable fips in the build |
1369 |
- # make sure the man pages are suffixed #302165 |
1370 |
- # don't bother building man pages if they're disabled |
1371 |
- sed -i \ |
1372 |
- -e '/DIRS/s: fips : :g' \ |
1373 |
- -e '/^MANSUFFIX/s:=.*:=ssl:' \ |
1374 |
- -e '/^MAKEDEPPROG/s:=.*:=$(CC):' \ |
1375 |
- -e $(has noman FEATURES \ |
1376 |
- && echo '/^install:/s:install_docs::' \ |
1377 |
- || echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \ |
1378 |
- Makefile.org \ |
1379 |
- || die |
1380 |
- # show the actual commands in the log |
1381 |
- sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared |
1382 |
- |
1383 |
- # since we're forcing $(CC) as makedep anyway, just fix |
1384 |
- # the conditional as always-on |
1385 |
- # helps clang (#417795), and versioned gcc (#499818) |
1386 |
- sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || die |
1387 |
- |
1388 |
- # quiet out unknown driver argument warnings since openssl |
1389 |
- # doesn't have well-split CFLAGS and we're making it even worse |
1390 |
- # and 'make depend' uses -Werror for added fun (#417795 again) |
1391 |
- [[ ${CC} == *clang* ]] && append-flags -Qunused-arguments |
1392 |
- |
1393 |
- # allow openssl to be cross-compiled |
1394 |
- cp "${FILESDIR}"/gentoo.config-1.0.1 gentoo.config || die |
1395 |
- chmod a+rx gentoo.config |
1396 |
- |
1397 |
- append-flags -fno-strict-aliasing |
1398 |
- append-flags $(test-flags-CC -Wa,--noexecstack) |
1399 |
- append-cppflags -DOPENSSL_NO_BUF_FREELISTS |
1400 |
- |
1401 |
- sed -i '1s,^:$,#!'${EPREFIX}'/usr/bin/perl,' Configure #141906 |
1402 |
- # The config script does stupid stuff to prompt the user. Kill it. |
1403 |
- sed -i '/stty -icanon min 0 time 50; read waste/d' config || die |
1404 |
- ./config --test-sanity || die "I AM NOT SANE" |
1405 |
- |
1406 |
- multilib_copy_sources |
1407 |
-} |
1408 |
- |
1409 |
-multilib_src_configure() { |
1410 |
- unset APPS #197996 |
1411 |
- unset SCRIPTS #312551 |
1412 |
- unset CROSS_COMPILE #311473 |
1413 |
- |
1414 |
- tc-export CC AR RANLIB RC |
1415 |
- |
1416 |
- # Clean out patent-or-otherwise-encumbered code |
1417 |
- # Camellia: Royalty Free http://en.wikipedia.org/wiki/Camellia_(cipher) |
1418 |
- # IDEA: Expired http://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm |
1419 |
- # EC: ????????? ??/??/2015 http://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography |
1420 |
- # MDC2: Expired http://en.wikipedia.org/wiki/MDC-2 |
1421 |
- # RC5: Expired http://en.wikipedia.org/wiki/RC5 |
1422 |
- |
1423 |
- use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; } |
1424 |
- echoit() { echo "$@" ; "$@" ; } |
1425 |
- |
1426 |
- local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal") |
1427 |
- |
1428 |
- # See if our toolchain supports __uint128_t. If so, it's 64bit |
1429 |
- # friendly and can use the nicely optimized code paths. #460790 |
1430 |
- local ec_nistp_64_gcc_128 |
1431 |
- # Disable it for now though #469976 |
1432 |
- #if ! use bindist ; then |
1433 |
- # echo "__uint128_t i;" > "${T}"/128.c |
1434 |
- # if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then |
1435 |
- # ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128" |
1436 |
- # fi |
1437 |
- #fi |
1438 |
- |
1439 |
- local sslout=$(./gentoo.config) |
1440 |
- einfo "Use configuration ${sslout:-(openssl knows best)}" |
1441 |
- local config="Configure" |
1442 |
- [[ -z ${sslout} ]] && config="config" |
1443 |
- |
1444 |
- echoit \ |
1445 |
- ./${config} \ |
1446 |
- ${sslout} \ |
1447 |
- $(use cpu_flags_x86_sse2 || echo "no-sse2") \ |
1448 |
- enable-camellia \ |
1449 |
- $(use_ssl !bindist ec) \ |
1450 |
- ${ec_nistp_64_gcc_128} \ |
1451 |
- enable-idea \ |
1452 |
- enable-mdc2 \ |
1453 |
- enable-rc5 \ |
1454 |
- enable-tlsext \ |
1455 |
- $(use_ssl asm) \ |
1456 |
- $(use_ssl gmp gmp -lgmp) \ |
1457 |
- $(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \ |
1458 |
- $(use_ssl rfc3779) \ |
1459 |
- $(use_ssl sctp) \ |
1460 |
- $(use_ssl tls-heartbeat heartbeats) \ |
1461 |
- $(use_ssl zlib) \ |
1462 |
- --prefix="${EPREFIX}"/usr \ |
1463 |
- --openssldir="${EPREFIX}"${SSL_CNF_DIR} \ |
1464 |
- --libdir=$(get_libdir) \ |
1465 |
- shared threads \ |
1466 |
- || die |
1467 |
- |
1468 |
- # Clean out hardcoded flags that openssl uses |
1469 |
- local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \ |
1470 |
- -e 's:^CFLAG=::' \ |
1471 |
- -e 's:-fomit-frame-pointer ::g' \ |
1472 |
- -e 's:-O[0-9] ::g' \ |
1473 |
- -e 's:-march=[-a-z0-9]* ::g' \ |
1474 |
- -e 's:-mcpu=[-a-z0-9]* ::g' \ |
1475 |
- -e 's:-m[a-z0-9]* ::g' \ |
1476 |
- ) |
1477 |
- sed -i \ |
1478 |
- -e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \ |
1479 |
- -e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \ |
1480 |
- Makefile || die |
1481 |
-} |
1482 |
- |
1483 |
-multilib_src_compile() { |
1484 |
- # depend is needed to use $confopts; it also doesn't matter |
1485 |
- # that it's -j1 as the code itself serializes subdirs |
1486 |
- emake -j1 depend |
1487 |
- emake all |
1488 |
- # rehash is needed to prep the certs/ dir; do this |
1489 |
- # separately to avoid parallel build issues. |
1490 |
- emake rehash |
1491 |
-} |
1492 |
- |
1493 |
-multilib_src_test() { |
1494 |
- emake -j1 test |
1495 |
-} |
1496 |
- |
1497 |
-multilib_src_install() { |
1498 |
- emake INSTALL_PREFIX="${D}" install |
1499 |
-} |
1500 |
- |
1501 |
-multilib_src_install_all() { |
1502 |
- dobin "${WORKDIR}"/c_rehash #333117 |
1503 |
- dodoc CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el |
1504 |
- dohtml -r doc/* |
1505 |
- use rfc3779 && dodoc engines/ccgost/README.gost |
1506 |
- |
1507 |
- # This is crappy in that the static archives are still built even |
1508 |
- # when USE=static-libs. But this is due to a failing in the openssl |
1509 |
- # build system: the static archives are built as PIC all the time. |
1510 |
- # Only way around this would be to manually configure+compile openssl |
1511 |
- # twice; once with shared lib support enabled and once without. |
1512 |
- use static-libs || rm -f "${ED}"/usr/lib*/lib*.a |
1513 |
- |
1514 |
- # create the certs directory |
1515 |
- dodir ${SSL_CNF_DIR}/certs |
1516 |
- cp -RP certs/* "${ED}"${SSL_CNF_DIR}/certs/ || die |
1517 |
- rm -r "${ED}"${SSL_CNF_DIR}/certs/{demo,expired} |
1518 |
- |
1519 |
- # Namespace openssl programs to prevent conflicts with other man pages |
1520 |
- cd "${ED}"/usr/share/man |
1521 |
- local m d s |
1522 |
- for m in $(find . -type f | xargs grep -L '#include') ; do |
1523 |
- d=${m%/*} ; d=${d#./} ; m=${m##*/} |
1524 |
- [[ ${m} == openssl.1* ]] && continue |
1525 |
- [[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!" |
1526 |
- mv ${d}/{,ssl-}${m} |
1527 |
- # fix up references to renamed man pages |
1528 |
- sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m} |
1529 |
- ln -s ssl-${m} ${d}/openssl-${m} |
1530 |
- # locate any symlinks that point to this man page ... we assume |
1531 |
- # that any broken links are due to the above renaming |
1532 |
- for s in $(find -L ${d} -type l) ; do |
1533 |
- s=${s##*/} |
1534 |
- rm -f ${d}/${s} |
1535 |
- ln -s ssl-${m} ${d}/ssl-${s} |
1536 |
- ln -s ssl-${s} ${d}/openssl-${s} |
1537 |
- done |
1538 |
- done |
1539 |
- [[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :(" |
1540 |
- |
1541 |
- dodir /etc/sandbox.d #254521 |
1542 |
- echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl |
1543 |
- |
1544 |
- diropts -m0700 |
1545 |
- keepdir ${SSL_CNF_DIR}/private |
1546 |
-} |
1547 |
- |
1548 |
-pkg_preinst() { |
1549 |
- has_version ${CATEGORY}/${PN}:0.9.8 && return 0 |
1550 |
- preserve_old_lib /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8 |
1551 |
-} |
1552 |
- |
1553 |
-pkg_postinst() { |
1554 |
- ebegin "Running 'c_rehash ${EROOT%/}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069" |
1555 |
- c_rehash "${EROOT%/}${SSL_CNF_DIR}/certs" >/dev/null |
1556 |
- eend $? |
1557 |
- |
1558 |
- has_version ${CATEGORY}/${PN}:0.9.8 && return 0 |
1559 |
- preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8 |
1560 |
-} |
1561 |
|
1562 |
diff --git a/dev-libs/openssl/openssl-1.0.2d-r2.ebuild b/dev-libs/openssl/openssl-1.0.2d-r2.ebuild |
1563 |
deleted file mode 100644 |
1564 |
index e45dd24..0000000 |
1565 |
--- a/dev-libs/openssl/openssl-1.0.2d-r2.ebuild |
1566 |
+++ /dev/null |
1567 |
@@ -1,265 +0,0 @@ |
1568 |
-# Copyright 1999-2015 Gentoo Foundation |
1569 |
-# Distributed under the terms of the GNU General Public License v2 |
1570 |
-# $Id$ |
1571 |
- |
1572 |
-EAPI="4" |
1573 |
- |
1574 |
-inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal |
1575 |
- |
1576 |
-MY_P=${P/_/-} |
1577 |
-DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)" |
1578 |
-HOMEPAGE="http://www.openssl.org/" |
1579 |
-SRC_URI="mirror://openssl/source/${MY_P}.tar.gz" |
1580 |
- |
1581 |
-LICENSE="openssl" |
1582 |
-SLOT="0" |
1583 |
-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" |
1584 |
-IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 static-libs test +tls-heartbeat vanilla zlib" |
1585 |
-RESTRICT="!bindist? ( bindist )" |
1586 |
- |
1587 |
-# The blocks are temporary just to make sure people upgrade to a |
1588 |
-# version that lack runtime version checking. We'll drop them in |
1589 |
-# the future. |
1590 |
-RDEPEND=">=app-misc/c_rehash-1.7-r1 |
1591 |
- gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] ) |
1592 |
- zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] ) |
1593 |
- kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] ) |
1594 |
- abi_x86_32? ( |
1595 |
- !<=app-emulation/emul-linux-x86-baselibs-20140508 |
1596 |
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] |
1597 |
- ) |
1598 |
- !<net-misc/openssh-5.9_p1-r4 |
1599 |
- !<net-libs/neon-0.29.6-r1" |
1600 |
-DEPEND="${RDEPEND} |
1601 |
- >=dev-lang/perl-5 |
1602 |
- sctp? ( >=net-misc/lksctp-tools-1.0.12 ) |
1603 |
- test? ( |
1604 |
- sys-apps/diffutils |
1605 |
- sys-devel/bc |
1606 |
- )" |
1607 |
-PDEPEND="app-misc/ca-certificates" |
1608 |
- |
1609 |
-S="${WORKDIR}/${MY_P}" |
1610 |
- |
1611 |
-MULTILIB_WRAPPED_HEADERS=( |
1612 |
- usr/include/openssl/opensslconf.h |
1613 |
-) |
1614 |
- |
1615 |
-src_prepare() { |
1616 |
- # keep this in sync with app-misc/c_rehash |
1617 |
- SSL_CNF_DIR="/etc/ssl" |
1618 |
- |
1619 |
- # Make sure we only ever touch Makefile.org and avoid patching a file |
1620 |
- # that gets blown away anyways by the Configure script in src_configure |
1621 |
- rm -f Makefile |
1622 |
- |
1623 |
- if ! use vanilla ; then |
1624 |
- epatch "${FILESDIR}"/${PN}-1.0.0a-ldflags.patch #327421 |
1625 |
- epatch "${FILESDIR}"/${PN}-1.0.0d-windres.patch #373743 |
1626 |
- epatch "${FILESDIR}"/${PN}-1.0.2d-parallel-build.patch |
1627 |
- epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-obj-headers.patch |
1628 |
- epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-install-dirs.patch |
1629 |
- epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-symlinking.patch #545028 |
1630 |
- epatch "${FILESDIR}"/${PN}-1.0.2-ipv6.patch |
1631 |
- epatch "${FILESDIR}"/${PN}-1.0.2a-x32-asm.patch #542618 |
1632 |
- epatch "${FILESDIR}"/${PN}-1.0.1p-default-source.patch #554338 |
1633 |
- |
1634 |
- epatch_user #332661 |
1635 |
- fi |
1636 |
- |
1637 |
- # disable fips in the build |
1638 |
- # make sure the man pages are suffixed #302165 |
1639 |
- # don't bother building man pages if they're disabled |
1640 |
- sed -i \ |
1641 |
- -e '/DIRS/s: fips : :g' \ |
1642 |
- -e '/^MANSUFFIX/s:=.*:=ssl:' \ |
1643 |
- -e '/^MAKEDEPPROG/s:=.*:=$(CC):' \ |
1644 |
- -e $(has noman FEATURES \ |
1645 |
- && echo '/^install:/s:install_docs::' \ |
1646 |
- || echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \ |
1647 |
- Makefile.org \ |
1648 |
- || die |
1649 |
- # show the actual commands in the log |
1650 |
- sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared |
1651 |
- |
1652 |
- # since we're forcing $(CC) as makedep anyway, just fix |
1653 |
- # the conditional as always-on |
1654 |
- # helps clang (#417795), and versioned gcc (#499818) |
1655 |
- sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || die |
1656 |
- |
1657 |
- # quiet out unknown driver argument warnings since openssl |
1658 |
- # doesn't have well-split CFLAGS and we're making it even worse |
1659 |
- # and 'make depend' uses -Werror for added fun (#417795 again) |
1660 |
- [[ ${CC} == *clang* ]] && append-flags -Qunused-arguments |
1661 |
- |
1662 |
- # allow openssl to be cross-compiled |
1663 |
- cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die |
1664 |
- chmod a+rx gentoo.config |
1665 |
- |
1666 |
- append-flags -fno-strict-aliasing |
1667 |
- append-flags $(test-flags-CC -Wa,--noexecstack) |
1668 |
- append-cppflags -DOPENSSL_NO_BUF_FREELISTS |
1669 |
- |
1670 |
- sed -i '1s,^:$,#!'${EPREFIX}'/usr/bin/perl,' Configure #141906 |
1671 |
- # The config script does stupid stuff to prompt the user. Kill it. |
1672 |
- sed -i '/stty -icanon min 0 time 50; read waste/d' config || die |
1673 |
- ./config --test-sanity || die "I AM NOT SANE" |
1674 |
- |
1675 |
- multilib_copy_sources |
1676 |
-} |
1677 |
- |
1678 |
-multilib_src_configure() { |
1679 |
- unset APPS #197996 |
1680 |
- unset SCRIPTS #312551 |
1681 |
- unset CROSS_COMPILE #311473 |
1682 |
- |
1683 |
- tc-export CC AR RANLIB RC |
1684 |
- |
1685 |
- # Clean out patent-or-otherwise-encumbered code |
1686 |
- # Camellia: Royalty Free http://en.wikipedia.org/wiki/Camellia_(cipher) |
1687 |
- # IDEA: Expired http://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm |
1688 |
- # EC: ????????? ??/??/2015 http://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography |
1689 |
- # MDC2: Expired http://en.wikipedia.org/wiki/MDC-2 |
1690 |
- # RC5: Expired http://en.wikipedia.org/wiki/RC5 |
1691 |
- |
1692 |
- use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; } |
1693 |
- echoit() { echo "$@" ; "$@" ; } |
1694 |
- |
1695 |
- local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal") |
1696 |
- |
1697 |
- # See if our toolchain supports __uint128_t. If so, it's 64bit |
1698 |
- # friendly and can use the nicely optimized code paths. #460790 |
1699 |
- local ec_nistp_64_gcc_128 |
1700 |
- # Disable it for now though #469976 |
1701 |
- #if ! use bindist ; then |
1702 |
- # echo "__uint128_t i;" > "${T}"/128.c |
1703 |
- # if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then |
1704 |
- # ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128" |
1705 |
- # fi |
1706 |
- #fi |
1707 |
- |
1708 |
- local sslout=$(./gentoo.config) |
1709 |
- einfo "Use configuration ${sslout:-(openssl knows best)}" |
1710 |
- local config="Configure" |
1711 |
- [[ -z ${sslout} ]] && config="config" |
1712 |
- |
1713 |
- echoit \ |
1714 |
- ./${config} \ |
1715 |
- ${sslout} \ |
1716 |
- $(use cpu_flags_x86_sse2 || echo "no-sse2") \ |
1717 |
- enable-camellia \ |
1718 |
- $(use_ssl !bindist ec) \ |
1719 |
- ${ec_nistp_64_gcc_128} \ |
1720 |
- enable-idea \ |
1721 |
- enable-mdc2 \ |
1722 |
- enable-rc5 \ |
1723 |
- enable-tlsext \ |
1724 |
- $(use_ssl asm) \ |
1725 |
- $(use_ssl gmp gmp -lgmp) \ |
1726 |
- $(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \ |
1727 |
- $(use_ssl rfc3779) \ |
1728 |
- $(use_ssl sctp) \ |
1729 |
- $(use_ssl tls-heartbeat heartbeats) \ |
1730 |
- $(use_ssl zlib) \ |
1731 |
- --prefix="${EPREFIX}"/usr \ |
1732 |
- --openssldir="${EPREFIX}"${SSL_CNF_DIR} \ |
1733 |
- --libdir=$(get_libdir) \ |
1734 |
- shared threads \ |
1735 |
- || die |
1736 |
- |
1737 |
- # Clean out hardcoded flags that openssl uses |
1738 |
- local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \ |
1739 |
- -e 's:^CFLAG=::' \ |
1740 |
- -e 's:-fomit-frame-pointer ::g' \ |
1741 |
- -e 's:-O[0-9] ::g' \ |
1742 |
- -e 's:-march=[-a-z0-9]* ::g' \ |
1743 |
- -e 's:-mcpu=[-a-z0-9]* ::g' \ |
1744 |
- -e 's:-m[a-z0-9]* ::g' \ |
1745 |
- ) |
1746 |
- sed -i \ |
1747 |
- -e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \ |
1748 |
- -e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \ |
1749 |
- Makefile || die |
1750 |
-} |
1751 |
- |
1752 |
-multilib_src_compile() { |
1753 |
- # depend is needed to use $confopts; it also doesn't matter |
1754 |
- # that it's -j1 as the code itself serializes subdirs |
1755 |
- emake -j1 depend |
1756 |
- emake all |
1757 |
- # rehash is needed to prep the certs/ dir; do this |
1758 |
- # separately to avoid parallel build issues. |
1759 |
- emake rehash |
1760 |
-} |
1761 |
- |
1762 |
-multilib_src_test() { |
1763 |
- emake -j1 test |
1764 |
-} |
1765 |
- |
1766 |
-multilib_src_install() { |
1767 |
- emake INSTALL_PREFIX="${D}" install |
1768 |
-} |
1769 |
- |
1770 |
-multilib_src_install_all() { |
1771 |
- # openssl installs perl version of c_rehash by default, but |
1772 |
- # we provide a shell version via app-misc/c_rehash |
1773 |
- rm "${ED}"/usr/bin/c_rehash || die |
1774 |
- |
1775 |
- dodoc CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el |
1776 |
- dohtml -r doc/* |
1777 |
- use rfc3779 && dodoc engines/ccgost/README.gost |
1778 |
- |
1779 |
- # This is crappy in that the static archives are still built even |
1780 |
- # when USE=static-libs. But this is due to a failing in the openssl |
1781 |
- # build system: the static archives are built as PIC all the time. |
1782 |
- # Only way around this would be to manually configure+compile openssl |
1783 |
- # twice; once with shared lib support enabled and once without. |
1784 |
- use static-libs || rm -f "${ED}"/usr/lib*/lib*.a |
1785 |
- |
1786 |
- # create the certs directory |
1787 |
- dodir ${SSL_CNF_DIR}/certs |
1788 |
- cp -RP certs/* "${ED}"${SSL_CNF_DIR}/certs/ || die |
1789 |
- rm -r "${ED}"${SSL_CNF_DIR}/certs/{demo,expired} |
1790 |
- |
1791 |
- # Namespace openssl programs to prevent conflicts with other man pages |
1792 |
- cd "${ED}"/usr/share/man |
1793 |
- local m d s |
1794 |
- for m in $(find . -type f | xargs grep -L '#include') ; do |
1795 |
- d=${m%/*} ; d=${d#./} ; m=${m##*/} |
1796 |
- [[ ${m} == openssl.1* ]] && continue |
1797 |
- [[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!" |
1798 |
- mv ${d}/{,ssl-}${m} |
1799 |
- # fix up references to renamed man pages |
1800 |
- sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m} |
1801 |
- ln -s ssl-${m} ${d}/openssl-${m} |
1802 |
- # locate any symlinks that point to this man page ... we assume |
1803 |
- # that any broken links are due to the above renaming |
1804 |
- for s in $(find -L ${d} -type l) ; do |
1805 |
- s=${s##*/} |
1806 |
- rm -f ${d}/${s} |
1807 |
- ln -s ssl-${m} ${d}/ssl-${s} |
1808 |
- ln -s ssl-${s} ${d}/openssl-${s} |
1809 |
- done |
1810 |
- done |
1811 |
- [[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :(" |
1812 |
- |
1813 |
- dodir /etc/sandbox.d #254521 |
1814 |
- echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl |
1815 |
- |
1816 |
- diropts -m0700 |
1817 |
- keepdir ${SSL_CNF_DIR}/private |
1818 |
-} |
1819 |
- |
1820 |
-pkg_preinst() { |
1821 |
- has_version ${CATEGORY}/${PN}:0.9.8 && return 0 |
1822 |
- preserve_old_lib /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8 |
1823 |
-} |
1824 |
- |
1825 |
-pkg_postinst() { |
1826 |
- ebegin "Running 'c_rehash ${EROOT%/}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069" |
1827 |
- c_rehash "${EROOT%/}${SSL_CNF_DIR}/certs" >/dev/null |
1828 |
- eend $? |
1829 |
- |
1830 |
- has_version ${CATEGORY}/${PN}:0.9.8 && return 0 |
1831 |
- preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8 |
1832 |
-} |
1833 |
|
1834 |
diff --git a/dev-libs/openssl/openssl-1.0.2d.ebuild b/dev-libs/openssl/openssl-1.0.2d.ebuild |
1835 |
deleted file mode 100644 |
1836 |
index 98f1978..0000000 |
1837 |
--- a/dev-libs/openssl/openssl-1.0.2d.ebuild |
1838 |
+++ /dev/null |
1839 |
@@ -1,267 +0,0 @@ |
1840 |
-# Copyright 1999-2015 Gentoo Foundation |
1841 |
-# Distributed under the terms of the GNU General Public License v2 |
1842 |
-# $Id$ |
1843 |
- |
1844 |
-EAPI="4" |
1845 |
- |
1846 |
-inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal |
1847 |
- |
1848 |
-REV="1.7" |
1849 |
-MY_P=${P/_/-} |
1850 |
-DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)" |
1851 |
-HOMEPAGE="http://www.openssl.org/" |
1852 |
-SRC_URI="mirror://openssl/source/${MY_P}.tar.gz |
1853 |
- http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/${PN}/${PN}-c_rehash.sh?rev=${REV} -> ${PN}-c_rehash.sh.${REV}" |
1854 |
- |
1855 |
-LICENSE="openssl" |
1856 |
-SLOT="0" |
1857 |
-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" |
1858 |
-IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 static-libs test +tls-heartbeat vanilla zlib" |
1859 |
-RESTRICT="!bindist? ( bindist )" |
1860 |
- |
1861 |
-# The blocks are temporary just to make sure people upgrade to a |
1862 |
-# version that lack runtime version checking. We'll drop them in |
1863 |
-# the future. |
1864 |
-RDEPEND="gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] ) |
1865 |
- zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] ) |
1866 |
- kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] ) |
1867 |
- abi_x86_32? ( |
1868 |
- !<=app-emulation/emul-linux-x86-baselibs-20140508 |
1869 |
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] |
1870 |
- ) |
1871 |
- !<net-misc/openssh-5.9_p1-r4 |
1872 |
- !<net-libs/neon-0.29.6-r1" |
1873 |
-DEPEND="${RDEPEND} |
1874 |
- >=dev-lang/perl-5 |
1875 |
- sctp? ( >=net-misc/lksctp-tools-1.0.12 ) |
1876 |
- test? ( |
1877 |
- sys-apps/diffutils |
1878 |
- sys-devel/bc |
1879 |
- )" |
1880 |
-PDEPEND="app-misc/ca-certificates" |
1881 |
- |
1882 |
-S="${WORKDIR}/${MY_P}" |
1883 |
- |
1884 |
-MULTILIB_WRAPPED_HEADERS=( |
1885 |
- usr/include/openssl/opensslconf.h |
1886 |
-) |
1887 |
- |
1888 |
-src_prepare() { |
1889 |
- SSL_CNF_DIR="/etc/ssl" |
1890 |
- sed \ |
1891 |
- -e "/^DIR=/s:=.*:=${EPREFIX}${SSL_CNF_DIR}:" \ |
1892 |
- -e "s:SSL_CMD=/usr:SSL_CMD=${EPREFIX}/usr:" \ |
1893 |
- "${DISTDIR}"/${PN}-c_rehash.sh.${REV} \ |
1894 |
- > "${WORKDIR}"/c_rehash || die #416717 |
1895 |
- |
1896 |
- # Make sure we only ever touch Makefile.org and avoid patching a file |
1897 |
- # that gets blown away anyways by the Configure script in src_configure |
1898 |
- rm -f Makefile |
1899 |
- |
1900 |
- if ! use vanilla ; then |
1901 |
- epatch "${FILESDIR}"/${PN}-1.0.0a-ldflags.patch #327421 |
1902 |
- epatch "${FILESDIR}"/${PN}-1.0.0d-windres.patch #373743 |
1903 |
- epatch "${FILESDIR}"/${PN}-1.0.2d-parallel-build.patch |
1904 |
- epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-obj-headers.patch |
1905 |
- epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-install-dirs.patch |
1906 |
- epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-symlinking.patch #545028 |
1907 |
- epatch "${FILESDIR}"/${PN}-1.0.2-ipv6.patch |
1908 |
- epatch "${FILESDIR}"/${PN}-1.0.2a-x32-asm.patch #542618 |
1909 |
- epatch "${FILESDIR}"/${PN}-1.0.1p-default-source.patch #554338 |
1910 |
- |
1911 |
- epatch_user #332661 |
1912 |
- fi |
1913 |
- |
1914 |
- # disable fips in the build |
1915 |
- # make sure the man pages are suffixed #302165 |
1916 |
- # don't bother building man pages if they're disabled |
1917 |
- sed -i \ |
1918 |
- -e '/DIRS/s: fips : :g' \ |
1919 |
- -e '/^MANSUFFIX/s:=.*:=ssl:' \ |
1920 |
- -e '/^MAKEDEPPROG/s:=.*:=$(CC):' \ |
1921 |
- -e $(has noman FEATURES \ |
1922 |
- && echo '/^install:/s:install_docs::' \ |
1923 |
- || echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \ |
1924 |
- Makefile.org \ |
1925 |
- || die |
1926 |
- # show the actual commands in the log |
1927 |
- sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared |
1928 |
- |
1929 |
- # since we're forcing $(CC) as makedep anyway, just fix |
1930 |
- # the conditional as always-on |
1931 |
- # helps clang (#417795), and versioned gcc (#499818) |
1932 |
- sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || die |
1933 |
- |
1934 |
- # quiet out unknown driver argument warnings since openssl |
1935 |
- # doesn't have well-split CFLAGS and we're making it even worse |
1936 |
- # and 'make depend' uses -Werror for added fun (#417795 again) |
1937 |
- [[ ${CC} == *clang* ]] && append-flags -Qunused-arguments |
1938 |
- |
1939 |
- # allow openssl to be cross-compiled |
1940 |
- cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die |
1941 |
- chmod a+rx gentoo.config |
1942 |
- |
1943 |
- append-flags -fno-strict-aliasing |
1944 |
- append-flags $(test-flags-CC -Wa,--noexecstack) |
1945 |
- append-cppflags -DOPENSSL_NO_BUF_FREELISTS |
1946 |
- |
1947 |
- sed -i '1s,^:$,#!'${EPREFIX}'/usr/bin/perl,' Configure #141906 |
1948 |
- # The config script does stupid stuff to prompt the user. Kill it. |
1949 |
- sed -i '/stty -icanon min 0 time 50; read waste/d' config || die |
1950 |
- ./config --test-sanity || die "I AM NOT SANE" |
1951 |
- |
1952 |
- multilib_copy_sources |
1953 |
-} |
1954 |
- |
1955 |
-multilib_src_configure() { |
1956 |
- unset APPS #197996 |
1957 |
- unset SCRIPTS #312551 |
1958 |
- unset CROSS_COMPILE #311473 |
1959 |
- |
1960 |
- tc-export CC AR RANLIB RC |
1961 |
- |
1962 |
- # Clean out patent-or-otherwise-encumbered code |
1963 |
- # Camellia: Royalty Free http://en.wikipedia.org/wiki/Camellia_(cipher) |
1964 |
- # IDEA: Expired http://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm |
1965 |
- # EC: ????????? ??/??/2015 http://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography |
1966 |
- # MDC2: Expired http://en.wikipedia.org/wiki/MDC-2 |
1967 |
- # RC5: Expired http://en.wikipedia.org/wiki/RC5 |
1968 |
- |
1969 |
- use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; } |
1970 |
- echoit() { echo "$@" ; "$@" ; } |
1971 |
- |
1972 |
- local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal") |
1973 |
- |
1974 |
- # See if our toolchain supports __uint128_t. If so, it's 64bit |
1975 |
- # friendly and can use the nicely optimized code paths. #460790 |
1976 |
- local ec_nistp_64_gcc_128 |
1977 |
- # Disable it for now though #469976 |
1978 |
- #if ! use bindist ; then |
1979 |
- # echo "__uint128_t i;" > "${T}"/128.c |
1980 |
- # if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then |
1981 |
- # ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128" |
1982 |
- # fi |
1983 |
- #fi |
1984 |
- |
1985 |
- local sslout=$(./gentoo.config) |
1986 |
- einfo "Use configuration ${sslout:-(openssl knows best)}" |
1987 |
- local config="Configure" |
1988 |
- [[ -z ${sslout} ]] && config="config" |
1989 |
- |
1990 |
- echoit \ |
1991 |
- ./${config} \ |
1992 |
- ${sslout} \ |
1993 |
- $(use cpu_flags_x86_sse2 || echo "no-sse2") \ |
1994 |
- enable-camellia \ |
1995 |
- $(use_ssl !bindist ec) \ |
1996 |
- ${ec_nistp_64_gcc_128} \ |
1997 |
- enable-idea \ |
1998 |
- enable-mdc2 \ |
1999 |
- enable-rc5 \ |
2000 |
- enable-tlsext \ |
2001 |
- $(use_ssl asm) \ |
2002 |
- $(use_ssl gmp gmp -lgmp) \ |
2003 |
- $(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \ |
2004 |
- $(use_ssl rfc3779) \ |
2005 |
- $(use_ssl sctp) \ |
2006 |
- $(use_ssl tls-heartbeat heartbeats) \ |
2007 |
- $(use_ssl zlib) \ |
2008 |
- --prefix="${EPREFIX}"/usr \ |
2009 |
- --openssldir="${EPREFIX}"${SSL_CNF_DIR} \ |
2010 |
- --libdir=$(get_libdir) \ |
2011 |
- shared threads \ |
2012 |
- || die |
2013 |
- |
2014 |
- # Clean out hardcoded flags that openssl uses |
2015 |
- local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \ |
2016 |
- -e 's:^CFLAG=::' \ |
2017 |
- -e 's:-fomit-frame-pointer ::g' \ |
2018 |
- -e 's:-O[0-9] ::g' \ |
2019 |
- -e 's:-march=[-a-z0-9]* ::g' \ |
2020 |
- -e 's:-mcpu=[-a-z0-9]* ::g' \ |
2021 |
- -e 's:-m[a-z0-9]* ::g' \ |
2022 |
- ) |
2023 |
- sed -i \ |
2024 |
- -e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \ |
2025 |
- -e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \ |
2026 |
- Makefile || die |
2027 |
-} |
2028 |
- |
2029 |
-multilib_src_compile() { |
2030 |
- # depend is needed to use $confopts; it also doesn't matter |
2031 |
- # that it's -j1 as the code itself serializes subdirs |
2032 |
- emake -j1 depend |
2033 |
- emake all |
2034 |
- # rehash is needed to prep the certs/ dir; do this |
2035 |
- # separately to avoid parallel build issues. |
2036 |
- emake rehash |
2037 |
-} |
2038 |
- |
2039 |
-multilib_src_test() { |
2040 |
- emake -j1 test |
2041 |
-} |
2042 |
- |
2043 |
-multilib_src_install() { |
2044 |
- emake INSTALL_PREFIX="${D}" install |
2045 |
-} |
2046 |
- |
2047 |
-multilib_src_install_all() { |
2048 |
- dobin "${WORKDIR}"/c_rehash #333117 |
2049 |
- dodoc CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el |
2050 |
- dohtml -r doc/* |
2051 |
- use rfc3779 && dodoc engines/ccgost/README.gost |
2052 |
- |
2053 |
- # This is crappy in that the static archives are still built even |
2054 |
- # when USE=static-libs. But this is due to a failing in the openssl |
2055 |
- # build system: the static archives are built as PIC all the time. |
2056 |
- # Only way around this would be to manually configure+compile openssl |
2057 |
- # twice; once with shared lib support enabled and once without. |
2058 |
- use static-libs || rm -f "${ED}"/usr/lib*/lib*.a |
2059 |
- |
2060 |
- # create the certs directory |
2061 |
- dodir ${SSL_CNF_DIR}/certs |
2062 |
- cp -RP certs/* "${ED}"${SSL_CNF_DIR}/certs/ || die |
2063 |
- rm -r "${ED}"${SSL_CNF_DIR}/certs/{demo,expired} |
2064 |
- |
2065 |
- # Namespace openssl programs to prevent conflicts with other man pages |
2066 |
- cd "${ED}"/usr/share/man |
2067 |
- local m d s |
2068 |
- for m in $(find . -type f | xargs grep -L '#include') ; do |
2069 |
- d=${m%/*} ; d=${d#./} ; m=${m##*/} |
2070 |
- [[ ${m} == openssl.1* ]] && continue |
2071 |
- [[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!" |
2072 |
- mv ${d}/{,ssl-}${m} |
2073 |
- # fix up references to renamed man pages |
2074 |
- sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m} |
2075 |
- ln -s ssl-${m} ${d}/openssl-${m} |
2076 |
- # locate any symlinks that point to this man page ... we assume |
2077 |
- # that any broken links are due to the above renaming |
2078 |
- for s in $(find -L ${d} -type l) ; do |
2079 |
- s=${s##*/} |
2080 |
- rm -f ${d}/${s} |
2081 |
- ln -s ssl-${m} ${d}/ssl-${s} |
2082 |
- ln -s ssl-${s} ${d}/openssl-${s} |
2083 |
- done |
2084 |
- done |
2085 |
- [[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :(" |
2086 |
- |
2087 |
- dodir /etc/sandbox.d #254521 |
2088 |
- echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl |
2089 |
- |
2090 |
- diropts -m0700 |
2091 |
- keepdir ${SSL_CNF_DIR}/private |
2092 |
-} |
2093 |
- |
2094 |
-pkg_preinst() { |
2095 |
- has_version ${CATEGORY}/${PN}:0.9.8 && return 0 |
2096 |
- preserve_old_lib /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8 |
2097 |
-} |
2098 |
- |
2099 |
-pkg_postinst() { |
2100 |
- ebegin "Running 'c_rehash ${EROOT%/}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069" |
2101 |
- c_rehash "${EROOT%/}${SSL_CNF_DIR}/certs" >/dev/null |
2102 |
- eend $? |
2103 |
- |
2104 |
- has_version ${CATEGORY}/${PN}:0.9.8 && return 0 |
2105 |
- preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8 |
2106 |
-} |