From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1218722-garchives=archives.gentoo.org@lists.gentoo.org>
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 9BD36138359
for <garchives@archives.gentoo.org>; Sat, 31 Oct 2020 12:07:24 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id C30A5E080E;
Sat, 31 Oct 2020 12:07:23 +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 57792E080E
for <gentoo-commits@lists.gentoo.org>; Sat, 31 Oct 2020 12:07:23 +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 BCEE633FEF1
for <gentoo-commits@lists.gentoo.org>; Sat, 31 Oct 2020 12:07:21 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 391C9261
for <gentoo-commits@lists.gentoo.org>; Sat, 31 Oct 2020 12:07:20 +0000 (UTC)
From: "Anthony G. Basile" <blueness@gentoo.org>
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" <blueness@gentoo.org>
Message-ID: <1604146023.a1bdf75cfef9f25bf8ee50237a5620c5a0ec0a84.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.16.7-r1.ebuild net-libs/mbedtls/mbedtls-2.23.0-r1.ebuild
X-VCS-Directories: net-libs/mbedtls/
X-VCS-Committer: blueness
X-VCS-Committer-Name: Anthony G. Basile
X-VCS-Revision: a1bdf75cfef9f25bf8ee50237a5620c5a0ec0a84
X-VCS-Branch: master
Date: Sat, 31 Oct 2020 12:07:20 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: e84ad25c-3a21-4881-a867-488a5386c69e
X-Archives-Hash: d53d84cb4fd9e2053eebb177c5d41c7c
commit: a1bdf75cfef9f25bf8ee50237a5620c5a0ec0a84
Author: John Helmert III <jchelmert3 <AT> posteo <DOT> net>
AuthorDate: Fri Oct 30 15:29:24 2020 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Oct 31 12:07:03 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1bdf75c
net-libs/mbedtls: security cleanup
Bug: https://bugs.gentoo.org/740108
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: John Helmert III <jchelmert3 <AT> posteo.net>
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
net-libs/mbedtls/Manifest | 2 -
net-libs/mbedtls/mbedtls-2.16.7-r1.ebuild | 94 -------------------------------
net-libs/mbedtls/mbedtls-2.23.0-r1.ebuild | 94 -------------------------------
3 files changed, 190 deletions(-)
diff --git a/net-libs/mbedtls/Manifest b/net-libs/mbedtls/Manifest
index eead1ee772d..aef009b8f5b 100644
--- a/net-libs/mbedtls/Manifest
+++ b/net-libs/mbedtls/Manifest
@@ -1,4 +1,2 @@
-DIST mbedtls-2.16.7.tar.gz 2658294 BLAKE2B cb53ac0c8896ce0dcc2b54edf4964267bf27057fead00f82f15de0ead786efcb4ba7e554e1c06ccb8a0f9fdedd512d94dce74a7a6e093c0a488ef257ded1458a SHA512 57374061ec8ec7cbb745aa08235d17d4566435c7ad861c0a9fdc8957e09c1ea6619f0deb8a22040fa3674d0fab58ca353879eac1388e710c81840a7ae1225b9f
DIST mbedtls-2.16.8.tar.gz 2662927 BLAKE2B 80dabffe644c792ce8a317629950bee71a2376be8f84de29d5cb92047ee433347e7e91be513d638b2954c0c7b2393eaef81b7d449753efffab25694b8a8b52d5 SHA512 645d58d42594a2b547b904634acc1e7e8583465e075c190183e1179638f05e1f8f5c56561ab172fed8dcec4a1742429663abdfdc25d607410ea64a35fbb22168
-DIST mbedtls-2.23.0.tar.gz 3877508 BLAKE2B 501aee4ec19d9b52f4c3e56b821a00ff592c28ed188f9f192e83a6cd777428eafdc6b2cba3eef20bff5e1b9dc3abd43fbd4f102529ef920e11663703799f4626 SHA512 c2a04f659bf63522f10f6660c2d196d7f39a057ff5a382734ba3b839f463ead4e5c9bc0d21fb909d56fcd2ee4c711248be14861f388cd383385484d364247634
DIST mbedtls-2.24.0.tar.gz 3912697 BLAKE2B 4355fb4db90e3d72e73adcd8ee96c7db2809154c08a00c1a3a8a8f8d6360689f17317a6dd3564c85e1fadece1a49f1ce30561ad21faf48a5bab78e223f2cd070 SHA512 5437ea57eb8b8af9446a796876aa2bfe3c59c88f926b1638c7e8a021a8bef9f4bc6cb1b254e7387e2afe095bd27c518060719726bbaf5478582a56c34315cfb8
diff --git a/net-libs/mbedtls/mbedtls-2.16.7-r1.ebuild b/net-libs/mbedtls/mbedtls-2.16.7-r1.ebuild
deleted file mode 100644
index 6114da3d948..00000000000
--- a/net-libs/mbedtls/mbedtls-2.16.7-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake 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/3.12.0" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so}
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
-IUSE="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib"
-RESTRICT="!test? ( test )"
-
-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_src_prepare
-}
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DENABLE_PROGRAMS=$(multilib_native_usex programs)
- -DENABLE_ZLIB_SUPPORT=$(usex zlib)
- -DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs)
- -DENABLE_TESTING=$(usex test)
- -DUSE_SHARED_MBEDTLS_LIBRARY=ON
- -DINSTALL_MBEDTLS_HEADERS=ON
- -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
- )
-
- cmake_src_configure
-}
-
-multilib_src_compile() {
- cmake_src_compile
- use doc && multilib_is_native_abi && cd "${S}" && emake apidoc
-}
-
-multilib_src_test() {
- LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
- cmake_src_test
-}
-
-multilib_src_install() {
- cmake_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
-}
diff --git a/net-libs/mbedtls/mbedtls-2.23.0-r1.ebuild b/net-libs/mbedtls/mbedtls-2.23.0-r1.ebuild
deleted file mode 100644
index d8a0317d15f..00000000000
--- a/net-libs/mbedtls/mbedtls-2.23.0-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake 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/5.13.1" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so}
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
-IUSE="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib"
-RESTRICT="!test? ( test )"
-
-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_src_prepare
-}
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DENABLE_PROGRAMS=$(multilib_native_usex programs)
- -DENABLE_ZLIB_SUPPORT=$(usex zlib)
- -DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs)
- -DENABLE_TESTING=$(usex test)
- -DUSE_SHARED_MBEDTLS_LIBRARY=ON
- -DINSTALL_MBEDTLS_HEADERS=ON
- -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
- )
-
- cmake_src_configure
-}
-
-multilib_src_compile() {
- cmake_src_compile
- use doc && multilib_is_native_abi && cd "${S}" && emake apidoc
-}
-
-multilib_src_test() {
- LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
- cmake_src_test
-}
-
-multilib_src_install() {
- cmake_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
-}