1 |
commit: 5ad6a648012ecb68860c27ee692a2283994bb1e3 |
2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jul 3 20:02:46 2018 +0000 |
4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jul 3 20:02:46 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=5ad6a648 |
7 |
|
8 |
dev-libs/openssl: cleanup |
9 |
|
10 |
Package-Manager: Portage-2.3.40.3-prefix, Repoman-2.3.9 |
11 |
|
12 |
dev-libs/openssl/Manifest | 25 --- |
13 |
dev-libs/openssl/openssl-1.0.2n.ebuild | 265 --------------------------- |
14 |
dev-libs/openssl/openssl-1.1.0g-r2.ebuild | 287 ------------------------------ |
15 |
3 files changed, 577 deletions(-) |
16 |
|
17 |
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest |
18 |
index b123749d72..9bd5105d08 100644 |
19 |
--- a/dev-libs/openssl/Manifest |
20 |
+++ b/dev-libs/openssl/Manifest |
21 |
@@ -1,36 +1,11 @@ |
22 |
------BEGIN PGP SIGNED MESSAGE----- |
23 |
-Hash: SHA256 |
24 |
- |
25 |
-DIST openssl-1.0.2-patches-1.0.tar.xz 11572 BLAKE2B bdb9d2b8388f1aadf3a9274133aa8f86b0029fae1ce86d005baa39a7347657f8d4d84395b54e8ccd67944356ee197dfb527f843b4f146e305533e2ad5450721d SHA512 15234ade359a0acf001cf10c7a7fc05f54603a44c67831529c2a6eda03342f9ba1cf40664ac782b5b73c50b23ec5649fb48ccff2aea8f0df2ef634959c47e3e9 |
26 |
DIST openssl-1.0.2-patches-1.4.tar.xz 12864 BLAKE2B ace6a782ef97b61af44988f978d089adffb06894617f9d66d3fce664c04d360b2774e1dd38c2171151fa93fe92428d405674bc2d452d520f10da426f95d09aee SHA512 d152af2841f1bf11c7f2a5ebba9a2b903fb4bcdef0468c56af0f9cc8c020adbf4490ac1a62f5bae8cbe18e379934fa997bfda1c2d49ec62365c07a0c0515a72d |
27 |
-DIST openssl-1.0.2n.tar.gz 5375802 BLAKE2B 2e04f8c3d5e2296859b8474d7e100e270f53f18a26c6d37a4cf5e01cd14f44d24d334b4e705da05d77c33b5dc91cffea0feea9f7c83c77ba16c9b6d5f5085894 SHA512 144bf0d6aa27b4af01df0b7b734c39962649e1711554247d42e05e14d8945742b18745aefdba162e2dfc762b941fd7d3b2d5dc6a781ae4ba10a6f5a3cadb0687 |
28 |
DIST openssl-1.0.2o.tar.gz 5329472 BLAKE2B 30226db49be04317da3a76cce68d5aa401decd198f92505bddb0c72a7ef6a79f3c9c06d4a816db734e2a0991ebcab8b207feced26d83639e50c821d9e76ddc45 SHA512 8a2c93657c85143e76785bb32ee836908c31a6f5f8db993fa9777acba6079e630cdddd03edbad65d1587199fc13a1507789eacf038b56eb99139c2091d9df7fd |
29 |
DIST openssl-1.0.2o_ec_curve.c 17254 BLAKE2B d40d8d6e770443f07abe70e2c4ddda6aec1cc8e37dc1f226a3fdd9ed5d228f09c6d372e8956b1948b55ee1d57d1429493e7288d0f54d9466a37fec805c85aacb SHA512 8e92fb100bcf4bd918c82b9a6cbd75a55abe1a2c08230a007e441c51577f974f8cc336e9ac8a672b32641480428ca8cead5380da1fe81bacb088145a1b754a15 |
30 |
DIST openssl-1.0.2o_ectest.c 30735 BLAKE2B 95333a27f1cf0a4305a3cee7f6d46b9d4673582ca9acfcf5ba2a0d9d317ab6219cd0d2ff0ba3a55a317c8f5819342f05cc17ba80ec2c92b2b4cab9a3552382e1 SHA512 f2e4d34327b490bc8371f0845c69df3f9fc51ea16f0ea0de0411a0c1fa9d49bb2b6fafc363eb3b3cd919dc7c24e4a0d075c6ff878c01d70dae918f2540874c19 |
31 |
DIST openssl-1.0.2o_hobble-openssl 1302 BLAKE2B 647caa6a0f4c53a2e77baa3b8e5961eaef3bb0ff38e7d5475eab8deef3439f7fe49028ec9ed0406f3453870b62cac67c496b3a048ee4c9ff4c6866d520235960 SHA512 3d757a4708e74a03dd5cb9b8114dfe442ed9520739a6eca693be4c4265771696f1449ea06d1c9bcfc6e94fc9b0dd0c10e153f1c3b0334831c0550b36cd63326e |
32 |
DIST openssl-1.1.0-build.patch 3028 BLAKE2B f8cf981ed3717af234ce02fa50f27cdbcbf2b766968a5957fc6f0a4ea997549505fa77398444d7f3b9a75f66048447fe62542b9cb1d5f0268add87c44915a6fd SHA512 b19a912900970052f80c67f28975e793ae9e70ebfc62efae0544e09931079e98c4cd29ce1cc8d937ceca97aff9a12fdc1ff9ce6c2b47fea68c79e7065464a0f0 |
33 |
DIST openssl-1.1.0-ec-curves.patch 2967 BLAKE2B 1c639514445ea85cf731732aa7901b5a03ddb5f637b0483ab2ec6825433ad978723c5a07316db684bdaca4a12fc673b4e049a49c0cd4dbe5f25a5e2bd3b75cf5 SHA512 8fb9c6759ae2077ad3697ba77e85ab3970fd8b3f64b21eb260b4f6333b7ebf2f5a53c7eee311229edfbd96a2b904ec5e5e00dfa5b62cf1105fece13069077bd2 |
34 |
-DIST openssl-1.1.0g.tar.gz 5404748 BLAKE2B 23daf80e4143aad4654ae86f8e96042dd7328a9d1186b4922e284fcfe0f68259ea12d21c4472d92d65a7fcef21e049cf9371cc9bdad11b66a3df11286418ed42 SHA512 6c76f698fc2a4540f3977d97c889e139acf7d3f9eb85f349974175e8a7707b19743ef91c5ce32839310b6ea06ca88a03d9709ee011687b4634c5c50b5814f42a |
35 |
-DIST openssl-1.1.0g_ec_curve.c 18393 BLAKE2B 49dca7ddbc23270e5927454925df7bb18c8d9eb58f79e3a4fbcd8b7fc22fad36e2cb54ff9b63c2beeeea15c0c075a96e4ce8d03991355419af41fa9dc2aed3ad SHA512 ee3e576825bccdf02cede4205ab92c42ae9dd3a8e75ce58617a3a5980a61d144eb3c5197d9dcd378a5d49bf34c4b2f591aa6a619fee92b7a22825d72681ab879 |
36 |
-DIST openssl-1.1.0g_ectest.c 29907 BLAKE2B 73dc800c1de5449f14d7753f7f7b8e672cd36bd4570e6df07f246d1d823c7dbbeef492f25cdd0ebfd693f5956732bc84c9d91fc6a22c854fe4b245ecf3890bda SHA512 90cec9d46326cb7216236811c8e963032b6fa7500117cea36f28534eb50a5ab1260c7f9a5c8c490d845236b0769576a8d97bc7471f970e9c5e70cb3408c20dae |
37 |
-DIST openssl-1.1.0g_hobble-openssl 1117 BLAKE2B c3a1477e63331e83cf1cbe58e9ef131ec500a311e22d3da55034800ca353c387b2e202575acf3badb00b236ff91d4bac1bb131a33930939646d26bec27be6e04 SHA512 fa9cc70afa11a7a292548b4bddbba8159824a364ce5c279b483768e6ae2aa4b5491d9bf2cc734819f30a11c8ee0d91bcb991c4a7ab357296aeb4c04feac74826 |
38 |
DIST openssl-1.1.0h.tar.gz 5422717 BLAKE2B 11de1468855c0bb1836fb346c8efdfedd06139a774fc4dbae1b0e95fea7a33aa39b541e3d2d27f83f2b5f4dd3846cca2356020aa6ec81793085842ab78b3a127 SHA512 fb7750fcd98e6126eb5b92e7ed63d811a5cfa3391d98572003d925f6c7b477690df86a9aa1fa6bf6bf33d02c6c7aee6cff50a38faa8911409f310645898fda39 |
39 |
DIST openssl-1.1.0h_ec_curve.c 18393 BLAKE2B 49dca7ddbc23270e5927454925df7bb18c8d9eb58f79e3a4fbcd8b7fc22fad36e2cb54ff9b63c2beeeea15c0c075a96e4ce8d03991355419af41fa9dc2aed3ad SHA512 ee3e576825bccdf02cede4205ab92c42ae9dd3a8e75ce58617a3a5980a61d144eb3c5197d9dcd378a5d49bf34c4b2f591aa6a619fee92b7a22825d72681ab879 |
40 |
DIST openssl-1.1.0h_ectest.c 29907 BLAKE2B 73dc800c1de5449f14d7753f7f7b8e672cd36bd4570e6df07f246d1d823c7dbbeef492f25cdd0ebfd693f5956732bc84c9d91fc6a22c854fe4b245ecf3890bda SHA512 90cec9d46326cb7216236811c8e963032b6fa7500117cea36f28534eb50a5ab1260c7f9a5c8c490d845236b0769576a8d97bc7471f970e9c5e70cb3408c20dae |
41 |
DIST openssl-1.1.0h_hobble-openssl 1117 BLAKE2B c3a1477e63331e83cf1cbe58e9ef131ec500a311e22d3da55034800ca353c387b2e202575acf3badb00b236ff91d4bac1bb131a33930939646d26bec27be6e04 SHA512 fa9cc70afa11a7a292548b4bddbba8159824a364ce5c279b483768e6ae2aa4b5491d9bf2cc734819f30a11c8ee0d91bcb991c4a7ab357296aeb4c04feac74826 |
42 |
------BEGIN PGP SIGNATURE----- |
43 |
- |
44 |
-iQIzBAEBCAAdFiEEqGPdSmYcJzzTeG67KfsOnscZ7iAFAls7eKsACgkQKfsOnscZ |
45 |
-7iDNCg//dj3LXeThnGum2VyJyGrciAj10QNB43ksE+7X3TOjpWU/rheLaLpj7XAN |
46 |
-+SNeVWBYVPKeEHYR0qDEG4lBqi8FaqM3bPQ0ZNwS7mlDL62t1FvujrhzZjBr+xfo |
47 |
-Pd94GJG4bV/ll8IDDAkKKmFMV9nLU0ek1KDCXX+gR8+YAgY4S4YhCNWhHSJXYyxO |
48 |
-Zi33cPKT8gf2DM1wcHkONoStsM2JZUOUUhCAnAxH39v2/ushwjeZgNNw1w6ae1pI |
49 |
-IELqHlvGCYfXz1xZFWpqbyq4HzEotJIuMM2YJcfFYo/Bdoeb3Nwj8kEpnvCJ9BnA |
50 |
-1a8w8E4r6SK2JLLlCGDxg82uA5QaHil829NYlFX+pV4p0F7LzOJwwo0MQCTJnKFZ |
51 |
-4dLamG6bSy0c3S/Wqr57hvsrK+UF3yUVuV4rHM9BSPHzt0OW4y6mFiO3KxaU+/Le |
52 |
-k9xargIz+HrQbbzU0Oj/zvYcbtbL6kRJL+nmjSOTl6QAwqn2JCKr0d2idrpain2n |
53 |
-rHxlfXqB8+SjlU9FKPZ6xD1Cn4CewedjsLY8SI2UtOt9aqHnaA4JQCL9cWRX6EKW |
54 |
-iHjalWFOtO/9cTMrUk47lBJdfDaaCkMyun2qnWSuF0n5za56rPzMk6QYhgsx8/NW |
55 |
-wJ3nc35oc7mN6/3Q+11RJ3C7i8mJPW5CT48a4l/ybLIym/rzo6Q= |
56 |
-=S5JQ |
57 |
------END PGP SIGNATURE----- |
58 |
|
59 |
diff --git a/dev-libs/openssl/openssl-1.0.2n.ebuild b/dev-libs/openssl/openssl-1.0.2n.ebuild |
60 |
deleted file mode 100644 |
61 |
index bf7e07e097..0000000000 |
62 |
--- a/dev-libs/openssl/openssl-1.0.2n.ebuild |
63 |
+++ /dev/null |
64 |
@@ -1,265 +0,0 @@ |
65 |
-# Copyright 1999-2018 Gentoo Foundation |
66 |
-# Distributed under the terms of the GNU General Public License v2 |
67 |
- |
68 |
-EAPI="6" |
69 |
- |
70 |
-inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal |
71 |
- |
72 |
-PATCH_SET="openssl-1.0.2-patches-1.0" |
73 |
-MY_P=${P/_/-} |
74 |
-DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)" |
75 |
-HOMEPAGE="https://www.openssl.org/" |
76 |
-SRC_URI="mirror://openssl/source/${MY_P}.tar.gz |
77 |
- mirror://gentoo/${PATCH_SET}.tar.xz |
78 |
- https://dev.gentoo.org/~whissi/dist/${PN}/${PATCH_SET}.tar.xz" |
79 |
- |
80 |
-LICENSE="openssl" |
81 |
-SLOT="0" |
82 |
-KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" |
83 |
-IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib" |
84 |
-RESTRICT="!bindist? ( bindist )" |
85 |
- |
86 |
-RDEPEND=">=app-misc/c_rehash-1.7-r1 |
87 |
- gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] ) |
88 |
- zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] ) |
89 |
- kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] )" |
90 |
-DEPEND="${RDEPEND} |
91 |
- >=dev-lang/perl-5 |
92 |
- sctp? ( >=net-misc/lksctp-tools-1.0.12 ) |
93 |
- test? ( |
94 |
- sys-apps/diffutils |
95 |
- sys-devel/bc |
96 |
- )" |
97 |
-PDEPEND="app-misc/ca-certificates" |
98 |
- |
99 |
-S="${WORKDIR}/${MY_P}" |
100 |
- |
101 |
-MULTILIB_WRAPPED_HEADERS=( |
102 |
- usr/include/openssl/opensslconf.h |
103 |
-) |
104 |
- |
105 |
-src_prepare() { |
106 |
- # keep this in sync with app-misc/c_rehash |
107 |
- SSL_CNF_DIR="/etc/ssl" |
108 |
- |
109 |
- # Make sure we only ever touch Makefile.org and avoid patching a file |
110 |
- # that gets blown away anyways by the Configure script in src_configure |
111 |
- rm -f Makefile |
112 |
- |
113 |
- if ! use vanilla ; then |
114 |
- eapply "${WORKDIR}"/patch/*.patch |
115 |
- fi |
116 |
- |
117 |
- eapply_user |
118 |
- |
119 |
- # Solaris /bin/sh does not support "[ -e file ]", added by patches |
120 |
- sed -e 's/\[ -e /\[ -r /' -i Makefile.shared |
121 |
- |
122 |
- # disable fips in the build |
123 |
- # make sure the man pages are suffixed #302165 |
124 |
- # don't bother building man pages if they're disabled |
125 |
- sed -i \ |
126 |
- -e '/DIRS/s: fips : :g' \ |
127 |
- -e '/^MANSUFFIX/s:=.*:=ssl:' \ |
128 |
- -e '/^MAKEDEPPROG/s:=.*:=$(CC):' \ |
129 |
- -e $(has noman FEATURES \ |
130 |
- && echo '/^install:/s:install_docs::' \ |
131 |
- || echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \ |
132 |
- Makefile.org \ |
133 |
- || die |
134 |
- # show the actual commands in the log |
135 |
- sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared |
136 |
- |
137 |
- epatch "${FILESDIR}"/${PN}-1.0.2a-aix-soname.patch # like libtool |
138 |
- epatch "${FILESDIR}"/${PN}-0.9.8g-engines-installnames.patch |
139 |
- epatch "${FILESDIR}"/${PN}-1.0.0b-darwin-bundle-compile-fix.patch |
140 |
- epatch "${FILESDIR}"/${PN}-1.0.2-gethostbyname2-solaris.patch |
141 |
- epatch "${FILESDIR}"/${PN}-1.0.2l-winnt.patch # parity |
142 |
- epatch "${FILESDIR}"/${PN}-1.0.2l-mint.patch |
143 |
- |
144 |
- # remove -arch for Darwin |
145 |
- sed -i '/^"darwin/s,-arch [^ ]\+,,g' Configure || die |
146 |
- |
147 |
- # since we're forcing $(CC) as makedep anyway, just fix |
148 |
- # the conditional as always-on |
149 |
- # helps clang (#417795), and versioned gcc (#499818) |
150 |
- sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || die |
151 |
- |
152 |
- # quiet out unknown driver argument warnings since openssl |
153 |
- # doesn't have well-split CFLAGS and we're making it even worse |
154 |
- # and 'make depend' uses -Werror for added fun (#417795 again) |
155 |
- [[ ${CC} == *clang* ]] && append-flags -Qunused-arguments |
156 |
- |
157 |
- # allow openssl to be cross-compiled |
158 |
- cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die |
159 |
- chmod a+rx gentoo.config || die |
160 |
- |
161 |
- append-flags -fno-strict-aliasing |
162 |
- append-flags $(test-flags-CC -Wa,--noexecstack) |
163 |
- append-cppflags -DOPENSSL_NO_BUF_FREELISTS |
164 |
- |
165 |
- sed -i '1s,^:$,#!'"$(type -P perl)"',' Configure #141906 |
166 |
- # The config script does stupid stuff to prompt the user. Kill it. |
167 |
- sed -i '/stty -icanon min 0 time 50; read waste/d' config || die |
168 |
- ./config --test-sanity || die "I AM NOT SANE" |
169 |
- |
170 |
- multilib_copy_sources |
171 |
-} |
172 |
- |
173 |
-multilib_src_configure() { |
174 |
- unset APPS #197996 |
175 |
- unset SCRIPTS #312551 |
176 |
- unset CROSS_COMPILE #311473 |
177 |
- |
178 |
- tc-export CC AR RANLIB RC |
179 |
- |
180 |
- # Clean out patent-or-otherwise-encumbered code |
181 |
- # Camellia: Royalty Free http://en.wikipedia.org/wiki/Camellia_(cipher) |
182 |
- # IDEA: Expired http://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm |
183 |
- # EC: ????????? ??/??/2015 http://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography |
184 |
- # MDC2: Expired http://en.wikipedia.org/wiki/MDC-2 |
185 |
- # RC5: Expired http://en.wikipedia.org/wiki/RC5 |
186 |
- |
187 |
- use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; } |
188 |
- echoit() { echo "$@" ; "$@" ; } |
189 |
- |
190 |
- local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal") |
191 |
- |
192 |
- # See if our toolchain supports __uint128_t. If so, it's 64bit |
193 |
- # friendly and can use the nicely optimized code paths. #460790 |
194 |
- local ec_nistp_64_gcc_128 |
195 |
- # Disable it for now though #469976 |
196 |
- #if ! use bindist ; then |
197 |
- # echo "__uint128_t i;" > "${T}"/128.c |
198 |
- # if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then |
199 |
- # ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128" |
200 |
- # fi |
201 |
- #fi |
202 |
- |
203 |
- # https://github.com/openssl/openssl/issues/2286 |
204 |
- if use ia64 ; then |
205 |
- replace-flags -g3 -g2 |
206 |
- replace-flags -ggdb3 -ggdb2 |
207 |
- fi |
208 |
- |
209 |
- local sslout=$(./gentoo.config) |
210 |
- einfo "Use configuration ${sslout:-(openssl knows best)}" |
211 |
- local config="Configure" |
212 |
- [[ -z ${sslout} ]] && config="config" |
213 |
- |
214 |
- echoit \ |
215 |
- ./${config} \ |
216 |
- ${sslout} \ |
217 |
- $(use cpu_flags_x86_sse2 || echo "no-sse2") \ |
218 |
- enable-camellia \ |
219 |
- $(use_ssl !bindist ec) \ |
220 |
- ${ec_nistp_64_gcc_128} \ |
221 |
- enable-idea \ |
222 |
- enable-mdc2 \ |
223 |
- enable-rc5 \ |
224 |
- enable-tlsext \ |
225 |
- $(use_ssl asm) \ |
226 |
- $(use_ssl gmp gmp -lgmp) \ |
227 |
- $(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \ |
228 |
- $(use_ssl rfc3779) \ |
229 |
- $(use_ssl sctp) \ |
230 |
- $(use_ssl sslv2 ssl2) \ |
231 |
- $(use_ssl sslv3 ssl3) \ |
232 |
- $(use_ssl tls-heartbeat heartbeats) \ |
233 |
- $(use_ssl zlib) \ |
234 |
- --prefix="${EPREFIX}"/usr \ |
235 |
- --openssldir="${EPREFIX}"${SSL_CNF_DIR} \ |
236 |
- --libdir=$(get_libdir) \ |
237 |
- shared threads \ |
238 |
- || die |
239 |
- |
240 |
- # Clean out hardcoded flags that openssl uses |
241 |
- local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \ |
242 |
- -e 's:^CFLAG=::' \ |
243 |
- -e 's:-fomit-frame-pointer ::g' \ |
244 |
- -e 's:-O[0-9] ::g' \ |
245 |
- -e 's:-march=[-a-z0-9]* ::g' \ |
246 |
- -e 's:-mcpu=[-a-z0-9]* ::g' \ |
247 |
- -e 's:-m[a-z0-9]* ::g' \ |
248 |
- ) |
249 |
- sed -i \ |
250 |
- -e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \ |
251 |
- -e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \ |
252 |
- Makefile || die |
253 |
-} |
254 |
- |
255 |
-multilib_src_compile() { |
256 |
- # depend is needed to use $confopts; it also doesn't matter |
257 |
- # that it's -j1 as the code itself serializes subdirs |
258 |
- emake -j1 depend |
259 |
- emake all |
260 |
- # rehash is needed to prep the certs/ dir; do this |
261 |
- # separately to avoid parallel build issues. |
262 |
- emake rehash |
263 |
-} |
264 |
- |
265 |
-multilib_src_test() { |
266 |
- emake -j1 test |
267 |
-} |
268 |
- |
269 |
-multilib_src_install() { |
270 |
- emake INSTALL_PREFIX="${D}" install |
271 |
-} |
272 |
- |
273 |
-multilib_src_install_all() { |
274 |
- # openssl installs perl version of c_rehash by default, but |
275 |
- # we provide a shell version via app-misc/c_rehash |
276 |
- rm "${ED}"/usr/bin/c_rehash || die |
277 |
- |
278 |
- local -a DOCS=( CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el ) |
279 |
- einstalldocs |
280 |
- |
281 |
- use rfc3779 && dodoc engines/ccgost/README.gost |
282 |
- |
283 |
- # This is crappy in that the static archives are still built even |
284 |
- # when USE=static-libs. But this is due to a failing in the openssl |
285 |
- # build system: the static archives are built as PIC all the time. |
286 |
- # Only way around this would be to manually configure+compile openssl |
287 |
- # twice; once with shared lib support enabled and once without. |
288 |
- use static-libs || find "${ED}"usr/lib* -mindepth 1 -maxdepth 1 \ |
289 |
- -name "lib*.a" -not -name "*.dll.a" -not -name "*$(get_libname)" -delete |
290 |
- |
291 |
- # create the certs directory |
292 |
- dodir ${SSL_CNF_DIR}/certs |
293 |
- cp -RP certs/* "${ED}"${SSL_CNF_DIR}/certs/ || die |
294 |
- rm -r "${ED}"${SSL_CNF_DIR}/certs/{demo,expired} |
295 |
- |
296 |
- # Namespace openssl programs to prevent conflicts with other man pages |
297 |
- cd "${ED}"/usr/share/man |
298 |
- local m d s |
299 |
- for m in $(find . -type f | xargs grep -L '#include') ; do |
300 |
- d=${m%/*} ; d=${d#./} ; m=${m##*/} |
301 |
- [[ ${m} == openssl.1* ]] && continue |
302 |
- [[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!" |
303 |
- mv ${d}/{,ssl-}${m} |
304 |
- # fix up references to renamed man pages |
305 |
- sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m} |
306 |
- ln -s ssl-${m} ${d}/openssl-${m} |
307 |
- # locate any symlinks that point to this man page ... we assume |
308 |
- # that any broken links are due to the above renaming |
309 |
- for s in $(find -L ${d} -type l) ; do |
310 |
- s=${s##*/} |
311 |
- rm -f ${d}/${s} |
312 |
- ln -s ssl-${m} ${d}/ssl-${s} |
313 |
- ln -s ssl-${s} ${d}/openssl-${s} |
314 |
- done |
315 |
- done |
316 |
- [[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :(" |
317 |
- |
318 |
- dodir /etc/sandbox.d #254521 |
319 |
- echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl |
320 |
- |
321 |
- diropts -m0700 |
322 |
- keepdir ${SSL_CNF_DIR}/private |
323 |
-} |
324 |
- |
325 |
-pkg_postinst() { |
326 |
- ebegin "Running 'c_rehash ${EROOT%/}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069" |
327 |
- c_rehash "${EROOT%/}${SSL_CNF_DIR}/certs" >/dev/null |
328 |
- eend $? |
329 |
-} |
330 |
|
331 |
diff --git a/dev-libs/openssl/openssl-1.1.0g-r2.ebuild b/dev-libs/openssl/openssl-1.1.0g-r2.ebuild |
332 |
deleted file mode 100644 |
333 |
index 1d02605858..0000000000 |
334 |
--- a/dev-libs/openssl/openssl-1.1.0g-r2.ebuild |
335 |
+++ /dev/null |
336 |
@@ -1,287 +0,0 @@ |
337 |
-# Copyright 1999-2018 Gentoo Foundation |
338 |
-# Distributed under the terms of the GNU General Public License v2 |
339 |
- |
340 |
-EAPI="6" |
341 |
- |
342 |
-inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal |
343 |
- |
344 |
-MY_P=${P/_/-} |
345 |
-DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)" |
346 |
-HOMEPAGE="http://www.openssl.org/" |
347 |
-SRC_URI="mirror://openssl/source/${MY_P}.tar.gz" |
348 |
- |
349 |
-LICENSE="openssl" |
350 |
-SLOT="0/1.1" # .so version of libssl/libcrypto |
351 |
-KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" |
352 |
-IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 static-libs test tls-heartbeat vanilla zlib" |
353 |
-RESTRICT="!bindist? ( bindist )" |
354 |
- |
355 |
-RDEPEND=">=app-misc/c_rehash-1.7-r1 |
356 |
- zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )" |
357 |
-DEPEND="${RDEPEND} |
358 |
- >=dev-lang/perl-5 |
359 |
- sctp? ( >=net-misc/lksctp-tools-1.0.12 ) |
360 |
- test? ( |
361 |
- sys-apps/diffutils |
362 |
- sys-devel/bc |
363 |
- )" |
364 |
-PDEPEND="app-misc/ca-certificates" |
365 |
- |
366 |
-# This does not copy the entire Fedora patchset, but JUST the parts that |
367 |
-# are needed to make it safe to use EC with RESTRICT=bindist. |
368 |
-# See openssl.spec for the matching numbering of SourceNNN, PatchNNN |
369 |
-SOURCE1=hobble-openssl |
370 |
-SOURCE12=ec_curve.c |
371 |
-SOURCE13=ectest.c |
372 |
-PATCH1=openssl-1.1.0-build.patch # Fixes EVP testcase for EC |
373 |
-PATCH37=openssl-1.1.0-ec-curves.patch |
374 |
-FEDORA_GIT_BASE='https://src.fedoraproject.org/cgit/rpms/openssl.git/plain/' |
375 |
-FEDORA_GIT_BRANCH='f27' |
376 |
-FEDORA_SRC_URI=() |
377 |
-FEDORA_SOURCE=( $SOURCE1 $SOURCE12 $SOURCE13 ) |
378 |
-FEDORA_PATCH=( $PATCH1 $PATCH37 ) |
379 |
-for i in "${FEDORA_SOURCE[@]}" ; do |
380 |
- FEDORA_SRC_URI+=( "${FEDORA_GIT_BASE}/${i}?h=${FEDORA_GIT_BRANCH} -> ${P}_${i}" ) |
381 |
-done |
382 |
-for i in "${FEDORA_PATCH[@]}" ; do # Already have a version prefix |
383 |
- FEDORA_SRC_URI+=( "${FEDORA_GIT_BASE}/${i}?h=${FEDORA_GIT_BRANCH} -> ${i}" ) |
384 |
-done |
385 |
-SRC_URI+=" bindist? ( ${FEDORA_SRC_URI[@]} )" |
386 |
- |
387 |
-S="${WORKDIR}/${MY_P}" |
388 |
- |
389 |
-MULTILIB_WRAPPED_HEADERS=( |
390 |
- usr/include/openssl/opensslconf.h |
391 |
-) |
392 |
- |
393 |
-PATCHES=( |
394 |
- "${FILESDIR}"/${PN}-1.0.2a-x32-asm.patch #542618 |
395 |
- "${FILESDIR}"/${PN}-1.1.0g-CVE-2017-3738.patch |
396 |
-) |
397 |
- |
398 |
-src_prepare() { |
399 |
- if use bindist; then |
400 |
- # This just removes the prefix, and puts it into WORKDIR like the RPM. |
401 |
- for i in "${FEDORA_SOURCE[@]}" ; do |
402 |
- cp -f "${DISTDIR}"/"${P}_${i}" "${WORKDIR}"/"${i}" || die |
403 |
- done |
404 |
- # .spec %prep |
405 |
- bash "${WORKDIR}"/"${SOURCE1}" || die |
406 |
- cp -f "${WORKDIR}"/"${SOURCE12}" "${S}"/crypto/ec/ || die |
407 |
- cp -f "${WORKDIR}"/"${SOURCE13}" "${S}"/test/ || die |
408 |
- for i in "${FEDORA_PATCH[@]}" ; do |
409 |
- epatch "${DISTDIR}"/"${i}" |
410 |
- done |
411 |
- # Also see the configure parts below: |
412 |
- # enable-ec \ |
413 |
- # $(use_ssl !bindist ec2m) \ |
414 |
- |
415 |
- fi |
416 |
- # keep this in sync with app-misc/c_rehash |
417 |
- SSL_CNF_DIR="/etc/ssl" |
418 |
- |
419 |
- # Make sure we only ever touch Makefile.org and avoid patching a file |
420 |
- # that gets blown away anyways by the Configure script in src_configure |
421 |
- rm -f Makefile |
422 |
- |
423 |
- if ! use vanilla ; then |
424 |
- epatch "${PATCHES[@]}" |
425 |
- fi |
426 |
- |
427 |
- epatch "${FILESDIR}"/${PN}-1.1.0f-winnt.patch # parity |
428 |
- |
429 |
- eapply_user #332661 |
430 |
- |
431 |
- # make sure the man pages are suffixed #302165 |
432 |
- # don't bother building man pages if they're disabled |
433 |
- # Make DOCDIR Gentoo compliant |
434 |
- sed -i \ |
435 |
- -e '/^MANSUFFIX/s:=.*:=ssl:' \ |
436 |
- -e '/^MAKEDEPPROG/s:=.*:=$(CC):' \ |
437 |
- -e $(has noman FEATURES \ |
438 |
- && echo '/^install:/s:install_docs::' \ |
439 |
- || echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \ |
440 |
- -e "/^DOCDIR/s@\$(BASENAME)@&-${PF}@" \ |
441 |
- Configurations/unix-Makefile.tmpl \ |
442 |
- || die |
443 |
- |
444 |
- # show the actual commands in the log |
445 |
- sed -i '/^SET_X/s@=.*@=set -x@' Makefile.shared |
446 |
- |
447 |
- # quiet out unknown driver argument warnings since openssl |
448 |
- # doesn't have well-split CFLAGS and we're making it even worse |
449 |
- # and 'make depend' uses -Werror for added fun (#417795 again) |
450 |
- [[ ${CC} == *clang* ]] && append-flags -Qunused-arguments |
451 |
- |
452 |
- # allow openssl to be cross-compiled |
453 |
- cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die |
454 |
- chmod a+rx gentoo.config |
455 |
- |
456 |
- append-flags -fno-strict-aliasing |
457 |
- append-flags $(test-flags-CC -Wa,--noexecstack) |
458 |
- append-cppflags -DOPENSSL_NO_BUF_FREELISTS |
459 |
- |
460 |
- # Prefixify Configure shebang (#141906) |
461 |
- sed \ |
462 |
- -e "1s,/usr/bin/env,$(type -P env)," \ |
463 |
- -i Configure || die |
464 |
- # Remove test target when FEATURES=test isn't set |
465 |
- if ! use test ; then |
466 |
- sed \ |
467 |
- -e '/^$config{dirs}/s@ "test",@@' \ |
468 |
- -i Configure || die |
469 |
- fi |
470 |
- # The config script does stupid stuff to prompt the user. Kill it. |
471 |
- sed -i '/stty -icanon min 0 time 50; read waste/d' config || die |
472 |
- ./config --test-sanity || die "I AM NOT SANE" |
473 |
- |
474 |
- multilib_copy_sources |
475 |
-} |
476 |
- |
477 |
-multilib_src_configure() { |
478 |
- unset APPS #197996 |
479 |
- unset SCRIPTS #312551 |
480 |
- unset CROSS_COMPILE #311473 |
481 |
- |
482 |
- tc-export CC AR RANLIB RC |
483 |
- |
484 |
- # Clean out patent-or-otherwise-encumbered code |
485 |
- # Camellia: Royalty Free http://en.wikipedia.org/wiki/Camellia_(cipher) |
486 |
- # IDEA: Expired http://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm |
487 |
- # EC: ????????? ??/??/2015 http://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography |
488 |
- # MDC2: Expired http://en.wikipedia.org/wiki/MDC-2 |
489 |
- # RC5: Expired http://en.wikipedia.org/wiki/RC5 |
490 |
- |
491 |
- use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; } |
492 |
- echoit() { echo "$@" ; "$@" ; } |
493 |
- |
494 |
- local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal") |
495 |
- |
496 |
- # See if our toolchain supports __uint128_t. If so, it's 64bit |
497 |
- # friendly and can use the nicely optimized code paths. #460790 |
498 |
- local ec_nistp_64_gcc_128 |
499 |
- # Disable it for now though #469976 |
500 |
- #if ! use bindist ; then |
501 |
- # echo "__uint128_t i;" > "${T}"/128.c |
502 |
- # if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then |
503 |
- # ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128" |
504 |
- # fi |
505 |
- #fi |
506 |
- |
507 |
- local sslout=$(./gentoo.config) |
508 |
- einfo "Use configuration ${sslout:-(openssl knows best)}" |
509 |
- local config="Configure" |
510 |
- [[ -z ${sslout} ]] && config="config" |
511 |
- |
512 |
- # Fedora hobbled-EC needs 'no-ec2m' |
513 |
- # 'srp' was restricted until early 2017 as well. |
514 |
- echoit \ |
515 |
- ./${config} \ |
516 |
- ${sslout} \ |
517 |
- --api=1.0.0 \ |
518 |
- $(use cpu_flags_x86_sse2 || echo "no-sse2") \ |
519 |
- enable-camellia \ |
520 |
- disable-deprecated \ |
521 |
- enable-ec \ |
522 |
- $(use_ssl !bindist ec2m) \ |
523 |
- enable-srp \ |
524 |
- $(use elibc_musl && echo "no-async") \ |
525 |
- ${ec_nistp_64_gcc_128} \ |
526 |
- enable-idea \ |
527 |
- enable-mdc2 \ |
528 |
- enable-rc5 \ |
529 |
- $(use_ssl asm) \ |
530 |
- $(use_ssl rfc3779) \ |
531 |
- $(use_ssl sctp) \ |
532 |
- $(use_ssl tls-heartbeat heartbeats) \ |
533 |
- $(use_ssl zlib) \ |
534 |
- --prefix="${EPREFIX}"/usr \ |
535 |
- --openssldir="${EPREFIX}"${SSL_CNF_DIR} \ |
536 |
- --libdir=$(get_libdir) \ |
537 |
- shared threads \ |
538 |
- || die |
539 |
- |
540 |
- # Clean out hardcoded flags that openssl uses |
541 |
- # Fix quoting for sed |
542 |
- local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \ |
543 |
- -e 's:^CFLAGS=::' \ |
544 |
- -e 's:-fomit-frame-pointer ::g' \ |
545 |
- -e 's:-O[0-9] ::g' \ |
546 |
- -e 's:-march=[-a-z0-9]* ::g' \ |
547 |
- -e 's:-mcpu=[-a-z0-9]* ::g' \ |
548 |
- -e 's:-m[a-z0-9]* ::g' \ |
549 |
- -e 's:\\:\\\\:g' \ |
550 |
- ) |
551 |
- sed -i \ |
552 |
- -e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \ |
553 |
- -e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \ |
554 |
- Makefile || die |
555 |
-} |
556 |
- |
557 |
-multilib_src_compile() { |
558 |
- # depend is needed to use $confopts; it also doesn't matter |
559 |
- # that it's -j1 as the code itself serializes subdirs |
560 |
- emake -j1 depend |
561 |
- emake all |
562 |
-} |
563 |
- |
564 |
-multilib_src_test() { |
565 |
- emake -j1 test |
566 |
-} |
567 |
- |
568 |
-multilib_src_install() { |
569 |
- emake DESTDIR="${D}" install |
570 |
-} |
571 |
- |
572 |
-multilib_src_install_all() { |
573 |
- # openssl installs perl version of c_rehash by default, but |
574 |
- # we provide a shell version via app-misc/c_rehash |
575 |
- rm "${ED}"/usr/bin/c_rehash || die |
576 |
- |
577 |
- dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el |
578 |
- |
579 |
- # This is crappy in that the static archives are still built even |
580 |
- # when USE=static-libs. But this is due to a failing in the openssl |
581 |
- # build system: the static archives are built as PIC all the time. |
582 |
- # Only way around this would be to manually configure+compile openssl |
583 |
- # twice; once with shared lib support enabled and once without. |
584 |
- use static-libs || find "${ED}"usr/lib* -mindepth 1 -maxdepth 1 \ |
585 |
- -name "lib*.a" -not -name "*.dll.a" -not -name "*$(get_libname)" -delete |
586 |
- |
587 |
- # create the certs directory |
588 |
- keepdir ${SSL_CNF_DIR}/certs |
589 |
- |
590 |
- # Namespace openssl programs to prevent conflicts with other man pages |
591 |
- cd "${ED}"/usr/share/man |
592 |
- local m d s |
593 |
- for m in $(find . -type f | xargs grep -L '#include') ; do |
594 |
- d=${m%/*} ; d=${d#./} ; m=${m##*/} |
595 |
- [[ ${m} == openssl.1* ]] && continue |
596 |
- [[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!" |
597 |
- mv ${d}/{,ssl-}${m} |
598 |
- # fix up references to renamed man pages |
599 |
- sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m} |
600 |
- ln -s ssl-${m} ${d}/openssl-${m} |
601 |
- # locate any symlinks that point to this man page ... we assume |
602 |
- # that any broken links are due to the above renaming |
603 |
- for s in $(find -L ${d} -type l) ; do |
604 |
- s=${s##*/} |
605 |
- rm -f ${d}/${s} |
606 |
- ln -s ssl-${m} ${d}/ssl-${s} |
607 |
- ln -s ssl-${s} ${d}/openssl-${s} |
608 |
- done |
609 |
- done |
610 |
- [[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :(" |
611 |
- |
612 |
- dodir /etc/sandbox.d #254521 |
613 |
- echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl |
614 |
- |
615 |
- diropts -m0700 |
616 |
- keepdir ${SSL_CNF_DIR}/private |
617 |
-} |
618 |
- |
619 |
-pkg_postinst() { |
620 |
- ebegin "Running 'c_rehash ${EROOT%/}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069" |
621 |
- c_rehash "${EROOT%/}${SSL_CNF_DIR}/certs" >/dev/null |
622 |
- eend $? |
623 |
-} |