updated to 3.4.2

Resolves: rhbz#1232525
This commit is contained in:
Nikos Mavrogiannopoulos 2015-06-17 10:40:59 +02:00
parent ece2d60f8d
commit 3893efa4b8
4 changed files with 7 additions and 31 deletions

1
.gitignore vendored
View File

@ -51,3 +51,4 @@ gnutls-2.10.1-nosrp.tar.bz2
/gnutls-3.3.13-hobbled.tar.xz
/gnutls-3.3.14-hobbled.tar.xz
/gnutls-3.4.1-hobbled.tar.xz
/gnutls-3.4.2-hobbled.tar.xz

View File

@ -1,26 +0,0 @@
From 0aa904debe1189bbf41d2d4240e2759f0fc56184 Mon Sep 17 00:00:00 2001
From: Nikos Mavrogiannopoulos <nmav@redhat.com>
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

View File

@ -2,8 +2,8 @@
%bcond_without guile
Summary: A TLS protocol implementation
Name: gnutls
Version: 3.4.1
Release: 2%{?dist}
Version: 3.4.2
Release: 1%{?dist}
# The libraries are LGPLv2.1+, utilities are GPLv3+
License: GPLv3+ and LGPLv2+
Group: System Environment/Libraries
@ -35,7 +35,6 @@ 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
@ -138,7 +137,6 @@ 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
@ -274,6 +272,9 @@ fi
%endif
%changelog
* Wed Jun 17 2015 Nikos Mavrogiannopoulos <nmav@redhat.com> 3.4.2-1
- new upstream release
* Tue May 5 2015 Nikos Mavrogiannopoulos <nmav@redhat.com> 3.4.1-2
- Provide missing GNUTLS_SUPPLEMENTAL_USER_MAPPING_DATA definition

View File

@ -1 +1 @@
357fbb18b21ec337068c4aef100d49ab gnutls-3.4.1-hobbled.tar.xz
fcd504309eac6b180d495eeb7b8a13ad gnutls-3.4.2-hobbled.tar.xz