gnutls: Disable ncrypt support

It's Windows Vista only and our mingw toolchain does not support it currently
either.

4 files changed, 40 insertions, 5 deletions

diff --git a/recipes/gnutls.recipe b/recipes/gnutls.recipe
index 57d71abe..b41aea49 100644
--- a/recipes/gnutls.recipe
+++ b/recipes/gnutls.recipe
@@ -22,7 +22,8 @@ class Recipe(recipe.Recipe):
         Platform.DARWIN: ['bionic-fixup']
     }
     patches = [name + "/0001-configure-vasprintf-is-defined-in-stdio.h.patch",
-               name + "/0002-configure-Android-is-ELF-too.patch"]
+               name + "/0002-configure-Android-is-ELF-too.patch",
+               name + "/0003-Disable-ncrypt-support.patch"]
     autoreconf = True
 
     files_libs = ['libgnutls', 'libgnutlsxx']
diff --git a/recipes/gnutls/0001-configure-vasprintf-is-defined-in-stdio.h.patch b/recipes/gnutls/0001-configure-vasprintf-is-defined-in-stdio.h.patch
index 3f1da7c2..9295342e 100644
--- a/recipes/gnutls/0001-configure-vasprintf-is-defined-in-stdio.h.patch
+++ b/recipes/gnutls/0001-configure-vasprintf-is-defined-in-stdio.h.patch
@@ -1,7 +1,7 @@
-From aac609327e2c6c57e488213b58e38134ff26a526 Mon Sep 17 00:00:00 2001
+From c6e88515b90df7240a23fb66320a544ca3d24adc Mon Sep 17 00:00:00 2001
 From: Nirbheek Chauhan <nirbheek@centricular.com>
 Date: Tue, 31 Mar 2015 15:57:59 +0530
-Subject: [PATCH 1/2] configure: vasprintf is defined in stdio.h
+Subject: [PATCH 1/3] configure: vasprintf is defined in stdio.h
 
 mingw requires you to include stdio to make vasprintf available. Without this,
 compilation using mingw fails due to redefinition of asprintf.
diff --git a/recipes/gnutls/0002-configure-Android-is-ELF-too.patch b/recipes/gnutls/0002-configure-Android-is-ELF-too.patch
index 8921193d..e13059f1 100644
--- a/recipes/gnutls/0002-configure-Android-is-ELF-too.patch
+++ b/recipes/gnutls/0002-configure-Android-is-ELF-too.patch
@@ -1,7 +1,7 @@
-From 5fe39cc3e11a6194801dc1e481063684e4c42a9a Mon Sep 17 00:00:00 2001
+From 6aa766813b4c93458dfbfe0e62590ba76cea3ec7 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
 Date: Wed, 24 Feb 2016 12:42:26 +0200
-Subject: [PATCH 2/2] configure: Android is ELF too
+Subject: [PATCH 2/3] configure: Android is ELF too
 
 ---
  configure.ac | 1 +
diff --git a/recipes/gnutls/0003-Disable-ncrypt-support.patch b/recipes/gnutls/0003-Disable-ncrypt-support.patch
new file mode 100644
index 00000000..3518d6f7
--- /dev/null
+++ b/recipes/gnutls/0003-Disable-ncrypt-support.patch
@@ -0,0 +1,34 @@
+From 3f009ce19972fd78b216a7598a04943daf7b6817 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
+Date: Wed, 24 Feb 2016 16:46:11 +0200
+Subject: [PATCH 3/3] Disable ncrypt support
+
+It's Windows Vista only and our mingw toolchain does not support it currently
+either.
+---
+ lib/Makefile.am | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/lib/Makefile.am b/lib/Makefile.am
+index 873a569..1ce9728 100644
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -85,11 +85,11 @@ COBJECTS = gnutls_range.c gnutls_record.c \
+ 	safe-memfuncs.c inet_pton.c atfork.c atfork.h \
+ 	system-keys.h urls.c urls.h auto-verify.c
+ 
+-if WINDOWS
+-COBJECTS += system-keys-win.c
+-else
++#if WINDOWS
++#COBJECTS += system-keys-win.c
++#else
+ COBJECTS += system-keys-dummy.c
+-endif
++#endif
+ 
+ if ENABLE_SELF_CHECKS
+ COBJECTS += crypto-selftests.c crypto-selftests-pk.c
+-- 
+2.7.0
+