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 8AF41138335 for ; Fri, 23 Aug 2019 18:10:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C2E31E076B; Fri, 23 Aug 2019 18:10:50 +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 94BA2E076B for ; Fri, 23 Aug 2019 18:10:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 DECF534A21C for ; Fri, 23 Aug 2019 18:10:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DCD6E266 for ; Fri, 23 Aug 2019 18:10:46 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1566583817.a039f65bedc72889219d1fdd46d18a88949355c0.whissi@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.0.2s-r1.ebuild dev-libs/openssl/openssl-1.0.2s-r200.ebuild dev-libs/openssl/openssl-1.0.2s.ebuild dev-libs/openssl/openssl-1.1.0k-r1.ebuild dev-libs/openssl/openssl-1.1.0k.ebuild X-VCS-Directories: dev-libs/openssl/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: a039f65bedc72889219d1fdd46d18a88949355c0 X-VCS-Branch: master Date: Fri, 23 Aug 2019 18:10:46 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 403c39cd-2ce7-4d18-b9c8-046444483276 X-Archives-Hash: 29dbcb92dbc63c5f426727d975fec40b commit: a039f65bedc72889219d1fdd46d18a88949355c0 Author: Thomas Deutschmann gentoo org> AuthorDate: Fri Aug 23 17:31:22 2019 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Fri Aug 23 18:10:17 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a039f65b dev-libs/openssl: bump to EAPI 7 Package-Manager: Portage-2.3.72, Repoman-2.3.17 Signed-off-by: Thomas Deutschmann gentoo.org> ...nssl-1.0.2s.ebuild => openssl-1.0.2s-r1.ebuild} | 35 ++++++++++---------- dev-libs/openssl/openssl-1.0.2s-r200.ebuild | 26 ++++++++------- ...nssl-1.1.0k.ebuild => openssl-1.1.0k-r1.ebuild} | 37 ++++++++++++++-------- 3 files changed, 56 insertions(+), 42 deletions(-) diff --git a/dev-libs/openssl/openssl-1.0.2s.ebuild b/dev-libs/openssl/openssl-1.0.2s-r1.ebuild similarity index 92% rename from dev-libs/openssl/openssl-1.0.2s.ebuild rename to dev-libs/openssl/openssl-1.0.2s-r1.ebuild index 57280189ad1..a2cb9f7917e 100644 --- a/dev-libs/openssl/openssl-1.0.2s.ebuild +++ b/dev-libs/openssl/openssl-1.0.2s-r1.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="7" -inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal +inherit flag-o-matic toolchain-funcs multilib multilib-minimal # openssl-1.0.2-patches-1.6 contain additional CVE patches # which got fixed with this release. @@ -28,9 +28,10 @@ RESTRICT="!bindist? ( bindist )" RDEPEND=">=app-misc/c_rehash-1.7-r1 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} + kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] ) + zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )" +DEPEND="${RDEPEND}" +BDEPEND=" >=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( @@ -95,7 +96,9 @@ src_prepare() { rm -f Makefile if ! use vanilla ; then - eapply "${WORKDIR}"/patch/*.patch + if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then + [[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}" + fi fi eapply_user @@ -109,7 +112,7 @@ src_prepare() { -e '/^MAKEDEPPROG/s:=.*:=$(CC):' \ -e $(has noman FEATURES \ && echo '/^install:/s:install_docs::' \ - || echo '/^MANDIR=/s:=.*:='${EPREFIX%/}'/usr/share/man:') \ + || echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \ Makefile.org \ || die # show the actual commands in the log @@ -134,7 +137,7 @@ src_prepare() { append-flags $(test-flags-CC -Wa,--noexecstack) append-cppflags -DOPENSSL_NO_BUF_FREELISTS - sed -i '1s,^:$,#!'${EPREFIX%/}'/usr/bin/perl,' Configure #141906 + 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" @@ -206,8 +209,8 @@ multilib_src_configure() { $(use_ssl sslv3 ssl3) \ $(use_ssl tls-heartbeat heartbeats) \ $(use_ssl zlib) \ - --prefix="${EPREFIX%/}"/usr \ - --openssldir="${EPREFIX%/}"${SSL_CNF_DIR} \ + --prefix="${EPREFIX}"/usr \ + --openssldir="${EPREFIX}"${SSL_CNF_DIR} \ --libdir=$(get_libdir) \ shared threads \ || die @@ -243,18 +246,18 @@ multilib_src_test() { multilib_src_install() { # We need to create $ED/usr on our own to avoid a race condition #665130 - if [[ ! -d "${ED%/}/usr" ]]; then + if [[ ! -d "${ED}/usr" ]]; then # We can only create this directory once - mkdir "${ED%/}"/usr || die + mkdir "${ED}"/usr || die fi - emake INSTALL_PREFIX="${D%/}" install + emake INSTALL_PREFIX="${D}" 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 local -a DOCS=( CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el ) einstalldocs @@ -303,7 +306,7 @@ multilib_src_install_all() { } pkg_postinst() { - ebegin "Running 'c_rehash ${EROOT%/}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069" - c_rehash "${EROOT%/}${SSL_CNF_DIR}/certs" >/dev/null + ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069" + c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null eend $? } diff --git a/dev-libs/openssl/openssl-1.0.2s-r200.ebuild b/dev-libs/openssl/openssl-1.0.2s-r200.ebuild index 44b9547d141..281b169b64b 100644 --- a/dev-libs/openssl/openssl-1.0.2s-r200.ebuild +++ b/dev-libs/openssl/openssl-1.0.2s-r200.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="7" -inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal +inherit flag-o-matic toolchain-funcs multilib multilib-minimal # openssl-1.0.2-patches-1.6 contain additional CVE patches # which got fixed with this release. @@ -22,16 +22,16 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz LICENSE="openssl" SLOT="1.0.0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux" 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 - gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] ) - zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] ) +RDEPEND="gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] ) kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] ) + zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] ) !=dev-libs/openssl-1.0.2*:0" -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" >=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( @@ -100,7 +100,9 @@ src_prepare() { rm -f Makefile if ! use vanilla ; then - eapply "${WORKDIR}"/patch/*.patch + if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then + [[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}" + fi fi eapply_user @@ -114,7 +116,7 @@ src_prepare() { -e '/^MAKEDEPPROG/s:=.*:=$(CC):' \ -e $(has noman FEATURES \ && echo '/^install:/s:install_docs::' \ - || echo '/^MANDIR=/s:=.*:='${EPREFIX%/}'/usr/share/man:') \ + || echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \ Makefile.org \ || die # show the actual commands in the log @@ -139,7 +141,7 @@ src_prepare() { append-flags $(test-flags-CC -Wa,--noexecstack) append-cppflags -DOPENSSL_NO_BUF_FREELISTS - sed -i '1s,^:$,#!'${EPREFIX%/}'/usr/bin/perl,' Configure #141906 + 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" @@ -211,8 +213,8 @@ multilib_src_configure() { $(use_ssl sslv3 ssl3) \ $(use_ssl tls-heartbeat heartbeats) \ $(use_ssl zlib) \ - --prefix="${EPREFIX%/}"/usr \ - --openssldir="${EPREFIX%/}"${SSL_CNF_DIR} \ + --prefix="${EPREFIX}"/usr \ + --openssldir="${EPREFIX}"${SSL_CNF_DIR} \ --libdir=$(get_libdir) \ shared threads \ || die diff --git a/dev-libs/openssl/openssl-1.1.0k.ebuild b/dev-libs/openssl/openssl-1.1.0k-r1.ebuild similarity index 93% rename from dev-libs/openssl/openssl-1.1.0k.ebuild rename to dev-libs/openssl/openssl-1.1.0k-r1.ebuild index f5af55a9879..5bc111be0f8 100644 --- a/dev-libs/openssl/openssl-1.1.0k.ebuild +++ b/dev-libs/openssl/openssl-1.1.0k-r1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="7" inherit flag-o-matic toolchain-funcs multilib multilib-minimal @@ -18,7 +18,8 @@ RESTRICT="!bindist? ( bindist )" RDEPEND=">=app-misc/c_rehash-1.7-r1 zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" >=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( @@ -49,17 +50,17 @@ for i in "${FEDORA_PATCH[@]}" ; do # Already have a version prefix done SRC_URI+=" bindist? ( ${FEDORA_SRC_URI[@]} )" +PATCHES=( + "${FILESDIR}"/${PN}-1.0.2a-x32-asm.patch #542618 + "${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch #671602 +) + S="${WORKDIR}/${MY_P}" MULTILIB_WRAPPED_HEADERS=( usr/include/openssl/opensslconf.h ) -PATCHES=( - "${FILESDIR}"/${PN}-1.0.2a-x32-asm.patch #542618 - "${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch #671602 -) - src_prepare() { if use bindist; then # we need to patch the patch but we cannot patch in DISTDIR... @@ -98,7 +99,9 @@ src_prepare() { rm -f Makefile if ! use vanilla ; then - eapply "${PATCHES[@]}" + if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then + [[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}" + fi fi eapply_user #332661 @@ -241,13 +244,19 @@ multilib_src_test() { } multilib_src_install() { + # We need to create $ED/usr on our own to avoid a race condition #665130 + if [[ ! -d "${ED}/usr" ]]; then + # We can only create this directory once + mkdir "${ED}"/usr || die + fi + emake DESTDIR="${D}" 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 @@ -256,13 +265,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 || die + 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##*/} @@ -285,14 +294,14 @@ 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 } pkg_postinst() { - ebegin "Running 'c_rehash ${EROOT%/}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069" - c_rehash "${EROOT%/}${SSL_CNF_DIR}/certs" >/dev/null + ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069" + c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null eend $? }