From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 728C8139085 for ; Thu, 26 Jan 2017 16:11:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 66795E0C1E; Thu, 26 Jan 2017 16:11:32 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 32AC4E0C1E for ; Thu, 26 Jan 2017 16:11:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D27A2340C9D for ; Thu, 26 Jan 2017 16:11:30 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6FFA13062 for ; Thu, 26 Jan 2017 16:11:29 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1485447085.8607ecd9f9693a05df6f8ef5f0e2b49076998079.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/openssl/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/openssl/Manifest dev-libs/openssl/openssl-1.0.2k.ebuild dev-libs/openssl/openssl-1.1.0c.ebuild dev-libs/openssl/openssl-1.1.0d.ebuild X-VCS-Directories: dev-libs/openssl/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 8607ecd9f9693a05df6f8ef5f0e2b49076998079 X-VCS-Branch: master Date: Thu, 26 Jan 2017 16:11:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 6d05609d-12f5-4a3c-94d1-6391d06bb36f X-Archives-Hash: b3239f4c265b799f2d4d0353b5a7b4c9 commit: 8607ecd9f9693a05df6f8ef5f0e2b49076998079 Author: Lars Wendler gentoo org> AuthorDate: Thu Jan 26 16:11:08 2017 +0000 Commit: Lars Wendler gentoo org> CommitDate: Thu Jan 26 16:11:25 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8607ecd9 dev-libs/openssl: Sec bump to versions 1.0.2k and 1.1.0d (bug #607318). Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-libs/openssl/Manifest | 3 +- ...openssl-1.1.0c.ebuild => openssl-1.0.2k.ebuild} | 80 ++++++++++++---------- ...openssl-1.1.0c.ebuild => openssl-1.1.0d.ebuild} | 2 +- 3 files changed, 47 insertions(+), 38 deletions(-) diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest index a42a05f..428810b 100644 --- a/dev-libs/openssl/Manifest +++ b/dev-libs/openssl/Manifest @@ -1,3 +1,4 @@ DIST openssl-0.9.8zh.tar.gz 3818524 SHA256 f1d9f3ed1b85a82ecf80d0e2d389e1fda3fca9a4dba0bf07adbf231e1a5e2fd6 SHA512 b97fa2468211f86c0719c68ad1781eff84f772c479ed5193d6da14bac086b4ca706e7d851209d9df3f0962943b5e5333ab0def00110fb2e517caa73c0c6674c6 WHIRLPOOL 8ed3362e6aed89cd6ae02438bc3fb58ff3a91afb8a2d401d1d66c1ee4fd96f4befb50558131dd03a60fc15b588172fc1ede5d56bb1f68e184453bfe3b34f9abf DIST openssl-1.0.2j.tar.gz 5307912 SHA256 e7aff292be21c259c6af26469c7a9b3ba26e9abaaffd325e3dccc9785256c431 SHA512 7d6ccae4aa3ccec3a5d128da29c68401cdb1210cba6d212d55235fc3bc63d7085e2f119e2bbee7ddff6b7b5eef07c6196156791724cd2caf313a4c2fef724edd WHIRLPOOL 1f17e80bc10da2eab9d4c1c3a662b0e2b4f7e8bc448aabb44cd98a96ba3d6cd0ef6cf9a3371d44b39a4d11b1a4087c8f0d056272ace6eba5bd2417f7ab9503b7 -DIST openssl-1.1.0c.tar.gz 5179668 SHA256 fc436441a2e05752d31b4e46115eb89709a28aef96d4fe786abe92409b2fd6f5 SHA512 e3cfba6c682e5edd6f678df7c1da9c9713880f7dca248e6d62f095185c22ce8fd7571d53a54a119fb5d4422578637746ad2809bb2ba324a5c54564f532307ad9 WHIRLPOOL d6ee4610a6ce5c8d2593bcd9f8a2fc55910006d3f466d0d27409f92b4f60880f96979ccbbdf9da5cf110c59a86e1a906bf20a8eb93338efa9e197bd4755ce4d8 +DIST openssl-1.0.2k.tar.gz 5309236 SHA256 6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0 SHA512 0d314b42352f4b1df2c40ca1094abc7e9ad684c5c35ea997efdd58204c70f22a1abcb17291820f0fff3769620a4e06906034203d31eb1a4d540df3e0db294016 WHIRLPOOL ffa3d89a078db6829f1fff21779a19c87e059600162e6d7d3114b8440ba5fa7d1a08e04594b6ed8ab47e148782de299d7ec338f2ba2d466bf7737b0749f590cd +DIST openssl-1.1.0d.tar.gz 5201626 SHA256 7d5ebb9e89756545c156ff9c13cf2aa6214193b010a468a3bc789c3c28fe60df SHA512 9f84b3a584df4058f70da6a6ee26a788cc321df218dcabc60ae82913b85af932ed6470e881cd369ead904e5cbc3e4bb0d44e4871b7ba687fe1dba027505363ed WHIRLPOOL 7e27a34f65d6fb1f3be16e2948264d4befd0d35ec674f4d52e6d89b7506e51c09c18ae26c6b25a5f9a3a7186900fb8dffa3e17181a2d33db46875ccb593f3d8f diff --git a/dev-libs/openssl/openssl-1.1.0c.ebuild b/dev-libs/openssl/openssl-1.0.2k.ebuild similarity index 76% copy from dev-libs/openssl/openssl-1.1.0c.ebuild copy to dev-libs/openssl/openssl-1.0.2k.ebuild index 069cf97..0a3838f 100644 --- a/dev-libs/openssl/openssl-1.1.0c.ebuild +++ b/dev-libs/openssl/openssl-1.0.2k.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI="5" inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal @@ -12,13 +12,15 @@ HOMEPAGE="http://www.openssl.org/" SRC_URI="mirror://openssl/source/${MY_P}.tar.gz" LICENSE="openssl" -SLOT="0/1.1" # .so version of libssl/libcrypto +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" -IUSE="+asm bindist rfc3779 sctp cpu_flags_x86_sse2 static-libs test tls-heartbeat vanilla zlib" +IUSE="+asm bindist 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 - zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )" + gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] ) + zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] ) + kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND} >=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) @@ -34,10 +36,6 @@ MULTILIB_WRAPPED_HEADERS=( usr/include/openssl/opensslconf.h ) -PATCHES=( - "${FILESDIR}"/${PN}-1.0.2a-x32-asm.patch #542618 -) - src_prepare() { # keep this in sync with app-misc/c_rehash SSL_CNF_DIR="/etc/ssl" @@ -47,25 +45,37 @@ src_prepare() { rm -f Makefile if ! use vanilla ; then - epatch "${PATCHES[@]}" + epatch "${FILESDIR}"/${PN}-1.0.0a-ldflags.patch #327421 + epatch "${FILESDIR}"/${PN}-1.0.2i-parallel-build.patch + epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-obj-headers.patch + epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-install-dirs.patch + epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-symlinking.patch #545028 + epatch "${FILESDIR}"/${PN}-1.0.2-ipv6.patch + epatch "${FILESDIR}"/${PN}-1.0.2a-x32-asm.patch #542618 + epatch "${FILESDIR}"/${PN}-1.0.1p-default-source.patch #554338 + epatch_user #332661 fi + # disable fips in the build # make sure the man pages are suffixed #302165 # don't bother building man pages if they're disabled - # Make DOCDIR Gentoo compliant 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:=.*:='${EPREFIX}'/usr/share/man:') \ - -e "/^DOCDIR/s@\$(BASENAME)@&-${PF}@" \ - Configurations/unix-Makefile.tmpl \ + Makefile.org \ || die - # show the actual commands in the log - sed -i '/^SET_X/s@=.*@=set -x@' Makefile.shared + sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared + + # since we're forcing $(CC) as makedep anyway, just fix + # the conditional as always-on + # helps clang (#417795), and versioned gcc (#499818) + sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || die # quiet out unknown driver argument warnings since openssl # doesn't have well-split CFLAGS and we're making it even worse @@ -80,16 +90,7 @@ src_prepare() { append-flags $(test-flags-CC -Wa,--noexecstack) append-cppflags -DOPENSSL_NO_BUF_FREELISTS - # Prefixify Configure shebang (#141906) - sed \ - -e "1s,/usr/bin/env,${EPREFIX}&," \ - -i Configure || die - # Remove test target when FEATURES=test isn't set - if ! use test ; then - sed \ - -e '/^$config{dirs}/s@ "test",@@' \ - -i Configure || die - fi + sed -i '1s,^:$,#!'${EPREFIX}'/usr/bin/perl,' Configure #141906 # The config script does stupid stuff to prompt the user. Kill it. sed -i '/stty -icanon min 0 time 50; read waste/d' config || die ./config --test-sanity || die "I AM NOT SANE" @@ -135,18 +136,21 @@ multilib_src_configure() { echoit \ ./${config} \ ${sslout} \ - --api=1.1.0 \ $(use cpu_flags_x86_sse2 || echo "no-sse2") \ enable-camellia \ - disable-deprecated \ $(use_ssl !bindist ec) \ ${ec_nistp_64_gcc_128} \ enable-idea \ enable-mdc2 \ enable-rc5 \ + enable-tlsext \ $(use_ssl asm) \ + $(use_ssl gmp gmp -lgmp) \ + $(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \ $(use_ssl rfc3779) \ $(use_ssl sctp) \ + $(use_ssl sslv2 ssl2) \ + $(use_ssl sslv3 ssl3) \ $(use_ssl tls-heartbeat heartbeats) \ $(use_ssl zlib) \ --prefix="${EPREFIX}"/usr \ @@ -156,19 +160,17 @@ multilib_src_configure() { || die # Clean out hardcoded flags that openssl uses - # Fix quoting for sed - local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \ - -e 's:^CFLAGS=::' \ + 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' \ - -e 's:\\:\\\\:g' \ ) sed -i \ - -e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \ - -e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \ + -e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \ + -e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \ Makefile || die } @@ -177,6 +179,9 @@ multilib_src_compile() { # that it's -j1 as the code itself serializes subdirs emake -j1 depend emake all + # rehash is needed to prep the certs/ dir; do this + # separately to avoid parallel build issues. + emake rehash } multilib_src_test() { @@ -184,7 +189,7 @@ multilib_src_test() { } multilib_src_install() { - emake DESTDIR="${D}" install + emake INSTALL_PREFIX="${D}" install } multilib_src_install_all() { @@ -192,8 +197,9 @@ multilib_src_install_all() { # we provide a shell version via app-misc/c_rehash rm "${ED}"/usr/bin/c_rehash || die - dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el + dodoc CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el dohtml -r doc/* + use rfc3779 && dodoc engines/ccgost/README.gost # This is crappy in that the static archives are still built even # when USE=static-libs. But this is due to a failing in the openssl @@ -203,7 +209,9 @@ multilib_src_install_all() { use static-libs || rm -f "${ED}"/usr/lib*/lib*.a # create the certs directory - keepdir ${SSL_CNF_DIR}/certs + dodir ${SSL_CNF_DIR}/certs + cp -RP certs/* "${ED}"${SSL_CNF_DIR}/certs/ || die + rm -r "${ED}"${SSL_CNF_DIR}/certs/{demo,expired} # Namespace openssl programs to prevent conflicts with other man pages cd "${ED}"/usr/share/man diff --git a/dev-libs/openssl/openssl-1.1.0c.ebuild b/dev-libs/openssl/openssl-1.1.0d.ebuild similarity index 99% rename from dev-libs/openssl/openssl-1.1.0c.ebuild rename to dev-libs/openssl/openssl-1.1.0d.ebuild index 069cf97..b3b0723 100644 --- a/dev-libs/openssl/openssl-1.1.0c.ebuild +++ b/dev-libs/openssl/openssl-1.1.0d.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$