[gnutls/f19: 5/5] Merge branch 'f20' into f19

[Nikos Mavrogiannopoulos]

commit bf79a01618f316e196ee8f3f9119197b53c4d585
Merge: 4845a9a 5b6a2d9
Author: Nikos Mavrogiannopoulos <nmav at redhat.com>
Date:   Fri Feb 14 09:49:26 2014 +0100

    Merge branch 'f20' into f19
    
    Conflicts:
    	gnutls.spec

 .gitignore                        |    1 +
 gnutls-3.1.20-init-keyword.patch  |   42 +++++++++++++++++++++++++++++++++++++
 gnutls-3.1.20-supported-ecc.patch |   33 +++++++++++++++++++++++++++++
 gnutls-3.1.20-v1-fix.patch        |   16 ++++++++++++++
 gnutls.spec                       |   19 +++++++++++++++-
 sources                           |    2 +-
 6 files changed, 110 insertions(+), 3 deletions(-)
---
diff --cc gnutls.spec
index 08af26d,35ba17e..a9293dd
--- a/gnutls.spec
+++ b/gnutls.spec
@@@ -159,10 -162,8 +166,9 @@@ export LDFLAGS="-Wl,--no-add-needed
             --with-included-libcfg \
             --disable-static \
             --disable-openssl-compatibility \
- 	   --without-tpm \
             --disable-srp-authentication \
 -	   --disable-non-suiteb-curves \
 +	   --without-tpm \
 +	   --enable-local-libopts \
  %if %{with guile}
             --enable-guile \
  %ifarch %{arm}
@@@ -281,12 -281,26 +287,21 @@@ f
  %endif
  
  %changelog
+ * Fri Feb 14 2014 Nikos Mavrogiannopoulos <nmav at redhat.com> 3.1.20-3
+ - Fix CVE-2014-1959 (#1065094)
+ 
+ * Mon Feb 03 2014 Nikos Mavrogiannopoulos <nmav at redhat.com> 3.1.20-1
+ - new upstream release
+ - Fixed issue with gnutls.info not being available
+ - Compile with trousers
+ - Pulled fix from upstream for illegal supported-ecc extension (#1060411)
+ 
  * Thu Jan 02 2014 Nikos Mavrogiannopoulos <nmav at redhat.com> 3.1.18-3
 -- Applied complete patch from (#1046672)
 -
 -* Thu Jan 02 2014 Nikos Mavrogiannopoulos <nmav at redhat.com> 3.1.18-2
  - Applied fix in suiteb patch to prevent crash in multiple 
    deinitializations (#1046672)
 -
 -* Mon Dec 23 2013 Nikos Mavrogiannopoulos <nmav at redhat.com> 3.1.18-1
  - new upstream release
  
 -* Thu Dec  5 2013 Nikos Mavrogiannopoulos <nmav at redhat.com> 3.1.17-3
 +* Thu Dec  5 2013 Nikos Mavrogiannopoulos <nmav at redhat.com> 3.1.17-2
  - Use the correct root key for unbound (#1012494)
  - Pull asm fixes from upstream (#973210)
  - tpmtool manpage is no longer installed (#1036363)