Mail archive
alpine-aports

Re: [alpine-aports] [PATCH] testing/mbedtls: update to 2.2.0 + fix for Hiawatha

From: Timo Teras <timo.teras_at_iki.fi>
Date: Wed, 23 Dec 2015 08:56:15 +0200

On Tue, 22 Dec 2015 21:30:36 +0000
Stuart Cardall <developer_at_it-offshore.co.uk> wrote:

> this also closes the Hiawatha bug:
>
> ns2.alpinelinux.org/issues/4537

Please refer to bug fixes like:
fixes #4537

Redmine catches that automatically and the commit gets attached to the
bug.

> ---
> testing/mbedtls/APKBUILD | 25 +++++++++----------------
> 1 file changed, 9 insertions(+), 16 deletions(-)
>
> diff --git a/testing/mbedtls/APKBUILD b/testing/mbedtls/APKBUILD
> index a24df56..e1739c4 100644
> --- a/testing/mbedtls/APKBUILD
> +++ b/testing/mbedtls/APKBUILD
> _at_@ -1,7 +1,7 @@
> # Contributor: Ɓukasz Jendrysik <scadu_at_yandex.com>
> # Maintainer: Natanael Copa <ncopa_at_alpinelinux.org>
> pkgname=mbedtls
> -pkgver=2.1.2
> +pkgver=2.2.0
> pkgrel=0
> pkgdesc="Light-weight cryptographic and SSL/TLS library"
> url="https://tls.mbed.org/"

This does not apply. mbedtls was upgraded to 2.2.0 earlier on Dec 16.
Remember to bump pkgrel when resubmitting with the config updates.

> _at_@ -9,24 +9,17 @@ arch="all"
> license="GPLv2+ with exceptions"
> depends=""
> depends_dev=""
> -makedepends="$depends_dev cmake perl"
> -install=""
> +makedepends="$depends_dev cmake perl" # libpthread-stubs"

This hunk is not needed at all.

> subpackages="$pkgname-static $pkgname-dev $pkgname-utils"
> source="https://tls.mbed.org/download/mbedtls-$pkgver-gpl.tgz"
>
> -_builddir="$srcdir"/mbedtls-2.1.2
> -prepare() {
> - local i
> - cd "$_builddir"
> - for i in $source; do
> - case $i in
> - *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return
> 1;;
> - esac
> - done
> -}
> +_builddir="$srcdir"/mbedtls-$pkgver

Please don't delete prepare(). And _builddir seems to have been fixed
earlier too.

>
> build() {
> cd "$_builddir"
> + # enable flags for non-embedded systems
> + sed -i 's|//\(#define MBEDTLS_THREADING_C\)|\1|'
> include/mbedtls/config.h
> + sed -i 's|//\(#define MBEDTLS_THREADING_PTHREAD\)|\1|'
> include/mbedtls/config.h cmake . \
> -DCMAKE_INSTALL_PREFIX=/usr \
> -DCMAKE_BUILD_TYPE="Release" \

Good catch!

Can you also make it a single sed call?
sed -i -e 's..' -e 's..' file



---
Unsubscribe:  alpine-aports+unsubscribe_at_lists.alpinelinux.org
Help:         alpine-aports+help_at_lists.alpinelinux.org
---
Received on Wed Dec 23 2015 - 08:56:15 GMT