[patch] openssl-1.1.0f-r2.ebuild-Fedora-Hobbled-EC.patch

openssl-1.1.0f-r2.ebuild-Fedora-Hobbled-EC.patch (text/plain), 1.61 KB, created by Robin Johnson on 2017-10-13 17:39:33 UTC

29a30,50
> # This does not copy the entire Fedora patchset, but JUST the parts that
> # are needed to make it safe to use EC with RESTRICT=bindist.
> # See openssl.spec for the matching numbering of SourceNNN, PatchNNN
> SOURCE1=hobble-openssl
> SOURCE12=ec_curve.c
> SOURCE13=ectest.c
> PATCH1=openssl-1.1.0-build.patch # Fixes EVP testcase for EC
> PATCH37=openssl-1.1.0-ec-curves.patch
> FEDORA_GIT_BASE='https://src.fedoraproject.org/cgit/rpms/openssl.git/plain/'
> FEDORA_GIT_BRANCH='f27'
> FEDORA_SRC_URI=()
> FEDORA_SOURCE=( $SOURCE1 $SOURCE12 $SOURCE13 )
> FEDORA_PATCH=( $PATCH1 $PATCH37 )
> for i in "${FEDORA_SOURCE[@]}" ; do
> 	FEDORA_SRC_URI+=( "${FEDORA_GIT_BASE}/${i}?h=${FEDORA_GIT_BRANCH} -> ${P}_${i}" )
> done
> for i in "${FEDORA_PATCH[@]}" do # Already have a version prefix
> 	FEDORA_SRC_URI+=( "${FEDORA_GIT_BASE}/${i}?h=${FEDORA_GIT_BRANCH} -> ${i}" )
> done
> SRC_URI+=" bindist? ( ${FEDORA_SRC_URI[@]} )"
> 
40a62,78
> 	if use bindist; then
> 		# This just removes the prefix, and puts it into WORKDIR like the RPM.
> 		for i in "${FEDORA_SOURCE[@]}" ; do
> 			cp -f "${DISTDIR}"/"${P}_${i}" "${WORKDIR}"/ || die
> 		done
> 		# .spec %prep
> 		bash "${WORKDIR}"/"${SOURCE1}" || die
> 		cp -f "${WORKDIR}"/"${SOURCE12}" "${S}"/crypto/ec/ || die
> 		cp -f "${WORKDIR}"/"${SOURCE13}" "${S}"/test/ || die
> 		for i in "${FEDORA_PATCH[@]}" ; do
> 			epatch "${DISTDIR}"/"${i}"
> 		done
> 		# Also see the configure parts below:
> 		# enable-ec \
> 		# $(use_ssl !bindist ec2m) \
> 
> 	fi
134a173
> 	# Fedora hobbled-EC needs 'no-ec2m'.
141c180,181
< 		$(use_ssl !bindist ec) \
---
> 		enable-ec \
> 		$(use_ssl !bindist ec2m) \