diff options
| -rw-r--r-- | recipes/gnutls.recipe | 7 | ||||
| -rw-r--r-- | recipes/gnutls/0001-configure-vasprintf-is-defined-in-stdio.h.patch | 55 | ||||
| -rw-r--r-- | recipes/gnutls/0003-Disable-ncrypt-support.patch | 27 |
3 files changed, 17 insertions, 72 deletions
diff --git a/recipes/gnutls.recipe b/recipes/gnutls.recipe index 23bb95e6..d2266d0c 100644 --- a/recipes/gnutls.recipe +++ b/recipes/gnutls.recipe @@ -5,14 +5,14 @@ from cerbero.utils import needs_xcode8_sdk_workaround class Recipe(recipe.Recipe): name = 'gnutls' - version = '3.4.17' + version = '3.5.9' maj_ver = '.'.join(version.split('.')[0:2]) url = 'ftp://ftp.gnutls.org/gcrypt/{0}/v{1}/{0}-{2}.tar.xz'.format(name, maj_ver, version) stype = SourceType.TARBALL # main library is LGPLv2+ and binaries is GPLv3+ and defined below licenses = [License.LGPLv2Plus] configure_options = "--enable-local-libopts --disable-guile --disable-openssl-compatibility \ - --without-p11-kit --enable-static --enable-zlib --enable-shared --disable-doc" + --without-p11-kit --enable-static --enable-zlib --enable-shared --disable-doc --with-included-unistring" deps = ['zlib', 'nettle', 'libtasn1'] # GnuTLS uses error.h, which is a GNU extension only available with glibc # bionic-fixup provides that to us for all platforms @@ -22,8 +22,7 @@ class Recipe(recipe.Recipe): Platform.IOS: ['bionic-fixup'], Platform.DARWIN: ['bionic-fixup'] } - patches = [name + "/0001-configure-vasprintf-is-defined-in-stdio.h.patch", - name + "/0003-Disable-ncrypt-support.patch"] + patches = [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 deleted file mode 100644 index 5266b780..00000000 --- a/recipes/gnutls/0001-configure-vasprintf-is-defined-in-stdio.h.patch +++ /dev/null @@ -1,55 +0,0 @@ -From a6dca58b1379edd0a716bc2cb2448db28236d8cd 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/4] 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. ---- - configure.ac | 7 +++++-- - gl/m4/vasprintf.m4 | 4 ++-- - 2 files changed, 7 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 23eb576..22b2d98 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -203,8 +203,9 @@ AC_C_BIGENDIAN - - dnl No fork on MinGW, disable some self-tests until we fix them. - dnl Check clock_gettime and pthread_mutex_lock in libc (avoid linking to other libs) --AC_CHECK_FUNCS([fork inet_ntop inet_pton getrusage getpwuid_r nanosleep daemon getpid clock_gettime iconv localtime vasprintf],,) --if test "$ac_cv_func_vasprintf" != "yes";then -+AC_CHECK_FUNCS([fork inet_ntop inet_pton getrusage getpwuid_r nanosleep daemon getpid clock_gettime iconv localtime],,) -+AC_CHECK_DECLS([vasprintf]) -+if test "$ac_cv_have_decl_vasprintf" != "yes";then - AC_MSG_CHECKING([for va_copy]) - AC_LINK_IFELSE([AC_LANG_PROGRAM([ - #include <stdarg.h> -@@ -225,6 +226,8 @@ if test "$ac_cv_func_vasprintf" != "yes";then - [AC_MSG_RESULT(no) - AC_MSG_ERROR([Your system lacks vasprintf() and va_copy()])]) - ]) -+else -+ AC_DEFINE(HAVE_VASPRINTF, 1, [Have vasprintf()]) - fi - - AM_CONDITIONAL(HAVE_FORK, test "$ac_cv_func_fork" != "no") -diff --git a/gl/m4/vasprintf.m4 b/gl/m4/vasprintf.m4 -index b785dc3..c01ab64 100644 ---- a/gl/m4/vasprintf.m4 -+++ b/gl/m4/vasprintf.m4 -@@ -7,8 +7,8 @@ dnl with or without modifications, as long as this notice is preserved. - - AC_DEFUN([gl_FUNC_VASPRINTF], - [ -- AC_CHECK_FUNCS([vasprintf]) -- if test $ac_cv_func_vasprintf = no; then -+ AC_CHECK_DECLS([vasprintf]) -+ if test $ac_cv_have_decl_vasprintf = no; then - gl_REPLACE_VASPRINTF - fi - ]) --- -2.7.0 - diff --git a/recipes/gnutls/0003-Disable-ncrypt-support.patch b/recipes/gnutls/0003-Disable-ncrypt-support.patch index 1a2a331a..5076839c 100644 --- a/recipes/gnutls/0003-Disable-ncrypt-support.patch +++ b/recipes/gnutls/0003-Disable-ncrypt-support.patch @@ -1,34 +1,35 @@ -From 4df19d35188fe9e49eb720760b7aba9ebc3e80e1 Mon Sep 17 00:00:00 2001 +From 1b408de7690f293ef02f2180fb43f96048e3e4f0 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/4] Disable ncrypt support +Subject: [PATCH] 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(-) + lib/Makefile.am | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/Makefile.am b/lib/Makefile.am -index 873a569..1ce9728 100644 +index dc49bc6..9963f85 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 +@@ -86,11 +86,11 @@ COBJECTS = range.c record.c compress.c debug.c cipher.c \ + system-keys.h urls.c urls.h prf.c auto-verify.c dh-session.c \ + cert-session.c handshake-checks.c dtls-sw.c dh-primes.c -if WINDOWS --COBJECTS += system-keys-win.c +-COBJECTS += system/keys-win.c -else +-COBJECTS += system/keys-dummy.c +-endif +#if WINDOWS -+#COBJECTS += system-keys-win.c ++#COBJECTS += system/keys-win.c +#else - COBJECTS += system-keys-dummy.c --endif ++COBJECTS += system/keys-dummy.c +#endif if ENABLE_SELF_CHECKS COBJECTS += crypto-selftests.c crypto-selftests-pk.c -- -2.7.0 +2.11.0 |