jcallen     14/05/23 23:13:54

  Modified:             ChangeLog
  Added:                openssl-0.9.8y-r1.ebuild
  Log:
  Backport multilib support to SLOT=0.9.8 (bug 511078)
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 
229E5838)

Revision  Changes    Path
1.539                dev-libs/openssl/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/ChangeLog?rev=1.539&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/ChangeLog?rev=1.539&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/ChangeLog?r1=1.538&r2=1.539

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v
retrieving revision 1.538
retrieving revision 1.539
diff -u -r1.538 -r1.539
--- ChangeLog   20 May 2014 06:41:24 -0000      1.538
+++ ChangeLog   23 May 2014 23:13:54 -0000      1.539
@@ -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.538 
2014/05/20 06:41:24 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.539 
2014/05/23 23:13:54 jcallen Exp $
+
+*openssl-0.9.8y-r1 (23 May 2014)
+
+  23 May 2014; Jonathan Callen <[email protected]> +openssl-0.9.8y-r1.ebuild:
+  Backport multilib support to SLOT=0.9.8 (bug 511078)
 
   20 May 2014; Michał Górny <[email protected]> openssl-1.0.1g-r1.ebuild,
   openssl-1.0.2_beta1-r3.ebuild:



1.1                  dev-libs/openssl/openssl-0.9.8y-r1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/openssl-0.9.8y-r1.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/openssl-0.9.8y-r1.ebuild?rev=1.1&content-type=text/plain

Index: openssl-0.9.8y-r1.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.8y-r1.ebuild,v 
1.1 2014/05/23 23:13:54 jcallen 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

DESCRIPTION="Toolkit for SSL v2/v3 and TLS v1"
HOMEPAGE="http://www.openssl.org/";
SRC_URI="mirror://openssl/source/${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 )
        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-steve/d' Configure # 0.9.8k 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}" ; }
        multilib_native_use_ssl() { multilib_native_usex $1 "enable-${2:-$1}" 
"no-${2:-$1}" " ${*:3}" ; }
        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) \
                $(multilib_native_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
}




Reply via email to