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 B9A441382C5 for ; Wed, 18 Apr 2018 08:27:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8571FE0931; Wed, 18 Apr 2018 08:27:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 48F1EE092F for ; Wed, 18 Apr 2018 08:27:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F3A53335C2C for ; Wed, 18 Apr 2018 08:27:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 45CA827C for ; Wed, 18 Apr 2018 08:27:26 +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: <1524040030.9eee541332775eba42ae292130e96f1b067d4fb1.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/openssl-1.1.0h-r1.ebuild X-VCS-Directories: dev-libs/openssl/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 9eee541332775eba42ae292130e96f1b067d4fb1 X-VCS-Branch: master Date: Wed, 18 Apr 2018 08:27:26 +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: 37881b45-6579-4dac-8556-58e64dfb441c X-Archives-Hash: fa9b5678ff379ce336a1456cc2947892 commit: 9eee541332775eba42ae292130e96f1b067d4fb1 Author: Lars Wendler gentoo org> AuthorDate: Wed Apr 18 08:19:10 2018 +0000 Commit: Lars Wendler gentoo org> CommitDate: Wed Apr 18 08:27:10 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9eee5413 dev-libs/openssl: Minor ebuild adjustments. Package-Manager: Portage-2.3.30, Repoman-2.3.9 dev-libs/openssl/openssl-1.1.0h-r1.ebuild | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dev-libs/openssl/openssl-1.1.0h-r1.ebuild b/dev-libs/openssl/openssl-1.1.0h-r1.ebuild index d0d225833b6..6e38d19eaf5 100644 --- a/dev-libs/openssl/openssl-1.1.0h-r1.ebuild +++ b/dev-libs/openssl/openssl-1.1.0h-r1.ebuild @@ -3,7 +3,7 @@ EAPI="6" -inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal +inherit flag-o-matic toolchain-funcs multilib multilib-minimal MY_P=${P/_/-} DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)" @@ -70,7 +70,7 @@ src_prepare() { cp -f "${WORKDIR}"/"${SOURCE12}" "${S}"/crypto/ec/ || die cp -f "${WORKDIR}"/"${SOURCE13}" "${S}"/test/ || die for i in "${FEDORA_PATCH[@]}" ; do - epatch "${DISTDIR}"/"${i}" + eapply "${DISTDIR}"/"${i}" done # Also see the configure parts below: # enable-ec \ @@ -85,7 +85,7 @@ src_prepare() { rm -f Makefile if ! use vanilla ; then - epatch "${PATCHES[@]}" + eapply "${PATCHES[@]}" fi eapply_user #332661 @@ -104,7 +104,7 @@ src_prepare() { || 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 || die # quiet out unknown driver argument warnings since openssl # doesn't have well-split CFLAGS and we're making it even worse @@ -113,7 +113,7 @@ src_prepare() { # allow openssl to be cross-compiled cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die - chmod a+rx gentoo.config + chmod a+rx gentoo.config || die append-flags -fno-strict-aliasing append-flags $(test-flags-CC -Wa,--noexecstack) @@ -234,7 +234,7 @@ multilib_src_install() { multilib_src_install_all() { # openssl installs perl version of c_rehash by default, but # we provide a shell version via app-misc/c_rehash - rm "${ED}"/usr/bin/c_rehash || die + rm "${ED%/}"/usr/bin/c_rehash || die dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el @@ -243,13 +243,13 @@ multilib_src_install_all() { # build system: the static archives are built as PIC all the time. # Only way around this would be to manually configure+compile openssl # twice; once with shared lib support enabled and once without. - use static-libs || rm -f "${ED}"/usr/lib*/lib*.a + use static-libs || rm -f "${ED%/}"/usr/lib*/lib*.a # create the certs directory keepdir ${SSL_CNF_DIR}/certs # Namespace openssl programs to prevent conflicts with other man pages - cd "${ED}"/usr/share/man + cd "${ED%/}"/usr/share/man || die local m d s for m in $(find . -type f | xargs grep -L '#include') ; do d=${m%/*} ; d=${d#./} ; m=${m##*/} @@ -264,6 +264,7 @@ multilib_src_install_all() { for s in $(find -L ${d} -type l) ; do s=${s##*/} rm -f ${d}/${s} + # We don't want to "|| die" here ln -s ssl-${m} ${d}/ssl-${s} ln -s ssl-${s} ${d}/openssl-${s} done @@ -271,7 +272,7 @@ multilib_src_install_all() { [[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :(" dodir /etc/sandbox.d #254521 - echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl + echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED%/}"/etc/sandbox.d/10openssl diropts -m0700 keepdir ${SSL_CNF_DIR}/private