dev-libs/openssl: apply CoreOS changes

This commit is contained in:
Alex Crawford 2016-10-25 12:05:12 -07:00
parent 7f80e66a95
commit 53427343ff

View File

@ -13,9 +13,8 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
LICENSE="openssl" LICENSE="openssl"
SLOT="0" SLOT="0"
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux" KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib" IUSE="+asm gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib"
RESTRICT="!bindist? ( bindist )"
RDEPEND=">=app-misc/c_rehash-1.7-r1 RDEPEND=">=app-misc/c_rehash-1.7-r1
gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] ) gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
@ -105,13 +104,6 @@ multilib_src_configure() {
tc-export CC AR RANLIB RC tc-export CC AR RANLIB RC
# Clean out patent-or-otherwise-encumbered code
# Camellia: Royalty Free http://en.wikipedia.org/wiki/Camellia_(cipher)
# IDEA: Expired http://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
# EC: ????????? ??/??/2015 http://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
# MDC2: Expired http://en.wikipedia.org/wiki/MDC-2
# RC5: Expired http://en.wikipedia.org/wiki/RC5
use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; } use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
echoit() { echo "$@" ; "$@" ; } echoit() { echo "$@" ; "$@" ; }
@ -121,11 +113,9 @@ multilib_src_configure() {
# friendly and can use the nicely optimized code paths. #460790 # friendly and can use the nicely optimized code paths. #460790
local ec_nistp_64_gcc_128 local ec_nistp_64_gcc_128
# Disable it for now though #469976 # Disable it for now though #469976
#if ! use bindist ; then #echo "__uint128_t i;" > "${T}"/128.c
# echo "__uint128_t i;" > "${T}"/128.c #if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
# if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then # ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
# ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
# fi
#fi #fi
local sslout=$(./gentoo.config) local sslout=$(./gentoo.config)
@ -138,7 +128,6 @@ multilib_src_configure() {
${sslout} \ ${sslout} \
$(use cpu_flags_x86_sse2 || echo "no-sse2") \ $(use cpu_flags_x86_sse2 || echo "no-sse2") \
enable-camellia \ enable-camellia \
$(use_ssl !bindist ec) \
${ec_nistp_64_gcc_128} \ ${ec_nistp_64_gcc_128} \
enable-idea \ enable-idea \
enable-mdc2 \ enable-mdc2 \
@ -241,9 +230,3 @@ multilib_src_install_all() {
diropts -m0700 diropts -m0700
keepdir ${SSL_CNF_DIR}/private keepdir ${SSL_CNF_DIR}/private
} }
pkg_postinst() {
ebegin "Running 'c_rehash ${EROOT%/}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
c_rehash "${EROOT%/}${SSL_CNF_DIR}/certs" >/dev/null
eend $?
}