[vlc-devel] [vlc-commits] contrib: gnutls: update to current stable 3.5.16 (fixes #19350)

[Hugo Beauzée-Luyssen]

On Tue, Dec 26, 2017, at 4:04 PM, Rémi Denis-Courmont wrote:
> vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Dec 
> 26 16:45:47 2017 +0200| [77c81de4c18db1eb2d57561dddf7836886871cef] | 
> committer: Rémi Denis-Courmont
> 
> contrib: gnutls: update to current stable 3.5.16 (fixes #19350)
> 
> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=77c81de4c18db1eb2d57561dddf7836886871cef
> ---
> 
>  contrib/src/gnutls/SHA512SUMS                    | 2 +-
>  contrib/src/gnutls/gnutls-pkgconfig-static.patch | 9 +++++----
>  contrib/src/gnutls/rules.mak                     | 7 ++++---
>  3 files changed, 10 insertions(+), 8 deletions(-)
> 
> diff --git a/contrib/src/gnutls/SHA512SUMS b/contrib/src/gnutls/
> SHA512SUMS
> index 7292832e42..e5e3af8db4 100644
> --- a/contrib/src/gnutls/SHA512SUMS
> +++ b/contrib/src/gnutls/SHA512SUMS
> @@ -1 +1 @@
> -
> d75f6b4dea2dc742cd7f60ee0ee540d41b69991aaa937ca0138cfdf4a1e0dfaaa3863464303bfa5799e14ee02de252f71c59a7a9e57b96ff8af653e419edfd4e  
> gnutls-3.4.14.tar.xz
> +451d3167be599ed8e0333dd7c9f8501fcb47b7aa871aeb461c368381c0b7ecd7e2026ec35dbbb2aa685cb2c3a22e9296e0a0699409e3744b731c1bb7e7e69f07  
> gnutls-3.5.16.tar.xz
> diff --git a/contrib/src/gnutls/gnutls-pkgconfig-static.patch b/contrib/
> src/gnutls/gnutls-pkgconfig-static.patch
> index 361d65104b..0a5ecfcef0 100644
> --- a/contrib/src/gnutls/gnutls-pkgconfig-static.patch
> +++ b/contrib/src/gnutls/gnutls-pkgconfig-static.patch
> @@ -1,10 +1,11 @@
> ---- gnutls/lib/gnutls.pc.in    2015-11-03 21:47:28.000000000 +0000
> -+++ gnutls.patched/lib/gnutls.pc.in    2016-11-02 22:53:04.272156182 
> +0000
> +diff -ru gnutls-3.5.16/lib/gnutls.pc.in gnutls-3.5.16.patched/lib/
> gnutls.pc.in
> +--- gnutls-3.5.16/lib/gnutls.pc.in	2017-03-28 20:20:50.000000000 +0300
> ++++ gnutls-3.5.16.patched/lib/gnutls.pc.in	2017-12-26 16:47:54.502835713 
> +0200
>  @@ -19,6 +19,6 @@
>   URL: http://www.gnutls.org/
>   Version: @VERSION@
>   Libs: -L${libdir} -lgnutls
> --Libs.private: @LIBZ@ @LIBINTL@ @LIBSOCKET@ @LIBPTHREAD@ @LIBICONV@ 
> @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@
> -+Libs.private: @LIBZ@ @LIBINTL@ @LIBSOCKET@ @LIBPTHREAD@ @LIBICONV@ 
> @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @NETTLE_LIBS@ 
> @LIBIDN_LIBS@ @HOGWEED_LIBS@
> +-Libs.private: @LIBZ_PC@ @LIBINTL@ @LIBSOCKET@ @LIBNSL@ @LIBPTHREAD@ 
> @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LIBUNISTRING@ @LIBIDN2_LIBS@
> ++Libs.private: @LIBZ@ @LIBINTL@ @LIBSOCKET@ @LIBNSL@ @LIBPTHREAD@ 
> @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LIBUNISTRING@ @LIBIDN2_LIBS@ 
> @LIBIDN_LIBS@ @HOGWEED_LIBS@ @NETTLE_LIBS@
>   @GNUTLS_REQUIRES_PRIVATE@
>   Cflags: -I${includedir}
> diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak
> index 41ba844d23..b6d8d1c1a2 100644
> --- a/contrib/src/gnutls/rules.mak
> +++ b/contrib/src/gnutls/rules.mak
> @@ -1,7 +1,7 @@
>  # GnuTLS
>  
> -GNUTLS_VERSION := 3.4.14
> -GNUTLS_URL := 
> ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/gnutls-$(GNUTLS_VERSION).tar.xz
> +GNUTLS_VERSION := 3.5.16
> +GNUTLS_URL := 
> ftp://ftp.gnutls.org/gcrypt/gnutls/v3.5/gnutls-$(GNUTLS_VERSION).tar.xz
>  
>  ifdef BUILD_NETWORK
>  ifndef HAVE_DARWIN_OS
> @@ -34,8 +34,8 @@ ifdef HAVE_ANDROID
>  	$(APPLY) $(SRC)/gnutls/gnutls-android.patch
>  endif
>  	$(APPLY) $(SRC)/gnutls/read-file-limits.h.patch
> -	$(APPLY) $(SRC)/gnutls/mac-keychain-lookup.patch
>  ifdef HAVE_MACOSX
> +	$(APPLY) $(SRC)/gnutls/mac-keychain-lookup.patch
>  	$(APPLY) $(SRC)/gnutls/gnutls-pkgconfig-osx.patch
>  	$(APPLY) $(SRC)/gnutls/gnutls-disable-getentropy-osx.patch
>  endif
> @@ -59,6 +59,7 @@ GNUTLS_CONF := \
>  	--disable-doc \
>  	--disable-tests \
>  	--with-included-libtasn1 \
> +	--with-included-unistring \
>  	$(HOSTCONF)
>  
>  GNUTLS_ENV := $(HOSTVARS)
> 
> _______________________________________________
> vlc-commits mailing list
> vlc-commits at videolan.org
> https://mailman.videolan.org/listinfo/vlc-commits

Hi,

This breaks windows builds
(cd gnutls-3.5.16 && patch -fp1) < ../../contrib/src/gnutls/gnutls-pkgconfig-static.patch
patching file lib/gnutls.pc.in
(cd gnutls-3.5.16 && patch -fp1) < ../../contrib/src/gnutls/gnutls-win32.patch
patching file lib/gnutls.pc.in
Hunk #1 FAILED at 19.
1 out of 1 hunk FAILED -- saving rejects to file lib/gnutls.pc.in.rej
patching file lib/includes/gnutls/gnutls.h.in
Hunk #1 succeeded at 69 (offset 1 line).
../../contrib/src/gnutls/rules.mak:21: recipe for target 'gnutls' failed
make: *** [gnutls] Error 1

-- 
  Hugo Beauzée-Luyssen
  hugo at beauzee.fr