mgorny 14/06/15 08:58:50 Modified: ChangeLog Added: openssl-0.9.8z_p1-r2.ebuild Log: Restore multilib at highest rev before systems are broken. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path 1.552 dev-libs/openssl/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/ChangeLog?rev=1.552&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/ChangeLog?rev=1.552&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/ChangeLog?r1=1.551&r2=1.552 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v retrieving revision 1.551 retrieving revision 1.552 diff -u -r1.551 -r1.552 --- ChangeLog 15 Jun 2014 08:52:48 -0000 1.551 +++ ChangeLog 15 Jun 2014 08:58:50 -0000 1.552 @@ -1,6 +1,11 @@ # ChangeLog for dev-libs/openssl # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.551 2014/06/15 08:52:48 chainsaw Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.552 2014/06/15 08:58:50 mgorny Exp $ + +*openssl-0.9.8z_p1-r2 (15 Jun 2014) + + 15 Jun 2014; Michał Górny <mgo...@gentoo.org> +openssl-0.9.8z_p1-r2.ebuild: + Restore multilib at highest rev before systems are broken. *openssl-0.9.8z_p1-r1 (15 Jun 2014) 1.1 dev-libs/openssl/openssl-0.9.8z_p1-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/openssl-0.9.8z_p1-r2.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/openssl-0.9.8z_p1-r2.ebuild?rev=1.1&content-type=text/plain Index: openssl-0.9.8z_p1-r2.ebuild =================================================================== # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8z_p1-r2.ebuild,v 1.1 2014/06/15 08:58:50 mgorny Exp $ # this ebuild is only for the libcrypto.so.0.9.8 and libssl.so.0.9.8 SONAME for ABI compat EAPI="5" inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal PLEVEL=`echo ${PV##*_p} | tr [1-26] [a-z]` MY_PV=${PV/_p*/${PLEVEL}} MY_P=${PN}-${MY_PV} S="${WORKDIR}/${MY_P}" DESCRIPTION="Toolkit for SSL v2/v3 and TLS v1" HOMEPAGE="http://www.openssl.org/"; SRC_URI="mirror://openssl/source/${MY_P}.tar.gz" LICENSE="openssl" SLOT="0.9.8" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" IUSE="bindist gmp kerberos sse2 test zlib" RDEPEND="gmp? ( dev-libs/gmp[${MULTILIB_USEDEP}] ) zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] ) kerberos? ( app-crypt/mit-krb5[${MULTILIB_USEDEP}] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r4 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) !=dev-libs/openssl-0.9.8*:0" DEPEND="${RDEPEND} sys-apps/diffutils >=dev-lang/perl-5 test? ( sys-devel/bc )" # Do not install any docs DOCS=() src_prepare() { epatch "${FILESDIR}"/${PN}-0.9.8e-bsd-sparc64.patch epatch "${FILESDIR}"/${PN}-0.9.8h-ldflags.patch #181438 epatch "${FILESDIR}"/${PN}-0.9.8m-binutils.patch #289130 # disable fips in the build # make sure the man pages are suffixed #302165 # don't bother building man pages if they're disabled sed -i \ -e '/DIRS/s: fips : :g' \ -e '/^MANSUFFIX/s:=.*:=ssl:' \ -e '/^MAKEDEPPROG/s:=.*:=$(CC):' \ -e $(has noman FEATURES \ && echo '/^install:/s:install_docs::' \ || echo '/^MANDIR=/s:=.*:=/usr/share/man:') \ Makefile{,.org} \ || die # show the actual commands in the log sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared # update the enginedir path. # punt broken config we don't care about as it fails sanity check. sed -i \ -e '/^"debug-ben-debug-64"/d' \ -e "/foo.*engines/s|/lib/engines|/$(get_libdir)/engines|" \ Configure || die # allow openssl to be cross-compiled cp "${FILESDIR}"/gentoo.config-0.9.8 gentoo.config || die "cp cross-compile failed" chmod a+rx gentoo.config append-flags -fno-strict-aliasing append-flags -Wa,--noexecstack sed -i '1s,^:$,#!/usr/bin/perl,' Configure #141906 sed -i '/^"debug-bodo/d' Configure # 0.9.8za shipped broken ./config --test-sanity || die "I AM NOT SANE" multilib_copy_sources } multilib_src_configure() { unset APPS #197996 unset SCRIPTS #312551 tc-export CC AR RANLIB # 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: 5,724,428 03/03/2015 http://en.wikipedia.org/wiki/RC5 use_ssl() { use $1 && echo "enable-${2:-$1} ${*:3}" || echo "no-${2:-$1}" ; } echoit() { echo "$@" ; "$@" ; } local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal") local sslout=$(./gentoo.config) einfo "Use configuration ${sslout:-(openssl knows best)}" local config="Configure" [[ -z ${sslout} ]] && config="config" echoit \ ./${config} \ ${sslout} \ $(use sse2 || echo "no-sse2") \ enable-camellia \ $(use_ssl !bindist ec) \ enable-idea \ enable-mdc2 \ $(use_ssl !bindist rc5) \ enable-tlsext \ $(use_ssl gmp gmp -lgmp) \ $(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \ $(use_ssl zlib) \ --prefix=/usr \ --openssldir=/etc/ssl \ shared threads \ || die "Configure failed" # Clean out hardcoded flags that openssl uses local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \ -e 's:^CFLAG=::' \ -e 's:-fomit-frame-pointer ::g' \ -e 's:-O[0-9] ::g' \ -e 's:-march=[-a-z0-9]* ::g' \ -e 's:-mcpu=[-a-z0-9]* ::g' \ -e 's:-m[a-z0-9]* ::g' \ ) sed -i \ -e "/^LIBDIR=/s|=.*|=$(get_libdir)|" \ -e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \ -e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \ Makefile || die } multilib_src_compile() { # depend is needed to use $confopts emake -j1 depend emake -j1 build_libs } multilib_src_test() { emake -j1 test } multilib_src_install() { dolib.so lib{crypto,ssl}.so.0.9.8 }
