Sender: =?UTF-8?Q?Timo_Ter=C3=A4s?= <timo.teras@gmail.com>
Date: Wed, 23 Dec 2015 08:56:15 +0200
From: Timo Teras <timo.teras@iki.fi>
To: Stuart Cardall <developer@it-offshore.co.uk>
Cc: alpine-aports@lists.alpinelinux.org
Subject: Re: [alpine-aports] [PATCH] testing/mbedtls: update to 2.2.0 + fix
 for Hiawatha
Message-ID: <20151223085615.1c5137e9@vostro>
In-Reply-To: <1450819836-22412-1-git-send-email-developer@it-offshore.co.uk>
References: <1450819836-22412-1-git-send-email-developer@it-offshore.co.uk>
Precedence: list
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

On Tue, 22 Dec 2015 21:30:36 +0000
Stuart Cardall <developer@it-offshore.co.uk> wrote:

> this also closes the Hiawatha bug:
>=20
> 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(-)
>=20
> diff --git a/testing/mbedtls/APKBUILD b/testing/mbedtls/APKBUILD
> index a24df56..e1739c4 100644
> --- a/testing/mbedtls/APKBUILD
> +++ b/testing/mbedtls/APKBUILD
> @@ -1,7 +1,7 @@
>  # Contributor: =C5=81ukasz Jendrysik <scadu@yandex.com>
>  # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
>  pkgname=3Dmbedtls
> -pkgver=3D2.1.2
> +pkgver=3D2.2.0
>  pkgrel=3D0
>  pkgdesc=3D"Light-weight cryptographic and SSL/TLS library"
>  url=3D"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.

> @@ -9,24 +9,17 @@ arch=3D"all"
>  license=3D"GPLv2+ with exceptions"
>  depends=3D""
>  depends_dev=3D""
> -makedepends=3D"$depends_dev cmake perl"
> -install=3D""
> +makedepends=3D"$depends_dev cmake perl" # libpthread-stubs"

This hunk is not needed at all.

>  subpackages=3D"$pkgname-static $pkgname-dev $pkgname-utils"
>  source=3D"https://tls.mbed.org/download/mbedtls-$pkgver-gpl.tgz"
> =20
> -_builddir=3D"$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=3D"$srcdir"/mbedtls-$pkgver

Please don't delete prepare(). And _builddir seems to have been fixed
earlier too.

> =20
>  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=3D/usr \
>  		-DCMAKE_BUILD_TYPE=3D"Release" \

Good catch!

Can you also make it a single sed call?
sed -i -e 's..' -e 's..' file



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---