Lines 27-32
Link Here
|
27 |
)" |
27 |
)" |
28 |
PDEPEND="app-misc/ca-certificates" |
28 |
PDEPEND="app-misc/ca-certificates" |
29 |
|
29 |
|
|
|
30 |
# This does not copy the entire Fedora patchset, but JUST the parts that |
31 |
# are needed to make it safe to use EC with RESTRICT=bindist. |
32 |
# See openssl.spec for the matching numbering of SourceNNN, PatchNNN |
33 |
SOURCE1=hobble-openssl |
34 |
SOURCE12=ec_curve.c |
35 |
SOURCE13=ectest.c |
36 |
PATCH1=openssl-1.1.0-build.patch # Fixes EVP testcase for EC |
37 |
PATCH37=openssl-1.1.0-ec-curves.patch |
38 |
FEDORA_GIT_BASE='https://src.fedoraproject.org/cgit/rpms/openssl.git/plain/' |
39 |
FEDORA_GIT_BRANCH='f27' |
40 |
FEDORA_SRC_URI=() |
41 |
FEDORA_SOURCE=( $SOURCE1 $SOURCE12 $SOURCE13 ) |
42 |
FEDORA_PATCH=( $PATCH1 $PATCH37 ) |
43 |
for i in "${FEDORA_SOURCE[@]}" ; do |
44 |
FEDORA_SRC_URI+=( "${FEDORA_GIT_BASE}/${i}?h=${FEDORA_GIT_BRANCH} -> ${P}_${i}" ) |
45 |
done |
46 |
for i in "${FEDORA_PATCH[@]}" ; do # Already have a version prefix |
47 |
FEDORA_SRC_URI+=( "${FEDORA_GIT_BASE}/${i}?h=${FEDORA_GIT_BRANCH} -> ${i}" ) |
48 |
done |
49 |
SRC_URI+=" bindist? ( ${FEDORA_SRC_URI[@]} )" |
50 |
|
30 |
S="${WORKDIR}/${MY_P}" |
51 |
S="${WORKDIR}/${MY_P}" |
31 |
|
52 |
|
32 |
MULTILIB_WRAPPED_HEADERS=( |
53 |
MULTILIB_WRAPPED_HEADERS=( |
Lines 38-43
Link Here
|
38 |
) |
59 |
) |
39 |
|
60 |
|
40 |
src_prepare() { |
61 |
src_prepare() { |
|
|
62 |
if use bindist; then |
63 |
# This just removes the prefix, and puts it into WORKDIR like the RPM. |
64 |
for i in "${FEDORA_SOURCE[@]}" ; do |
65 |
cp -f "${DISTDIR}"/"${P}_${i}" "${WORKDIR}"/ || die |
66 |
done |
67 |
# .spec %prep |
68 |
bash "${WORKDIR}"/"${SOURCE1}" || die |
69 |
cp -f "${WORKDIR}"/"${SOURCE12}" "${S}"/crypto/ec/ || die |
70 |
cp -f "${WORKDIR}"/"${SOURCE13}" "${S}"/test/ || die |
71 |
for i in "${FEDORA_PATCH[@]}" ; do |
72 |
epatch "${DISTDIR}"/"${i}" |
73 |
done |
74 |
# Also see the configure parts below: |
75 |
# enable-ec \ |
76 |
# $(use_ssl !bindist ec2m) \ |
77 |
|
78 |
fi |
41 |
# keep this in sync with app-misc/c_rehash |
79 |
# keep this in sync with app-misc/c_rehash |
42 |
SSL_CNF_DIR="/etc/ssl" |
80 |
SSL_CNF_DIR="/etc/ssl" |
43 |
|
81 |
|
Lines 132-144
Link Here
|
132 |
[[ -z ${sslout} ]] && config="config" |
170 |
[[ -z ${sslout} ]] && config="config" |
133 |
|
171 |
|
134 |
echoit \ |
172 |
echoit \ |
|
|
173 |
# Fedora hobbled-EC needs 'no-ec2m'. |
135 |
./${config} \ |
174 |
./${config} \ |
136 |
${sslout} \ |
175 |
${sslout} \ |
137 |
--api=1.0.0 \ |
176 |
--api=1.0.0 \ |
138 |
$(use cpu_flags_x86_sse2 || echo "no-sse2") \ |
177 |
$(use cpu_flags_x86_sse2 || echo "no-sse2") \ |
139 |
enable-camellia \ |
178 |
enable-camellia \ |
140 |
disable-deprecated \ |
179 |
disable-deprecated \ |
141 |
$(use_ssl !bindist ec) \ |
180 |
enable-ec \ |
|
|
181 |
$(use_ssl !bindist ec2m) \ |
142 |
${ec_nistp_64_gcc_128} \ |
182 |
${ec_nistp_64_gcc_128} \ |
143 |
enable-idea \ |
183 |
enable-idea \ |
144 |
enable-mdc2 \ |
184 |
enable-mdc2 \ |