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 A71561396D0 for ; Tue, 19 Sep 2017 16:28:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D5DF81FC10D; Tue, 19 Sep 2017 16:28:12 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 A229C1FC10D for ; Tue, 19 Sep 2017 16:28:12 +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 0A42233BE32 for ; Tue, 19 Sep 2017 16:28:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A19349084 for ; Tue, 19 Sep 2017 16:28:09 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1505838484.33e0fd0f2bfce06025cd447dae5c09b11294a522.blueness@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/mbedtls/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/mbedtls/Manifest net-libs/mbedtls/mbedtls-2.2.1.ebuild net-libs/mbedtls/mbedtls-2.4.2.ebuild X-VCS-Directories: net-libs/mbedtls/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: 33e0fd0f2bfce06025cd447dae5c09b11294a522 X-VCS-Branch: master Date: Tue, 19 Sep 2017 16:28:09 +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: 95a74af6-85ae-4a03-896b-6ee7b5727d21 X-Archives-Hash: f75278c29b7e188c171ad39c8f38a8b9 commit: 33e0fd0f2bfce06025cd447dae5c09b11294a522 Author: Anthony G. Basile gentoo org> AuthorDate: Tue Sep 19 16:27:47 2017 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Tue Sep 19 16:28:04 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33e0fd0f net-libs/mbedtls: remove vulnerable versions, bug #629448 Package-Manager: Portage-2.3.8, Repoman-2.3.1 net-libs/mbedtls/Manifest | 2 - net-libs/mbedtls/mbedtls-2.2.1.ebuild | 93 ----------------------------------- net-libs/mbedtls/mbedtls-2.4.2.ebuild | 93 ----------------------------------- 3 files changed, 188 deletions(-) diff --git a/net-libs/mbedtls/Manifest b/net-libs/mbedtls/Manifest index db62a144bba..90652c5ff2f 100644 --- a/net-libs/mbedtls/Manifest +++ b/net-libs/mbedtls/Manifest @@ -1,3 +1 @@ -DIST mbedtls-2.2.1.tar.gz 1807209 SHA256 32819c62c20e8740a11b49daa5d09ac6f179edf120a87ac559cd63120b66b699 SHA512 bc97e7ddf2fcbd1c22927f5c01cfd0706a6f1051f5a62f42e97db49dcd98afbee8878b1dd815da830e3fe1b66b04ada8a0a88baf32833b2c13070c2bd29b62d5 WHIRLPOOL 2ae84564a0e35de60539030fac913396acf385e948095c2e9ee2cfe9d814c90a448d596a75cdffbb054a63ffe0a1a87b9161d5d512ec4bc7935e97803c39d139 -DIST mbedtls-2.4.2.tar.gz 1861681 SHA256 b7afab6a0f86e29c6055848b70d183c4e2531cb0ec955b66c0e4e1b7e4954bf4 SHA512 39ab068ffad99afe228749fc7f69a02a8c79f0fdb73e2dbcde2e97f737338030e2fb8507e9d1cb866429e89b255197a2225607d6645421d31d7f2ccb65bfc04f WHIRLPOOL e74864290e93d9ae52dcf6d9751d0da6b09c84f527e0a548198b2bb4869c4477628237eb1d422dcb47724435d360381fc9d7ddcc930bf078a8e5f63ee83411f4 DIST mbedtls-2.6.0.tar.gz 1912899 SHA256 8ed1e4ef5831968847565e7da1ed9cc0e9aea419da324326ae24912a03c12a1b SHA512 d03c7adace6647d7d4700bf45becde9d31144bd2adf10cc7f2a73d19fd338c8b81ab8373a81400d74818fd99ce1661979bc5386760b7a68d263fb67406ee2641 WHIRLPOOL 066dbe141c7a23ce8ba96f2b39f56b0092309a86fc6a2dab05666ab15bc66a2266a7f1341074bcdc9991b71fda5b5c0b953df13da5b87709ceaa8bc7148b634d diff --git a/net-libs/mbedtls/mbedtls-2.2.1.ebuild b/net-libs/mbedtls/mbedtls-2.2.1.ebuild deleted file mode 100644 index e4d6b420818..00000000000 --- a/net-libs/mbedtls/mbedtls-2.2.1.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils multilib cmake-utils multilib-minimal - -DESCRIPTION="Cryptographic library for embedded systems" -HOMEPAGE="https://tls.mbed.org/" -SRC_URI="https://github.com/ARMmbed/mbedtls/archive/mbedtls-${PV}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/10" # slot for libmbedtls.so -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd" -IUSE="cpu_flags_x86_sse2 doc havege libressl programs test threads zlib" - -RDEPEND=" - programs? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen media-gfx/graphviz ) - test? ( dev-lang/perl )" - -S=${WORKDIR}/${PN}-${P} - -enable_mbedtls_option() { - local myopt="$@" - # check that config.h syntax is the same at version bump - sed -i \ - -e "s://#define ${myopt}:#define ${myopt}:" \ - include/mbedtls/config.h || die -} - -src_prepare() { - use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2 - use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT - use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C - use threads && enable_mbedtls_option MBEDTLS_THREADING_C - use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD -} - -multilib_src_configure() { - local mycmakeargs=( - $(multilib_is_native_abi && cmake-utils_use_enable programs PROGRAMS \ - || echo -DENABLE_PROGRAMS=OFF) - $(cmake-utils_use_enable zlib ZLIB_SUPPORT) - -DUSE_STATIC_MBEDTLS_LIBRARY=OFF - $(cmake-utils_use_enable test TESTING) - -DUSE_SHARED_MBEDTLS_LIBRARY=ON - -DINSTALL_MBEDTLS_HEADERS=ON - -DLIB_INSTALL_DIR="/usr/$(get_libdir)" - ) - - cmake-utils_src_configure -} - -multilib_src_compile() { - cmake-utils_src_compile - use doc && multilib_is_native_abi && emake apidoc -} - -multilib_src_test() { - LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \ - cmake-utils_src_test -} - -multilib_src_install() { - cmake-utils_src_install -} - -multilib_src_install_all() { - einstalldocs - - use doc && dohtml -r apidoc - - if use programs ; then - # avoid file collisions with sys-apps/coreutils - local p e - for p in "${ED%/}"/usr/bin/* ; do - if [[ -x "${p}" && ! -d "${p}" ]] ; then - mv "${p}" "${ED%/}"/usr/bin/mbedtls_${p##*/} || die - fi - done - for e in aes hash pkey ssl test ; do - docinto "${e}" - dodoc programs/"${e}"/*.c - dodoc programs/"${e}"/*.txt - done - fi -} diff --git a/net-libs/mbedtls/mbedtls-2.4.2.ebuild b/net-libs/mbedtls/mbedtls-2.4.2.ebuild deleted file mode 100644 index 274062f8765..00000000000 --- a/net-libs/mbedtls/mbedtls-2.4.2.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils multilib-minimal - -DESCRIPTION="Cryptographic library for embedded systems" -HOMEPAGE="https://tls.mbed.org/" -SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz" -S=${WORKDIR}/${PN}-${P} - -LICENSE="Apache-2.0" -SLOT="0/10" # slot for libmbedtls.so -KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd" -IUSE="cpu_flags_x86_sse2 doc havege libressl programs test threads zlib" - -RDEPEND=" - programs? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen media-gfx/graphviz ) - test? ( dev-lang/perl )" - -enable_mbedtls_option() { - local myopt="$@" - # check that config.h syntax is the same at version bump - sed -i \ - -e "s://#define ${myopt}:#define ${myopt}:" \ - include/mbedtls/config.h || die -} - -src_prepare() { - use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2 - use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT - use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C - use threads && enable_mbedtls_option MBEDTLS_THREADING_C - use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD - - cmake-utils_src_prepare -} - -multilib_src_configure() { - local mycmakeargs=( - -DENABLE_PROGRAMS=$(multilib_native_usex programs) - -DENABLE_ZLIB_SUPPORT=$(usex zlib) - -DUSE_STATIC_MBEDTLS_LIBRARY=OFF - -DENABLE_TESTING=$(usex test) - -DUSE_SHARED_MBEDTLS_LIBRARY=ON - -DINSTALL_MBEDTLS_HEADERS=ON - -DLIB_INSTALL_DIR="/usr/$(get_libdir)" - ) - - cmake-utils_src_configure -} - -multilib_src_compile() { - cmake-utils_src_compile - use doc && multilib_is_native_abi && emake apidoc -} - -multilib_src_test() { - LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \ - cmake-utils_src_test -} - -multilib_src_install() { - cmake-utils_src_install -} - -multilib_src_install_all() { - use doc && HTML_DOCS=( apidoc ) - - einstalldocs - - if use programs ; then - # avoid file collisions with sys-apps/coreutils - local p e - for p in "${ED%/}"/usr/bin/* ; do - if [[ -x "${p}" && ! -d "${p}" ]] ; then - mv "${p}" "${ED%/}"/usr/bin/mbedtls_${p##*/} || die - fi - done - for e in aes hash pkey ssl test ; do - docinto "${e}" - dodoc programs/"${e}"/*.c - dodoc programs/"${e}"/*.txt - done - fi -}