diff options
Diffstat (limited to 'dev-libs/openssl/openssl-1.1.0j.ebuild')
| -rw-r--r-- | dev-libs/openssl/openssl-1.1.0j.ebuild | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/dev-libs/openssl/openssl-1.1.0j.ebuild b/dev-libs/openssl/openssl-1.1.0j.ebuild index 9394eac25327..0fd5ce0918c8 100644 --- a/dev-libs/openssl/openssl-1.1.0j.ebuild +++ b/dev-libs/openssl/openssl-1.1.0j.ebuild @@ -37,14 +37,15 @@ 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='f28' +FEDORA_GIT_COMMIT="d2ede125556ac99aa0faa7744c703af3f559094e" 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}" ) + FEDORA_SRC_URI+=( "${FEDORA_GIT_BASE}/${i}?h=${FEDORA_GIT_BRANCH}&id=${FEDORA_GIT_COMMIT} -> ${P}_${FEDORA_GIT_COMMIT}_${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}" ) + FEDORA_SRC_URI+=( "${FEDORA_GIT_BASE}/${i}?h=${FEDORA_GIT_BRANCH}&id=${FEDORA_GIT_COMMIT} -> ${i%.patch}_${FEDORA_GIT_COMMIT}.patch" ) done SRC_URI+=" bindist? ( ${FEDORA_SRC_URI[@]} )" @@ -61,16 +62,28 @@ PATCHES=( src_prepare() { if use bindist; then + # we need to patch the patch but we cannot patch in DISTDIR... + mkdir "${WORKDIR}"/fedora_patches || die + for i in "${FEDORA_PATCH[@]}" ; do + cp "${DISTDIR}"/"${i%.patch}_${FEDORA_GIT_COMMIT}.patch" "${WORKDIR}"/fedora_patches || die + done + + # now patch the path, due to OpenSSL change cb193560e0da17a41b40ce574a2349f1d4d59ed1 + sed -i -e 's#test/evptests.txt#test/recipes/30-test_evp_data/evppkey.txt#g' \ + "${WORKDIR}"/fedora_patches/openssl-1.1.0-build_d2ede125556ac99aa0faa7744c703af3f559094e.patch || \ + die + # 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}"/"${i}" || die + cp -f "${DISTDIR}"/"${P}_${FEDORA_GIT_COMMIT}_${i}" "${WORKDIR}"/"${i}" || 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 - eapply "${DISTDIR}"/"${i}" + #eapply "${DISTDIR}"/"${i%.patch}_${FEDORA_GIT_COMMIT}.patch" + eapply "${WORKDIR}/fedora_patches/${i%.patch}_${FEDORA_GIT_COMMIT}.patch" done # Also see the configure parts below: # enable-ec \ |