[vlc-commits] contrib: gnutls: Don't use %n on android

[Hugo Beauzée-Luyssen]

vlc/vlc-3.0 | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Wed Dec 19 10:17:51 2018 +0100| [828e0ce573758ce617377a99431a2ea8821742e1] | committer: Hugo Beauzée-Luyssen

contrib: gnutls: Don't use %n on android

This patch was already upstreamed, and is not required by newer versions
of gnutls (>=3.6.6)
http://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=6c0f109fb98501fc8d65ea2c83501b45a80b00ab

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=828e0ce573758ce617377a99431a2ea8821742e1
---

 contrib/src/gnutls/rules.mak                             |  1 +
 contrib/src/gnutls/vasnprintf-android-no-percent-n.patch | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak
index 5da56c2190..98bfd33acf 100644
--- a/contrib/src/gnutls/rules.mak
+++ b/contrib/src/gnutls/rules.mak
@@ -37,6 +37,7 @@ ifdef HAVE_MACOSX
 	$(APPLY) $(SRC)/gnutls/gnutls-disable-connectx-macos.patch
 endif
 	$(APPLY) $(SRC)/gnutls/gnutls-libidn.patch
+	$(APPLY) $(SRC)/gnutls/vasnprintf-android-no-percent-n.patch
 	$(call pkg_static,"lib/gnutls.pc.in")
 	$(UPDATE_AUTOCONFIG)
 	$(MOVE)
diff --git a/contrib/src/gnutls/vasnprintf-android-no-percent-n.patch b/contrib/src/gnutls/vasnprintf-android-no-percent-n.patch
new file mode 100644
index 0000000000..ed3b25f522
--- /dev/null
+++ b/contrib/src/gnutls/vasnprintf-android-no-percent-n.patch
@@ -0,0 +1,11 @@
+--- gnutls-3.5.19/gl/vasnprintf.c.orig	2018-12-19 10:14:55.478883083 +0100
++++ gnutls-3.5.19/gl/vasnprintf.c	2018-12-19 10:15:22.798882978 +0100
+@@ -4858,7 +4858,7 @@
+ #endif
+                   *fbp = dp->conversion;
+ #if USE_SNPRINTF
+-# if !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__))
++# if !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) || defined __ANDROID__ )
+                 fbp[1] = '%';
+                 fbp[2] = 'n';
+                 fbp[3] = '\0';