[gnutls/f20] new upstream release

[Nikos Mavrogiannopoulos]

commit 808ab76a93149c2904278c7911de4e2db1b45112
Author: Nikos Mavrogiannopoulos <nmav at redhat.com>
Date:   Mon Dec 23 09:56:51 2013 +0100

    new upstream release

 .gitignore             |    1 +
 gnutls-3.2.7-asm.patch |11608 ------------------------------------------------
 gnutls.spec            |   10 +-
 sources                |    2 +-
 4 files changed, 8 insertions(+), 11613 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bf23b73..dfa0c90 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,4 @@ gnutls-2.10.1-nosrp.tar.bz2
 /gnutls-3.1.15-hobbled.tar.xz
 /gnutls-3.1.16-hobbled.tar.xz
 /gnutls-3.1.17-hobbled.tar.xz
+/gnutls-3.1.18-hobbled.tar.xz
diff --git a/gnutls.spec b/gnutls.spec
index ee061b4..7effb54 100644
--- a/gnutls.spec
+++ b/gnutls.spec
@@ -2,8 +2,8 @@
 %bcond_with guile
 Summary: A TLS protocol implementation
 Name: gnutls
-Version: 3.1.17
-Release: 3%{?dist}
+Version: 3.1.18
+Release: 1%{?dist}
 # The libraries are LGPLv2.1+, utilities are GPLv3+, however
 # the bundled gnulib is LGPLv3+
 License: GPLv3+ and LGPLv2+ and LGPLv3+
@@ -29,7 +29,6 @@ Source1: libgnutls-config
 Source2: hobble-gnutls
 Source3: ecc.c
 Patch1: gnutls-3.1.17-rpath.patch
-Patch2: gnutls-3.2.7-asm.patch
 # Use only FIPS approved ciphers in the FIPS mode
 Patch7: gnutls-2.12.21-fips-algorithms.patch
 Patch8: gnutls-3.1.11-nosrp.patch
@@ -137,7 +136,6 @@ This package contains Guile bindings for the library.
 %setup -q
 
 %patch1 -p1 -b .rpath
-%patch2 -p1 -b .asm
 # This patch is not applicable as we use nettle now but some parts will be
 # later reused.
 #%patch7 -p1 -b .fips
@@ -159,6 +157,7 @@ export LDFLAGS="-Wl,--no-add-needed"
            --disable-openssl-compatibility \
 	   --without-tpm \
            --disable-srp-authentication \
+	   --disable-non-suiteb-curves \
 %if %{with guile}
            --enable-guile \
 %ifarch %{arm}
@@ -277,6 +276,9 @@ fi
 %endif
 
 %changelog
+* 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
 - Use the correct root key for unbound (#1012494)
 - Pull asm fixes from upstream (#973210)
diff --git a/sources b/sources
index 5306645..434eb4a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0c5cc49d6a595ebdc501517e1f75734b  gnutls-3.1.17-hobbled.tar.xz
+1250e5821798bf92bdc3a6a3fb5ca82b  gnutls-3.1.18-hobbled.tar.xz