From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1MA9i6-00053F-N3 for garchives@archives.gentoo.org; Fri, 29 May 2009 21:33:55 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B543AE0253; Fri, 29 May 2009 21:33:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 79DEDE0253 for ; Fri, 29 May 2009 21:33:53 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 1FC35660DC for ; Fri, 29 May 2009 21:33:53 +0000 (UTC) Received: from flameeyes by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1MA9i4-00027D-Pe for gentoo-commits@lists.gentoo.org; Fri, 29 May 2009 21:33:52 +0000 From: "Diego Petteno (flameeyes)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, flameeyes@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in dev-libs/openssl: ChangeLog openssl-0.9.8k-r1.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog openssl-0.9.8k-r1.ebuild X-VCS-Directories: dev-libs/openssl X-VCS-Committer: flameeyes X-VCS-Committer-Name: Diego Petteno Content-Type: text/plain; charset=utf8 Message-Id: Sender: Diego Petteno Date: Fri, 29 May 2009 21:33:52 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 98d836cc-5a7f-4196-a89f-1a6508ce8cd9 X-Archives-Hash: 0aa1a71d02b1f6b2f505fe5d7aab1835 flameeyes 09/05/29 21:33:52 Modified: ChangeLog Added: openssl-0.9.8k-r1.ebuild Log: Revision bump with zlib linked in at build-time rather than dlopened. S= ee bug #271415. (Portage version: 2.2_rc33/cvs/Linux x86_64) Revision Changes Path 1.290 dev-libs/openssl/ChangeLog file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/openssl/C= hangeLog?rev=3D1.290&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/openssl/C= hangeLog?rev=3D1.290&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/openssl/C= hangeLog?r1=3D1.289&r2=3D1.290 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v retrieving revision 1.289 retrieving revision 1.290 diff -u -r1.289 -r1.290 --- ChangeLog 9 Apr 2009 20:20:29 -0000 1.289 +++ ChangeLog 29 May 2009 21:33:52 -0000 1.290 @@ -1,6 +1,13 @@ # ChangeLog for dev-libs/openssl # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.289 20= 09/04/09 20:20:29 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.290 20= 09/05/29 21:33:52 flameeyes Exp $ + +*openssl-0.9.8k-r1 (29 May 2009) + + 29 May 2009; Diego E. Petten=C3=B2 + +openssl-0.9.8k-r1.ebuild: + Revision bump with zlib linked in at build-time rather than dlopened. = See + bug #271415. =20 09 Apr 2009; Mike Frysinger openssl-0.9.8k.ebuild: Make sure we dont accidently create /etc/sandbox.d with 0700 perms #26= 5376 1.1 dev-libs/openssl/openssl-0.9.8k-r1.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/openssl/o= penssl-0.9.8k-r1.ebuild?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/openssl/o= penssl-0.9.8k-r1.ebuild?rev=3D1.1&content-type=3Dtext/plain Index: openssl-0.9.8k-r1.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # 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.8k-r1.ebu= ild,v 1.1 2009/05/29 21:33:52 flameeyes Exp $ inherit eutils flag-o-matic toolchain-funcs DESCRIPTION=3D"Toolkit for SSL v2/v3 and TLS v1" HOMEPAGE=3D"http://www.openssl.org/" SRC_URI=3D"mirror://openssl/source/${P}.tar.gz" LICENSE=3D"openssl" SLOT=3D"0" KEYWORDS=3D"-* ~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s3= 90 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" IUSE=3D"bindist gmp kerberos sse2 test zlib" RDEPEND=3D"gmp? ( dev-libs/gmp ) zlib? ( sys-libs/zlib ) kerberos? ( app-crypt/mit-krb5 )" DEPEND=3D"${RDEPEND} sys-apps/diffutils >=3Ddev-lang/perl-5 test? ( sys-devel/bc )" PDEPEND=3D"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.8k-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 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-comp= ile 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=3D/s:=3D.*:=3D/usr/share/man:' Makefile.org # Try to derice users and work around broken ass toolchains if [[ $(gcc-major-version) =3D=3D "3" ]] ; then filter-flags -fprefetch-loop-arrays -freduce-all-givs -funroll-loops [[ $(tc-arch) =3D=3D "ppc64" ]] && replace-flags -O? -O fi [[ $(tc-arch) =3D=3D 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=3D\$\${exec_prefix}/lib+libdir=3D\$\${exec_prefix}/$(get_l= ibdir)+g" \ Makefile.org engines/Makefile \ || die "sed failed" 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" } 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/Camelli= a_(cipher) # IDEA: 5,214,703 25/05/2010 http://en.wikipedia.org/wiki/Interna= tional_Data_Encryption_Algorithm # EC: ????????? ??/??/2015 http://en.wikipedia.org/wiki/Ellipti= c_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=3D$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Hei= mdal") local sslout=3D$(./gentoo.config) einfo "Use configuration ${sslout:-(openssl knows best)}" local config=3D"Configure" [[ -z ${sslout} ]] && config=3D"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=3D${krb5}) \ $(use_ssl zlib) \ --prefix=3D/usr \ --openssldir=3D/etc/ssl \ shared threads \ || die "Configure failed" # Clean out hardcoded flags that openssl uses local CFLAG=3D$(grep ^CFLAG=3D Makefile | LC_ALL=3DC sed \ -e 's:^CFLAG=3D::' \ -e 's:-fomit-frame-pointer ::g' \ -e 's:-O[0-9] ::g' \ -e 's:-march=3D[-a-z0-9]* ::g' \ -e 's:-mcpu=3D[-a-z0-9]* ::g' \ -e 's:-m[a-z0-9]* ::g' \ ) sed -i \ -e "/^CFLAG/s:=3D.*:=3D${CFLAG} ${CFLAGS}:" \ -e "/^SHARED_LDFLAGS=3D/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() { emake -j1 test || die "make test failed" } src_install() { emake -j1 INSTALL_PREFIX=3D"${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=3D${m%/*} ; d=3D${d#./} ; m=3D${m##*/} [[ ${m} =3D=3D 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=3D${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 :(" dodir /etc/sandbox.d #254521 echo 'SANDBOX_PREDICT=3D"/dev/crypto"' > "${D}"/etc/sandbox.d/10openssl 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} }