diff options
| author | Daniel Sabogal <dsabogalcc@gmail.com> | 2016-10-20 23:31:19 -0400 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2016-11-04 06:56:59 +0000 |
| commit | 156d008505827a7e207999c1ec0a00a4c5f022cc (patch) | |
| tree | 489935ba0cffa2ef0fd56bc9acc767b81eeacc2e | |
| parent | a7aa1a25085f8444e52d6da2a87676ce2dff880f (diff) | |
| download | aports-156d008505827a7e207999c1ec0a00a4c5f022cc.tar.bz2 aports-156d008505827a7e207999c1ec0a00a4c5f022cc.tar.xz | |
community/mbedtls: security upgrade to 2.4.0
With verbosity disabled (default), the testsuite attempts to redirect
stdout by assigning another FILE pointer to it. Enabling verbosity
seems to be the simplest workaround to avoid this code path.
| -rw-r--r-- | community/mbedtls/APKBUILD | 24 | ||||
| -rw-r--r-- | community/mbedtls/verbose-testsuite.patch | 11 |
2 files changed, 22 insertions, 13 deletions
diff --git a/community/mbedtls/APKBUILD b/community/mbedtls/APKBUILD index bfcfc5ab8..93eae2373 100644 --- a/community/mbedtls/APKBUILD +++ b/community/mbedtls/APKBUILD @@ -1,27 +1,22 @@ # Contributor: Łukasz Jendrysik <scadu@yandex.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mbedtls -pkgver=2.3.0 +pkgver=2.4.0 pkgrel=0 pkgdesc="Light-weight cryptographic and SSL/TLS library" url="https://tls.mbed.org/" arch="all" license="GPL2+ ASL 2.0" depends="" -depends_dev="" -makedepends="$depends_dev cmake perl" -install="" +makedepends="cmake perl" subpackages="$pkgname-static $pkgname-dev $pkgname-utils" -source="https://tls.mbed.org/download/$pkgname-$pkgver-gpl.tgz" +source="https://tls.mbed.org/download/$pkgname-$pkgver-gpl.tgz + verbose-testsuite.patch" -builddir="$srcdir"/$pkgname-$pkgver +builddir="$srcdir/$pkgname-$pkgver" build() { cd "$builddir" - # this work-around is the same one used in Arch Linux's package - # see https://github.com/ARMmbed/mbedtls/issues/522 - sed -i 's|<time.h>|"platform.h"|' include/mbedtls/ssl.h - # enable flags for non-embedded systems sed -i -e 's|//\(#define MBEDTLS_THREADING_C\)|\1|' -e 's|//\(#define MBEDTLS_THREADING_PTHREAD\)|\1|' include/mbedtls/config.h cmake . \ @@ -50,6 +45,9 @@ static() { mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib/ } -md5sums="3f396d21b9c86c0a11ac9ba0b6e6f999 mbedtls-2.3.0-gpl.tgz" -sha256sums="21237014f779bde70b2d71399cc1ea53365eb7f10cdd74a13ee6329a1910cb49 mbedtls-2.3.0-gpl.tgz" -sha512sums="f86ec87735b919e23ad7eb960a290013e7dfc2a5953d662ecee4eca7b990384c095aea74a313eaa0e1febb74e0c015879f4d680d51bc5eae811ab9e5063ba38a mbedtls-2.3.0-gpl.tgz" +md5sums="f96cd661d8e4c6bd1f50c6e0b5d19ae8 mbedtls-2.4.0-gpl.tgz +8136afec9a4503c0087fa93eb1920bd9 verbose-testsuite.patch" +sha256sums="80eff0e0028f969355d6e34ffdd3dbf4eb2a9367b07ff2f3f70e6d75beee9e3f mbedtls-2.4.0-gpl.tgz +21460d566f678f76bef8c2895e6c93d8a23792f6481aed5853dc63daf8cfcbaa verbose-testsuite.patch" +sha512sums="bc7aeabf9d6e9bce16c215df3657a99ceabc1d5841bbb772fe2425478de245b9171f908dc50944ab4105aed729d0a0b0818e4ed73cc71ac42bb88ce05eeec8d2 mbedtls-2.4.0-gpl.tgz +1a0f0c8c794f8aab2a050b660e86f3cba293fcd4d0ffba9a1a1b8fd88f631d68fe194256495ed584d13e577c577829f0bbe821ffaf11165163b5a78c9d68efe8 verbose-testsuite.patch" diff --git a/community/mbedtls/verbose-testsuite.patch b/community/mbedtls/verbose-testsuite.patch new file mode 100644 index 000000000..e039c27ca --- /dev/null +++ b/community/mbedtls/verbose-testsuite.patch @@ -0,0 +1,11 @@ +--- mbedtls-2.4.0/tests/CMakeLists.txt.orig ++++ mbedtls-2.4.0/tests/CMakeLists.txt +@@ -31,7 +31,7 @@ + include_directories(${CMAKE_CURRENT_SOURCE_DIR}) + add_executable(test_suite_${data_name} test_suite_${data_name}.c) + target_link_libraries(test_suite_${data_name} ${libs}) +- add_test(${data_name}-suite test_suite_${data_name}) ++ add_test(${data_name}-suite test_suite_${data_name} --verbose) + endfunction(add_test_suite) + + if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_CLANG) |