diff --git a/gnutls-3.4.1-supplemental-api.patch b/gnutls-3.4.1-supplemental-api.patch new file mode 100644 index 0000000..e271198 --- /dev/null +++ b/gnutls-3.4.1-supplemental-api.patch @@ -0,0 +1,26 @@ +From 0aa904debe1189bbf41d2d4240e2759f0fc56184 Mon Sep 17 00:00:00 2001 +From: Nikos Mavrogiannopoulos +Date: Tue, 5 May 2015 09:36:17 +0200 +Subject: [PATCH] define GNUTLS_SUPPLEMENTAL_USER_MAPPING_DATA + +--- + lib/includes/gnutls/compat.h | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/lib/includes/gnutls/compat.h b/lib/includes/gnutls/compat.h +index 537aef0..0e77943 100644 +--- a/lib/includes/gnutls/compat.h ++++ b/lib/includes/gnutls/compat.h +@@ -240,6 +240,9 @@ gnutls_global_set_mem_functions(gnutls_alloc_function alloc_func, + gnutls_realloc_function realloc_func, + gnutls_free_function free_func) _GNUTLS_GCC_ATTR_DEPRECATED; + ++/* defined in old headers - unused nevertheless */ ++#define GNUTLS_SUPPLEMENTAL_USER_MAPPING_DATA 0 ++ + /* *INDENT-OFF* */ + #ifdef __cplusplus + } +-- +2.1.0 + diff --git a/gnutls.spec b/gnutls.spec index 1033469..9b978ee 100644 --- a/gnutls.spec +++ b/gnutls.spec @@ -3,7 +3,7 @@ Summary: A TLS protocol implementation Name: gnutls Version: 3.4.1 -Release: 1%{?dist} +Release: 2%{?dist} # The libraries are LGPLv2.1+, utilities are GPLv3+ License: GPLv3+ and LGPLv2+ Group: System Environment/Libraries @@ -35,6 +35,7 @@ Source2: hobble-gnutls Patch1: gnutls-3.2.7-rpath.patch Patch3: gnutls-3.1.11-nosrp.patch Patch4: gnutls-3.4.1-default-policy.patch +Patch5: gnutls-3.4.1-supplemental-api.patch # Wildcard bundling exception https://fedorahosted.org/fpc/ticket/174 Provides: bundled(gnulib) = 20130424 @@ -137,6 +138,7 @@ This package contains Guile bindings for the library. %patch1 -p1 -b .rpath %patch3 -p1 -b .nosrp %patch4 -p1 -b .default-policy +%patch5 -p1 -b .supplemental-api sed 's/gnutls_srp.c//g' -i lib/Makefile.in sed 's/gnutls_srp.lo//g' -i lib/Makefile.in rm -f lib/minitasn1/*.c lib/minitasn1/*.h @@ -272,6 +274,9 @@ fi %endif %changelog +* Tue May 5 2015 Nikos Mavrogiannopoulos 3.4.1-2 +- Provide missing GNUTLS_SUPPLEMENTAL_USER_MAPPING_DATA definition + * Mon May 4 2015 Nikos Mavrogiannopoulos 3.4.1-1 - new upstream release