diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2018-04-26 15:13:56 +0200 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2018-04-26 15:25:34 +0200 |
| commit | 109669cd9f6291cad36383ada4b540659561dad3 (patch) | |
| tree | eb986a22cfceac281ba35859df9b5641dc04d6a7 | |
| parent | x11-misc/albert: version bump 0.14.18 (diff) | |
| download | gentoo-109669cd9f6291cad36383ada4b540659561dad3.tar.gz gentoo-109669cd9f6291cad36383ada4b540659561dad3.tar.bz2 gentoo-109669cd9f6291cad36383ada4b540659561dad3.zip | |
dev-libs/openssl: Removed bindist exceptions
until Fedora provides patches for openssl-1.1.1
Closes: https://bugs.gentoo.org/654078
Package-Manager: Portage-2.3.31, Repoman-2.3.9
| -rw-r--r-- | dev-libs/openssl/Manifest | 3 | ||||
| -rw-r--r-- | dev-libs/openssl/openssl-1.1.1_pre5.ebuild | 44 |
2 files changed, 2 insertions, 45 deletions
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest index 2da8795bde09..e624d9636955 100644 --- a/dev-libs/openssl/Manifest +++ b/dev-libs/openssl/Manifest @@ -11,6 +11,3 @@ DIST openssl-1.1.0h_ec_curve.c 18393 BLAKE2B 49dca7ddbc23270e5927454925df7bb18c8 DIST openssl-1.1.0h_ectest.c 29907 BLAKE2B 73dc800c1de5449f14d7753f7f7b8e672cd36bd4570e6df07f246d1d823c7dbbeef492f25cdd0ebfd693f5956732bc84c9d91fc6a22c854fe4b245ecf3890bda SHA512 90cec9d46326cb7216236811c8e963032b6fa7500117cea36f28534eb50a5ab1260c7f9a5c8c490d845236b0769576a8d97bc7471f970e9c5e70cb3408c20dae DIST openssl-1.1.0h_hobble-openssl 1117 BLAKE2B c3a1477e63331e83cf1cbe58e9ef131ec500a311e22d3da55034800ca353c387b2e202575acf3badb00b236ff91d4bac1bb131a33930939646d26bec27be6e04 SHA512 fa9cc70afa11a7a292548b4bddbba8159824a364ce5c279b483768e6ae2aa4b5491d9bf2cc734819f30a11c8ee0d91bcb991c4a7ab357296aeb4c04feac74826 DIST openssl-1.1.1-pre5.tar.gz 8288689 BLAKE2B f65c797a8cce6e2240008ed842d9bc7667ef4bb792a141a0832f475b51b1e499786fa2bab87977aa58f8edaba7c35be1a67563bc8a6d0e41fcf1a3c95961b877 SHA512 dfdf4ee2e0f05ff9af5ecd7305bad4ff8d587c08ea675055048d7eae2a8e38fe74c2e63b13facd95ccbcb586be2d6e388088c567380af64f0ccc88095a881173 -DIST openssl-1.1.1_pre5_ec_curve.c 18393 BLAKE2B 49dca7ddbc23270e5927454925df7bb18c8d9eb58f79e3a4fbcd8b7fc22fad36e2cb54ff9b63c2beeeea15c0c075a96e4ce8d03991355419af41fa9dc2aed3ad SHA512 ee3e576825bccdf02cede4205ab92c42ae9dd3a8e75ce58617a3a5980a61d144eb3c5197d9dcd378a5d49bf34c4b2f591aa6a619fee92b7a22825d72681ab879 -DIST openssl-1.1.1_pre5_ectest.c 29908 BLAKE2B b398bafd5d5aea71daa9c3e2749dece9e515950e35547a6191d83987907aae73e090a4b552636af4d1ab2b39f7e3b1ea3fde2012c99f068f9c99d247996c1212 SHA512 e4445f8959b040caca6a7494da2026b840f84348df5d4eab47a68570d274333f62fa0c381955093edd86c857dad98595ffa2980c54afdcf2a8d32f32d0c70450 -DIST openssl-1.1.1_pre5_hobble-openssl 1117 BLAKE2B c3a1477e63331e83cf1cbe58e9ef131ec500a311e22d3da55034800ca353c387b2e202575acf3badb00b236ff91d4bac1bb131a33930939646d26bec27be6e04 SHA512 fa9cc70afa11a7a292548b4bddbba8159824a364ce5c279b483768e6ae2aa4b5491d9bf2cc734819f30a11c8ee0d91bcb991c4a7ab357296aeb4c04feac74826 diff --git a/dev-libs/openssl/openssl-1.1.1_pre5.ebuild b/dev-libs/openssl/openssl-1.1.1_pre5.ebuild index 57d997041006..e022bf39b778 100644 --- a/dev-libs/openssl/openssl-1.1.1_pre5.ebuild +++ b/dev-libs/openssl/openssl-1.1.1_pre5.ebuild @@ -28,27 +28,6 @@ DEPEND="${RDEPEND} )" PDEPEND="app-misc/ca-certificates" -# 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[@]} )" - S="${WORKDIR}/${MY_P}" MULTILIB_WRAPPED_HEADERS=( @@ -60,23 +39,6 @@ PATCHES=( ) src_prepare() { - 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}"/"${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}" - done - # Also see the configure parts below: - # enable-ec \ - # $(use_ssl !bindist ec2m) \ - - fi # keep this in sync with app-misc/c_rehash SSL_CNF_DIR="/etc/ssl" @@ -168,7 +130,6 @@ multilib_src_configure() { local config="Configure" [[ -z ${sslout} ]] && config="config" - # Fedora hobbled-EC needs 'no-ec2m' # 'srp' was restricted until early 2017 as well. # "disable-deprecated" option breaks too many consumers. # Don't set it without thorough revdeps testing. @@ -177,9 +138,8 @@ multilib_src_configure() { ${sslout} \ $(use cpu_flags_x86_sse2 || echo "no-sse2") \ enable-camellia \ - enable-ec \ - $(use_ssl !bindist ec2m) \ - enable-srp \ + $(use_ssl !bindist ec) \ + $(use_ssl !bindist srp) \ $(use elibc_musl && echo "no-async") \ ${ec_nistp_64_gcc_128} \ enable-idea \ |