[yocto] [PATCHv2][meta-gplv2] gnutls: add older gnutls compatible with nettle

[Andre McCurdy]

On Mon, Apr 24, 2017 at 10:20 PM, Mike Looijmans
<mike.looijmans at topic.nl> wrote:
> On 24-04-17 16:29, Martin Jansa wrote:
>>
>> * gnutls depends on nettle-3.1* since 3.4.0:
>>   The requirement for nettle was bumped from 3.0 to 3.1 in gnutls_3_4_0
>>
>> https://gitlab.com/gnutls/gnutls/commit/c84129af91b21d33ffe086e507632771b0e76498
>>   and from 2.7 to 3.0 a bit earlier also in gnutls_3_4_0
>>
>> https://gitlab.com/gnutls/gnutls/commit/3fa80cf68919f07b3351b2722278ba463d6e731c
>> * add recipe for last release in 3.3 branch which is compatible
>>   with nettle 2.7.1 used in meta-gplv2
>>
>> Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
>> ---
>>  .../gnutls/configure.ac-fix-sed-command.patch      | 31
>> ++++++++++++++++++++++
>>  recipes-support/gnutls/gnutls_3.3.27.bb            | 23 ++++++++++++++++
>>  2 files changed, 54 insertions(+)
>>  create mode 100644
>> recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch
>>  create mode 100644 recipes-support/gnutls/gnutls_3.3.27.bb
>>
>> diff --git
>> a/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch
>> b/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch
>> new file mode 100644
>> index 0000000..44a9934
>> --- /dev/null
>> +++ b/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch
>> @@ -0,0 +1,31 @@
>> +From eb93aa7b986c84da60a3db40afb29d1a70c50223 Mon Sep 17 00:00:00 2001
>> +From: Robert Yang <liezhi.yang at windriver.com>
>> +Date: Sat, 17 Jan 2015 17:02:15 +0000
>> +Subject: [PATCH] configure.ac: fix sed command
>> +
>> +The "sed 's/.bak//g'" matchs "bitbake", which would cause strange errors
>> +when the S contains "bitbake", fix to "sed 's/\.bak$//'`"
>> +
>> +Upstream-Status: Pending
>> +
>> +Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
>> +---
>> + configure.ac | 2 +-
>> + 1 file changed, 1 insertion(+), 1 deletion(-)
>> +
>> +diff --git a/configure.ac b/configure.ac
>> +index c6818a0..1c4582d 100644
>> +--- a/configure.ac
>> ++++ b/configure.ac
>> +@@ -466,7 +466,7 @@ if test "$NEED_LIBOPTS_DIR" = "true";then
>> +       dnl replace libopts-generated files with distributed backups, if
>> present
>> +       missing_baks=
>> +       for i in ${srcdir}/src/*-args.c.bak ${srcdir}/src/*-args.h.bak; do
>> +-              nam=`echo $i|sed 's/.bak//g'`
>> ++              nam=`echo $i|sed 's/\.bak$//'`
>
> How about:
>  nam=`basename $i .bak`

This patch is a rebased version of the one in oe-core, so the oe-core
version should probably be the first candidate for any such
improvements.

>> +               if test -f $i;then
>> +                       cp -f $i $nam
>> +               else
>> +--
>> +2.0.1
>> +
>> diff --git a/recipes-support/gnutls/gnutls_3.3.27.bb
>> b/recipes-support/gnutls/gnutls_3.3.27.bb
>> new file mode 100644
>> index 0000000..c98da34
>> --- /dev/null
>> +++ b/recipes-support/gnutls/gnutls_3.3.27.bb
>> @@ -0,0 +1,23 @@
>> +require recipes-support/gnutls/gnutls.inc
>> +
>> +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
>> +
>> file://COPYING.LESSER;md5=a6f89e2100d9b6cdffcea4f398e37343"
>> +
>> +FILESEXTRAPATHS_prepend =
>> "${COREBASE}/meta/recipes-support/${BPN}/${BPN}:"
>> +
>> +SRC_URI += " \
>> +    file://correct_rpl_gettimeofday_signature.patch \
>> +    file://configure.ac-fix-sed-command.patch \
>> +    file://use-pkg-config-to-locate-zlib.patch \
>> +"
>> +SRC_URI[md5sum] = "8ee8cebd7f7575b11f232766a21c31d3"
>> +SRC_URI[sha256sum] =
>> "8dfda16c158ef5c134010d51d1a91d02aa5d43b8cb711b1572650a7ffb56b17f"
>> +
>> +# This version doesn't support this option added in newer gnutls
>> +# ERROR: gnutls-3.3.27-r0 do_configure: QA Issue: gnutls: configure was
>> passed unrecognised options: --with-idn [unknown-configure-option]
>> +PACKAGECONFIG[libidn] = ""
>> +# but it still has the libidn dependency, without this option
>> +EXTRA_OECONF += "--disable-crywrap"
>> +
>> +# This version doesn't support this option added in newer gnutls
>> +EXTRA_OECONF_remove = "--without-libunistring-prefix"
>>
>
>
>
> Kind regards,
>
> Mike Looijmans
> System Expert
>
> TOPIC Products
> Materiaalweg 4, NL-5681 RJ Best
> Postbus 440, NL-5680 AK Best
> Telefoon: +31 (0) 499 33 69 79
> E-mail: mike.looijmans at topicproducts.com
> Website: www.topicproducts.com
>
> Please consider the environment before printing this e-mail
>
>
>
>
>
>
> --
> _______________________________________________
> yocto mailing list
> yocto at yoctoproject.org
> https://lists.yoctoproject.org/listinfo/yocto