From 8b26c09d67b36a5b5dbb295924ae14ecc5d079bd Mon Sep 17 00:00:00 2001 From: "Anthony G. Basile" Date: Tue, 10 Nov 2015 20:55:46 -0500 Subject: net-libs/mbedtls: version bump to 2.1.3 This is a maintenance release bump which contains fixes for the security issues as well as other bugs. Package-Manager: portage-2.2.20.1 --- net-libs/mbedtls/Manifest | 2 +- net-libs/mbedtls/mbedtls-2.1.2.ebuild | 94 ----------------------------------- net-libs/mbedtls/mbedtls-2.1.3.ebuild | 94 +++++++++++++++++++++++++++++++++++ 3 files changed, 95 insertions(+), 95 deletions(-) delete mode 100644 net-libs/mbedtls/mbedtls-2.1.2.ebuild create mode 100644 net-libs/mbedtls/mbedtls-2.1.3.ebuild (limited to 'net-libs') diff --git a/net-libs/mbedtls/Manifest b/net-libs/mbedtls/Manifest index b8cfb8f39177..21c794d25bde 100644 --- a/net-libs/mbedtls/Manifest +++ b/net-libs/mbedtls/Manifest @@ -1,2 +1,2 @@ -DIST mbedtls-2.1.2.tar.gz 1775666 SHA256 c51c7e1dd91d7ef2115e9382b8d1cfabcb3f54063fe8198e9ee9d0fe839cceed SHA512 36a6cdb1a403ac36cb723bf93f6a8a84da0c7b177aa18d984072dca40a024f7265c4788852e115a8fe724c5913c2d93fa07559a5ee67a8ddacdc005396d53cd8 WHIRLPOOL 9475f75a56b6b4402f72a185fd8a2fa62774efca9b56353f30b1c1682dd35b7fd3b2c6104c93c7109876951ee00021ade9f79a975fdb0e18486ea9180a4709a0 +DIST mbedtls-2.1.3.tar.gz 1789846 SHA256 94da4618d5a518b99f7914a5e348be436e3571113d9a9978d130725a1fc7bfac SHA512 c9ab514779c20b632d3a4027dd7c0027a916ff8d55f1f8ba80b0ef0d47a1d09f4bab7cb8bbd910d4e130e1f19d043d681572ba86ace9c3a4db60b2b051141a93 WHIRLPOOL 0547690b76f44c36da0eecf36bc8ce3ae6cd840ad8029f5711b6dc275b371abb6e2a87346ccb0bc9ce14b2b777b665a88364eecd7ab16a0d321dc8bc91c0c000 DIST mbedtls-2.2.0.tar.gz 1803014 SHA256 75494361e412444b38ebb9c908b7e17a5fb582eb9c3fadb2fe9b21e96f1bf8cb SHA512 cf9ea03792ef6c54e77cd4c2410517b6e124f8ee7132c78c0463fc1cf3a6eff656d8436abfb0c6238bd5484fcefc1ec42598ee6d8128ec88df1d04b053739fd1 WHIRLPOOL 7bdfdabf043f0eee8edd0af286640a3ae6bee928ede3f74a32d6bafc921a874a9d2af78aa7f6d637394abe1ea92ef0caca9c42e6808d530007fc6b99ab3ee18a diff --git a/net-libs/mbedtls/mbedtls-2.1.2.ebuild b/net-libs/mbedtls/mbedtls-2.1.2.ebuild deleted file mode 100644 index ec6bd00323d7..000000000000 --- a/net-libs/mbedtls/mbedtls-2.1.2.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -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 ~hppa ~mips ~ppc ~ppc64 ~s390 ~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 ) - ) - 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.1.3.ebuild b/net-libs/mbedtls/mbedtls-2.1.3.ebuild new file mode 100644 index 000000000000..ec6bd00323d7 --- /dev/null +++ b/net-libs/mbedtls/mbedtls-2.1.3.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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 ~hppa ~mips ~ppc ~ppc64 ~s390 ~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 ) + ) + 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 +} -- cgit v1.2.3-65-gdbad