[vlc-devel] [vlc-commits] contrib: gnutls: ntop is available on Winstore builds but not via arpa/inet.h

[Hugo Beauzée-Luyssen]

On Tue, Mar 5, 2019, at 1:49 PM, Steve Lhomme wrote:
> vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Tue Mar  5 
> 11:27:17 2019 +0100| [a252d4d3f2c312a636c89806c0645c3124ebab7c] | 
> committer: Steve Lhomme
> 
> contrib: gnutls: ntop is available on Winstore builds but not via arpa/inet.h
> 
> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a252d4d3f2c312a636c89806c0645c3124ebab7c
> ---
> 
>  contrib/src/gnutls/gnutls-winstore-ntop.patch | 13 +++++++++++++
>  contrib/src/gnutls/rules.mak                  |  1 +
>  2 files changed, 14 insertions(+)
> 
> diff --git a/contrib/src/gnutls/gnutls-winstore-ntop.patch 
> b/contrib/src/gnutls/gnutls-winstore-ntop.patch
> new file mode 100644
> index 0000000000..86cd72c0ad
> --- /dev/null
> +++ b/contrib/src/gnutls/gnutls-winstore-ntop.patch
> @@ -0,0 +1,13 @@
> +--- gnutls/lib/x509/ip.c.ntop_win32	2019-03-05 11:21:25.250954200 +0100
> ++++ gnutls/lib/x509/ip.c	2019-03-05 11:21:31.651380300 +0100
> +@@ -26,8 +26,10 @@
> + #include <gnutls/x509.h>
> + 
> + #ifdef HAVE_INET_NTOP
> ++#ifndef _WIN32
> + # include <arpa/inet.h>
> + #endif
> ++#endif
> + 
> + /*-
> +  * _gnutls_mask_to_prefix:
> diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak
> index 4cff106575..45f1a0d23c 100644
> --- a/contrib/src/gnutls/rules.mak
> +++ b/contrib/src/gnutls/rules.mak
> @@ -22,6 +22,7 @@ gnutls: gnutls-$(GNUTLS_VERSION).tar.xz .sum-gnutls
>  	$(APPLY) $(SRC)/gnutls/gnutls-pkgconfig-static.patch
>  ifdef HAVE_WIN32
>  	$(APPLY) $(SRC)/gnutls/gnutls-win32.patch
> +	$(APPLY) $(SRC)/gnutls/gnutls-winstore-ntop.patch
>  endif
>  ifdef HAVE_ANDROID
>  	$(APPLY) $(SRC)/gnutls/no-create-time-h.patch
> 

Hi,

I'd very much like to see this upstreamed to avoid having a huge gnutls patchset again. Especially since we'll have to update to 3.6.7 after the recent false start & thread safety issue

Regards,

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