[gnutls/f20] Addressed regression with rehandshakes introduced in 3.1.27 (#1168942)

[Nikos Mavrogiannopoulos]

commit 8ef388887ba26ee42d8bcf807b12eb70db4479b0
Author: Nikos Mavrogiannopoulos <nmav at redhat.com>
Date:   Fri Nov 28 14:46:45 2014 +0100

    Addressed regression with rehandshakes introduced in 3.1.27 (#1168942)

 gnutls-3.1.28-app-data.patch |   13 +++++++++++++
 gnutls.spec                  |    7 ++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/gnutls-3.1.28-app-data.patch b/gnutls-3.1.28-app-data.patch
new file mode 100644
index 0000000..ce8b5ee
--- /dev/null
+++ b/gnutls-3.1.28-app-data.patch
@@ -0,0 +1,13 @@
+diff --git a/lib/gnutls_handshake.c b/lib/gnutls_handshake.c
+index d542f21..a0e8005 100644
+--- a/lib/gnutls_handshake.c
++++ b/lib/gnutls_handshake.c
+@@ -2546,6 +2546,8 @@ gnutls_handshake_set_timeout (gnutls_session_t session, unsigned int ms)
+ 		/* EAGAIN and INTERRUPTED are always non-fatal */ \
+ 		if (ret == GNUTLS_E_AGAIN || ret == GNUTLS_E_INTERRUPTED) \
+ 			return ret; \
++		if (ret == GNUTLS_E_GOT_APPLICATION_DATA && session->internals.initial_negotiation_completed != 0) \
++			return ret; \
+ 		if (ret == GNUTLS_E_LARGE_PACKET && session->internals.handshake_large_loops < 16) { \
+ 			session->internals.handshake_large_loops++; \
+ 			return ret; \
diff --git a/gnutls.spec b/gnutls.spec
index 4f07fb5..1b9fb79 100644
--- a/gnutls.spec
+++ b/gnutls.spec
@@ -3,7 +3,7 @@
 Summary: A TLS protocol implementation
 Name: gnutls
 Version: 3.1.28
-Release: 1%{?dist}
+Release: 2%{?dist}
 # The libraries are LGPLv2.1+, utilities are GPLv3+, however
 # the bundled gnulib is LGPLv3+
 License: GPLv3+ and LGPLv2+ and LGPLv3+
@@ -34,6 +34,7 @@ Patch8: gnutls-3.1.11-nosrp.patch
 # Use random port in some tests to avoid conflicts during simultaneous builds on the same machine
 Patch9: gnutls-3.1.10-tests-rndport.patch
 Patch10: gnutls-3.1.18-suiteb.patch
+Patch11: gnutls-3.1.28-app-data.patch
 
 # Wildcard bundling exception https://fedorahosted.org/fpc/ticket/174
 Provides: bundled(gnulib) = 20130424
@@ -141,6 +142,7 @@ sed 's/4331/5556/g' -i tests/*.c
 %patch8 -p1 -b .nosrp
 %patch9 -p1 -b .rndport
 %patch10 -p1 -b .suiteb
+%patch11 -p1 -b .app-data
 sed -i -e 's|sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/lib /usr/lib %{_libdir}|g' configure
 
 %{SOURCE2} -e
@@ -275,6 +277,9 @@ fi
 %endif
 
 %changelog
+* Fri Nov 28 2014 Nikos Mavrogiannopoulos <nmav at redhat.com> - 3.1.28-2
+- Addresses regression with rehandshakes introduced in 3.1.27 (#1168942)
+
 * Mon Nov 10 2014 Nikos Mavrogiannopoulos <nmav at redhat.com> - 3.1.28-1
 - new upstream release