[Buildroot] [PATCH v2 1/2] package/gnutls: bump to version 3.8.8

[Buildroot] [PATCH v2 1/2] package/gnutls: bump to version 3.8.8

[TIAN Yuanhao]

Signed-off-by: TIAN Yuanhao <tianyuanhao3@163.com>
---
 package/gnutls/gnutls.hash | 4 ++--
 package/gnutls/gnutls.mk   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/gnutls/gnutls.hash b/package/gnutls/gnutls.hash
index 35e842546e..6712d1f6ef 100644
--- a/package/gnutls/gnutls.hash
+++ b/package/gnutls/gnutls.hash
@@ -1,6 +1,6 @@
 # Locally calculated after checking pgp signature
-# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/gnutls-3.8.7.tar.xz.sig
-sha256  fe302f2b6ad5a564bcb3678eb61616413ed5277aaf8e7bf7cdb9a95a18d9f477  gnutls-3.8.7.tar.xz
+# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/gnutls-3.8.8.tar.xz.sig
+sha256  ac4f020e583880b51380ed226e59033244bc536cad2623f2e26f5afa2939d8fb  gnutls-3.8.8.tar.xz
 # Locally calculated
 sha256  3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986  doc/COPYING
 sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  doc/COPYING.LESSER
diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk
index a5012b1b21..67b3c16b94 100644
--- a/package/gnutls/gnutls.mk
+++ b/package/gnutls/gnutls.mk
@@ -6,7 +6,7 @@
 
 # When bumping, make sure *all* --without-libfoo-prefix options are in GNUTLS_CONF_OPTS
 GNUTLS_VERSION_MAJOR = 3.8
-GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).7
+GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).8
 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz
 GNUTLS_SITE = https://www.gnupg.org/ftp/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR)
 GNUTLS_LICENSE = LGPL-2.1+ (core library)
-- 
2.46.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v2 2/2] package/gnutls: fix configure options

[TIAN Yuanhao]

Two configure option names have been changed since version 3.7.5 [1]:

> Old: --without-libbrotli --without-libzstd (also --with-*)
> New: --without-brotli --without-zstd (also --with-*)

Fixes:

  configure: WARNING: unrecognized options: [...] --without-libbrotli, --without-libzstd

[1]: https://gitlab.com/gnutls/gnutls/-/commit/6b794e49d1a14e43f9e08023f958364712c3c89a

Signed-off-by: TIAN Yuanhao <tianyuanhao3@163.com>
Cc: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/gnutls/gnutls.mk | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk
index 67b3c16b94..a977093bd5 100644
--- a/package/gnutls/gnutls.mk
+++ b/package/gnutls/gnutls.mk
@@ -62,11 +62,11 @@ HOST_GNUTLS_CONF_OPTS = \
 	--without-tpm \
 	--without-tpm2 \
 	--disable-openssl-compatibility \
-	--without-libbrotli \
+	--without-brotli \
 	--without-idn \
 	--without-p11-kit \
 	--without-zlib \
-	--without-libzstd
+	--without-zstd
 
 ifeq ($(BR2_PACKAGE_GNUTLS_OPENSSL),y)
 GNUTLS_LICENSE += , GPL-3.0+ (gnutls-openssl library)
@@ -77,10 +77,10 @@ GNUTLS_CONF_OPTS += --disable-openssl-compatibility
 endif
 
 ifeq ($(BR2_PACKAGE_BROTLI),y)
-GNUTLS_CONF_OPTS += --with-libbrotli
+GNUTLS_CONF_OPTS += --with-brotli
 GNUTLS_DEPENDENCIES += brotli
 else
-GNUTLS_CONF_OPTS += --without-libbrotli
+GNUTLS_CONF_OPTS += --without-brotli
 endif
 
 ifeq ($(BR2_PACKAGE_CRYPTODEV_LINUX),y)
@@ -110,10 +110,10 @@ GNUTLS_CONF_OPTS += --without-zlib
 endif
 
 ifeq ($(BR2_PACKAGE_ZSTD),y)
-GNUTLS_CONF_OPTS += --with-libzstd
+GNUTLS_CONF_OPTS += --with-zstd
 GNUTLS_DEPENDENCIES += zstd
 else
-GNUTLS_CONF_OPTS += --without-libzstd
+GNUTLS_CONF_OPTS += --without-zstd
 endif
 
 # Provide a default CA cert location
-- 
2.46.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2 2/2] package/gnutls: fix configure options

[Arnout Vandecappelle via buildroot]

On 07/11/2024 14:43, TIAN Yuanhao wrote:
> Two configure option names have been changed since version 3.7.5 [1]:
> 
>> Old: --without-libbrotli --without-libzstd (also --with-*)
>> New: --without-brotli --without-zstd (also --with-*)
> 
> Fixes:
> 
>    configure: WARNING: unrecognized options: [...] --without-libbrotli, --without-libzstd
> 
> [1]: https://gitlab.com/gnutls/gnutls/-/commit/6b794e49d1a14e43f9e08023f958364712c3c89a
> 
> Signed-off-by: TIAN Yuanhao <tianyuanhao3@163.com>
> Cc: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

  Since this is a fix, I applied to master, thanks.

  Patch 1/2 is for next, not master. I didn't apply that one yet.

  Regards,
  Arnout

> ---
>   package/gnutls/gnutls.mk | 12 ++++++------
>   1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk
> index 67b3c16b94..a977093bd5 100644
> --- a/package/gnutls/gnutls.mk
> +++ b/package/gnutls/gnutls.mk
> @@ -62,11 +62,11 @@ HOST_GNUTLS_CONF_OPTS = \
>   	--without-tpm \
>   	--without-tpm2 \
>   	--disable-openssl-compatibility \
> -	--without-libbrotli \
> +	--without-brotli \
>   	--without-idn \
>   	--without-p11-kit \
>   	--without-zlib \
> -	--without-libzstd
> +	--without-zstd
>   
>   ifeq ($(BR2_PACKAGE_GNUTLS_OPENSSL),y)
>   GNUTLS_LICENSE += , GPL-3.0+ (gnutls-openssl library)
> @@ -77,10 +77,10 @@ GNUTLS_CONF_OPTS += --disable-openssl-compatibility
>   endif
>   
>   ifeq ($(BR2_PACKAGE_BROTLI),y)
> -GNUTLS_CONF_OPTS += --with-libbrotli
> +GNUTLS_CONF_OPTS += --with-brotli
>   GNUTLS_DEPENDENCIES += brotli
>   else
> -GNUTLS_CONF_OPTS += --without-libbrotli
> +GNUTLS_CONF_OPTS += --without-brotli
>   endif
>   
>   ifeq ($(BR2_PACKAGE_CRYPTODEV_LINUX),y)
> @@ -110,10 +110,10 @@ GNUTLS_CONF_OPTS += --without-zlib
>   endif
>   
>   ifeq ($(BR2_PACKAGE_ZSTD),y)
> -GNUTLS_CONF_OPTS += --with-libzstd
> +GNUTLS_CONF_OPTS += --with-zstd
>   GNUTLS_DEPENDENCIES += zstd
>   else
> -GNUTLS_CONF_OPTS += --without-libzstd
> +GNUTLS_CONF_OPTS += --without-zstd
>   endif
>   
>   # Provide a default CA cert location

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2 2/2] package/gnutls: fix configure options

[TIAN Yuanhao]

At 2024-12-05 05:51:38, "Arnout Vandecappelle" <arnout@mind.be> wrote:
>
>On 07/11/2024 14:43, TIAN Yuanhao wrote:
>> Two configure option names have been changed since version 3.7.5 [1]:
>> 
>>> Old: --without-libbrotli --without-libzstd (also --with-*)
>>> New: --without-brotli --without-zstd (also --with-*)
>> 
>> Fixes:
>> 
>>    configure: WARNING: unrecognized options: [...] --without-libbrotli, --without-libzstd
>> 
>> [1]: https://gitlab.com/gnutls/gnutls/-/commit/6b794e49d1a14e43f9e08023f958364712c3c89a
>> 
>> Signed-off-by: TIAN Yuanhao <tianyuanhao3@163.com>
>> Cc: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
>
>  Since this is a fix, I applied to master, thanks.
>
>  Patch 1/2 is for next, not master. I didn't apply that one yet.

This patch must be applied after gnutls 3.8.8, otherwise another patch is required,
see http://patchwork.ozlabs.org/project/buildroot/patch/20241009113410.5077-1-tianyuanhao3@163.com/

So I suggest applying it in the next branch.

Regards,
Yuanhao

>
>  Regards,
>  Arnout
>
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2 2/2] package/gnutls: fix configure options

[Lance Fredrickson]

In 2024.11-rc3 I am now getting this error that was not present in 
2024.11-rc2.

In file included from dlwrap/brotlienc.c:12:
dlwrap/brotlienc.h:11:10: fatal error: brotli/encode.h: No such file or 
directory
    11 | #include <brotli/encode.h>
       |          ^~~~~~~~~~~~~~~~~
compilation terminated.
In file included from dlwrap/brotlidec.c:12:
dlwrap/brotlidec.h:11:10: fatal error: brotli/decode.h: No such file or 
directory
    11 | #include <brotli/decode.h>
       |          ^~~~~~~~~~~~~~~~~
compilation terminated.

Looks from discussion that a different patch is needed or patch 2/2 
needs reverted since 1/2 is slated for next.

Lance


On 12/4/2024 7:19 PM, TIAN Yuanhao wrote:
> At 2024-12-05 05:51:38, "Arnout Vandecappelle" <arnout@mind.be> wrote:
>> On 07/11/2024 14:43, TIAN Yuanhao wrote:
>>> Two configure option names have been changed since version 3.7.5 [1]:
>>>
>>>> Old: --without-libbrotli --without-libzstd (also --with-*)
>>>> New: --without-brotli --without-zstd (also --with-*)
>>> Fixes:
>>>
>>>     configure: WARNING: unrecognized options: [...] --without-libbrotli, --without-libzstd
>>>
>>> [1]: https://gitlab.com/gnutls/gnutls/-/commit/6b794e49d1a14e43f9e08023f958364712c3c89a
>>>
>>> Signed-off-by: TIAN Yuanhao <tianyuanhao3@163.com>
>>> Cc: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
>>   Since this is a fix, I applied to master, thanks.
>>
>>   Patch 1/2 is for next, not master. I didn't apply that one yet.
> This patch must be applied after gnutls 3.8.8, otherwise another patch is required,
> see http://patchwork.ozlabs.org/project/buildroot/patch/20241009113410.5077-1-tianyuanhao3@163.com/
>
> So I suggest applying it in the next branch.
>
> Regards,
> Yuanhao
>
>>   Regards,
>>   Arnout
>>
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2 1/2] package/gnutls: bump to version 3.8.8

[Peter Korsgaard]

>>>>> "TIAN" == TIAN Yuanhao <tianyuanhao3@163.com> writes:

 > Signed-off-by: TIAN Yuanhao <tianyuanhao3@163.com>

Committed, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2 2/2] package/gnutls: fix configure options

[Peter Korsgaard]

>>>>> "Lance" == Lance Fredrickson <lancethepants@gmail.com> writes:

 > In 2024.11-rc3 I am now getting this error that was not present in
 > 2024.11-rc2.

 > In file included from dlwrap/brotlienc.c:12:
 > dlwrap/brotlienc.h:11:10: fatal error: brotli/encode.h: No such file
 > or directory
 >    11 | #include <brotli/encode.h>
 >       |          ^~~~~~~~~~~~~~~~~
 > compilation terminated.
 > In file included from dlwrap/brotlidec.c:12:
 > dlwrap/brotlidec.h:11:10: fatal error: brotli/decode.h: No such file
 > or directory
 >    11 | #include <brotli/decode.h>
 >       |          ^~~~~~~~~~~~~~~~~
 > compilation terminated.

 > Looks from discussion that a different patch is needed or patch 2/2
 > needs reverted since 1/2 is slated for next.

I have applied the bump to 3.8.8, which fixes the build here. Can you
try current master as well?

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2 2/2] package/gnutls: fix configure options

[Lance Fredrickson]

Compiles good now.

thanks!

On 12/6/2024 4:22 PM, Peter Korsgaard wrote:
>>>>>> "Lance" == Lance Fredrickson <lancethepants@gmail.com> writes:
>   > In 2024.11-rc3 I am now getting this error that was not present in
>   > 2024.11-rc2.
>
>   > In file included from dlwrap/brotlienc.c:12:
>   > dlwrap/brotlienc.h:11:10: fatal error: brotli/encode.h: No such file
>   > or directory
>   >    11 | #include <brotli/encode.h>
>   >       |          ^~~~~~~~~~~~~~~~~
>   > compilation terminated.
>   > In file included from dlwrap/brotlidec.c:12:
>   > dlwrap/brotlidec.h:11:10: fatal error: brotli/decode.h: No such file
>   > or directory
>   >    11 | #include <brotli/decode.h>
>   >       |          ^~~~~~~~~~~~~~~~~
>   > compilation terminated.
>
>   > Looks from discussion that a different patch is needed or patch 2/2
>   > needs reverted since 1/2 is slated for next.
>
> I have applied the bump to 3.8.8, which fixes the build here. Can you
> try current master as well?
>

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2 2/2] package/gnutls: fix configure options

[Peter Korsgaard]

>>>>> "Arnout" == Arnout Vandecappelle via buildroot <buildroot@buildroot.org> writes:

 > On 07/11/2024 14:43, TIAN Yuanhao wrote:
 >> Two configure option names have been changed since version 3.7.5 [1]:
 >> 
 >>> Old: --without-libbrotli --without-libzstd (also --with-*)
 >>> New: --without-brotli --without-zstd (also --with-*)
 >> Fixes:
 >> configure: WARNING: unrecognized options: [...]
 >> --without-libbrotli, --without-libzstd
 >> [1]:
 >> https://gitlab.com/gnutls/gnutls/-/commit/6b794e49d1a14e43f9e08023f958364712c3c89a
 >> Signed-off-by: TIAN Yuanhao <tianyuanhao3@163.com>
 >> Cc: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

 >  Since this is a fix, I applied to master, thanks.

 >  Patch 1/2 is for next, not master. I didn't apply that one yet.

Committed to 2024.02.x and 2024.08.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2 1/2] package/gnutls: bump to version 3.8.8

[Peter Korsgaard]

>>>>> "Peter" == Peter Korsgaard <peter@korsgaard.com> writes:

>>>>> "TIAN" == TIAN Yuanhao <tianyuanhao3@163.com> writes:
 >> Signed-off-by: TIAN Yuanhao <tianyuanhao3@163.com>

 > Committed, thanks.

Committed to 2024.02.x and 2024.08.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot