diff options
author | Mike Frysinger <vapier@gentoo.org> | 2009-10-26 10:02:12 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2009-10-26 10:02:12 +0000 |
commit | 272c9b2c20c1e2ab867ceb4c2582cb9e3745928e (patch) | |
tree | 72d683ce8806d4f5bb7d269cfaf2d97a8f94146f /dev-libs | |
parent | x11-proto/xf86vidmodeproto: sync with overlay, add blocker, fixes bug #288619 (diff) | |
download | gentoo-2-272c9b2c20c1e2ab867ceb4c2582cb9e3745928e.tar.gz gentoo-2-272c9b2c20c1e2ab867ceb4c2582cb9e3745928e.tar.bz2 gentoo-2-272c9b2c20c1e2ab867ceb4c2582cb9e3745928e.zip |
old
(Portage version: 2.2_rc46/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs')
-rw-r--r-- | dev-libs/openssl/files/openssl-0.9.8-toolchain.patch | 29 | ||||
-rw-r--r-- | dev-libs/openssl/files/openssl-0.9.8j-ia64.patch | 18 | ||||
-rw-r--r-- | dev-libs/openssl/openssl-0.9.8j.ebuild | 188 |
3 files changed, 0 insertions, 235 deletions
diff --git a/dev-libs/openssl/files/openssl-0.9.8-toolchain.patch b/dev-libs/openssl/files/openssl-0.9.8-toolchain.patch deleted file mode 100644 index b6773e92fd86..000000000000 --- a/dev-libs/openssl/files/openssl-0.9.8-toolchain.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- Configure -+++ Configure -@@ -928,7 +928,8 @@ - print "IsMK1MF=$IsMK1MF\n"; - - my @fields = split(/\s*:\s*/,$table{$target} . ":" x 30 , -1); --my $cc = $fields[$idx_cc]; -+my $cc = $ENV{'CC'} || $fields[$idx_cc]; -+my $ar = $ENV{'AR'} || "ar"; - my $cflags = $fields[$idx_cflags]; - my $unistd = $fields[$idx_unistd]; - my $thread_cflag = $fields[$idx_thread_cflag]; -@@ -951,7 +951,7 @@ - my $shared_cflag = $fields[$idx_shared_cflag]; - my $shared_ldflag = $fields[$idx_shared_ldflag]; - my $shared_extension = $fields[$idx_shared_extension]; --my $ranlib = $fields[$idx_ranlib]; -+my $ranlib = $ENV{'RANLIB'} || $fields[$idx_ranlib]; - my $arflags = $fields[$idx_arflags]; - - my $no_shared_warn=0; -@@ -1292,6 +1292,7 @@ - s/^RMD160_ASM_OBJ=.*$/RMD160_ASM_OBJ= $rmd160_obj/; - s/^PROCESSOR=.*/PROCESSOR= $processor/; - s/^RANLIB=.*/RANLIB= $ranlib/; -+ s/^AR=ar /AR= $ar /; - s/^ARFLAGS=.*/ARFLAGS= $arflags/; - s/^PERL=.*/PERL= $perl/; - s/^KRB5_INCLUDES=.*/KRB5_INCLUDES=$withargs{"krb5-include"}/; diff --git a/dev-libs/openssl/files/openssl-0.9.8j-ia64.patch b/dev-libs/openssl/files/openssl-0.9.8j-ia64.patch deleted file mode 100644 index 5241b1137655..000000000000 --- a/dev-libs/openssl/files/openssl-0.9.8j-ia64.patch +++ /dev/null @@ -1,18 +0,0 @@ -fix from upstream - -http://rt.openssl.org/Ticket/Display.html?id=1839&user=guest&pass=guest - ---- openssl-0.9.8j/crypto/sha/asm/sha1-ia64.pl -+++ openssl-0.9.8j/crypto/sha/asm/sha1-ia64.pl -@@ -14,6 +14,10 @@ - # Performance under big-endian OS such as HP-UX is 179MBps*1GHz, which - # is >50% better than HP C and >2x better than gcc. - -+$output=shift; -+ -+open STDOUT,">$output" || die "can't open $output: $!"; -+ - $code=<<___; - .ident \"sha1-ia64.s, version 1.2\" - .ident \"IA-64 ISA artwork by Andy Polyakov <app...@fy.chalmers.se>\" - diff --git a/dev-libs/openssl/openssl-0.9.8j.ebuild b/dev-libs/openssl/openssl-0.9.8j.ebuild deleted file mode 100644 index 78a8b12599da..000000000000 --- a/dev-libs/openssl/openssl-0.9.8j.ebuild +++ /dev/null @@ -1,188 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8j.ebuild,v 1.7 2009/02/19 10:40:13 armin76 Exp $ - -inherit eutils flag-o-matic toolchain-funcs - -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" -KEYWORDS="-* alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd" -IUSE="bindist gmp kerberos sse2 test zlib" - -RDEPEND="gmp? ( dev-libs/gmp ) - zlib? ( sys-libs/zlib ) - kerberos? ( app-crypt/mit-krb5 )" -DEPEND="${RDEPEND} - sys-apps/diffutils - >=dev-lang/perl-5 - test? ( sys-devel/bc )" -PDEPEND="app-misc/ca-certificates" - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}"/${PN}-0.9.7e-gentoo.patch - epatch "${FILESDIR}"/${PN}-0.9.7-alpha-default-gcc.patch - #Forward port of the -b patch. Parallel make fails though. - epatch "${FILESDIR}"/${PN}-0.9.8j-parallel-build.patch - epatch "${FILESDIR}"/${PN}-0.9.8-make-engines-dir.patch - epatch "${FILESDIR}"/${PN}-0.9.8-toolchain.patch - epatch "${FILESDIR}"/${PN}-0.9.8b-doc-updates.patch - epatch "${FILESDIR}"/${PN}-0.9.8-makedepend.patch #149583 - epatch "${FILESDIR}"/${PN}-0.9.8e-make.patch #146316 - #epatch "${FILESDIR}"/${PN}-0.9.8e-bsd-sparc64.patch - epatch "${FILESDIR}"/${PN}-0.9.8g-sslv3-no-tlsext.patch - epatch "${FILESDIR}"/${PN}-0.9.8h-ldflags.patch #181438 - epatch "${FILESDIR}"/${P}-ia64.patch - sed -i -e '/DIRS/ s/ fips / /g' Makefile{,.org} \ - || die "Removing fips from openssl failed." - - # 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 - - # Don't build manpages if we don't want them - has noman FEATURES \ - && sed -i '/^install:/s:install_docs::' Makefile.org \ - || sed -i '/^MANDIR=/s:=.*:=/usr/share/man:' Makefile.org - - # Try to derice users and work around broken ass toolchains - if [[ $(gcc-major-version) == "3" ]] ; then - filter-flags -fprefetch-loop-arrays -freduce-all-givs -funroll-loops - [[ $(tc-arch) == "ppc64" ]] && replace-flags -O? -O - fi - [[ $(tc-arch) == ppc* ]] && append-flags -fno-strict-aliasing - append-flags -Wa,--noexecstack - - # using a library directory other than lib requires some magic - sed -i \ - -e "s+\(\$(INSTALL_PREFIX)\$(INSTALLTOP)\)/lib+\1/$(get_libdir)+g" \ - -e "s+libdir=\$\${exec_prefix}/lib+libdir=\$\${exec_prefix}/$(get_libdir)+g" \ - Makefile.org engines/Makefile \ - || die "sed failed" - ./config --test-sanity || die "I AM NOT SANE" -} - -src_compile() { - unset APPS #197996 - - tc-export CC AR RANLIB - - # Clean out patent-or-otherwise-encumbered code - # Camellia: Royalty Free http://en.wikipedia.org/wiki/Camellia_(cipher) - # IDEA: 5,214,703 25/05/2010 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) \ - $(use_ssl !bindist idea) \ - enable-mdc2 \ - $(use_ssl !bindist rc5) \ - enable-tlsext \ - $(use_ssl gmp) \ - $(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \ - $(use_ssl zlib) \ - $(use_ssl zlib zlib-dynamic) \ - --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 "/^CFLAG/s:=.*:=${CFLAG} ${CFLAGS}:" \ - -e "/^SHARED_LDFLAGS=/s:$: ${LDFLAGS}:" \ - Makefile || die - - # depend is needed to use $confopts - # rehash is needed to prep the certs/ dir - emake -j1 depend || die "depend failed" - emake -j1 all rehash || die "make all failed" -} - -src_test() { - # make sure sandbox doesnt die on *BSD - addpredict /dev/crypto - - emake -j1 test || die "make test failed" -} - -src_install() { - emake -j1 INSTALL_PREFIX="${D}" install || die - dodoc CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el - dohtml doc/* - - # create the certs directory - dodir /etc/ssl/certs - cp -RP certs/* "${D}"/etc/ssl/certs/ || die "failed to install certs" - rm -r "${D}"/etc/ssl/certs/{demo,expired} - - # Namespace openssl programs to prevent conflicts with other man pages - cd "${D}"/usr/share/man - local m d s - for m in $(find . -type f | xargs grep -L '#include') ; do - d=${m%/*} ; d=${d#./} ; m=${m##*/} - [[ ${m} == openssl.1* ]] && continue - [[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!" - mv ${d}/{,ssl-}${m} - ln -s ssl-${m} ${d}/openssl-${m} - # locate any symlinks that point to this man page ... we assume - # that any broken links are due to the above renaming - for s in $(find -L ${d} -type l) ; do - s=${s##*/} - rm -f ${d}/${s} - ln -s ssl-${m} ${d}/ssl-${s} - ln -s ssl-${s} ${d}/openssl-${s} - done - done - [[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :(" - - diropts -m0700 - keepdir /etc/ssl/private -} - -pkg_preinst() { - preserve_old_lib /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.{6,7} -} - -pkg_postinst() { - preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.{6,7} - - if [[ ${CHOST} == i686* ]] ; then - ewarn "Due to the way openssl is architected, you cannot" - ewarn "switch between optimized versions without breaking" - ewarn "ABI. The default i686 0.9.8 ABI was an unoptimized" - ewarn "version with horrible performance. This version uses" - ewarn "the optimized ABI. If you experience segfaults when" - ewarn "using ssl apps (like openssh), just re-emerge the" - ewarn "offending package." - fi -} |