[gnutls/f20] upgraded to 3.1.23

Nikos Mavrogiannopoulos nmav at fedoraproject.org
Tue Apr 8 09:41:28 UTC 2014


commit 8f6c041f1ac72c4e12467563bd89fb1f3cf92113
Author: Nikos Mavrogiannopoulos <nmav at redhat.com>
Date:   Tue Apr 8 11:41:13 2014 +0200

    upgraded to 3.1.23

 .gitignore                        |    1 +
 gnutls-3.1.18-cve-2014-0092.patch |  128 -------------------------------------
 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                       |   16 ++---
 sources                           |    2 +-
 7 files changed, 8 insertions(+), 230 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fc3ea84..6541516 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,4 @@ gnutls-2.10.1-nosrp.tar.bz2
 /gnutls-3.1.17-hobbled.tar.xz
 /gnutls-3.1.18-hobbled.tar.xz
 /gnutls-3.1.20-hobbled.tar.xz
+/gnutls-3.1.23-hobbled.tar.xz
diff --git a/gnutls.spec b/gnutls.spec
index 2e6aa77..3ce7700 100644
--- a/gnutls.spec
+++ b/gnutls.spec
@@ -2,8 +2,8 @@
 %bcond_with guile
 Summary: A TLS protocol implementation
 Name: gnutls
-Version: 3.1.20
-Release: 4%{?dist}
+Version: 3.1.23
+Release: 1%{?dist}
 # The libraries are LGPLv2.1+, utilities are GPLv3+, however
 # the bundled gnulib is LGPLv3+
 License: GPLv3+ and LGPLv2+ and LGPLv3+
@@ -29,16 +29,12 @@ Source1: libgnutls-config
 Source2: hobble-gnutls
 Source3: ecc.c
 Patch1: gnutls-3.1.17-rpath.patch
-Patch2: gnutls-3.1.20-init-keyword.patch
-Patch3: gnutls-3.1.20-supported-ecc.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
 # 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.20-v1-fix.patch
-Patch12: gnutls-3.1.18-cve-2014-0092.patch
 
 # Wildcard bundling exception https://fedorahosted.org/fpc/ticket/174
 Provides: bundled(gnulib) = 20130424
@@ -140,16 +136,12 @@ This package contains Guile bindings for the library.
 %setup -q
 
 %patch1 -p1 -b .rpath
-%patch2 -p1 -b .ikeyword
-%patch3 -p1 -b .supported-ecc
 # This patch is not applicable as we use nettle now but some parts will be
 # later reused.
 #%patch7 -p1 -b .fips
 %patch8 -p1 -b .nosrp
 %patch9 -p1 -b .rndport
 %patch10 -p1 -b .suiteb
-%patch11 -p1 -b .v1-fix
-%patch12 -p1 -b .cve-2014-0092
 
 %{SOURCE2} -e
 
@@ -283,6 +275,10 @@ fi
 %endif
 
 %changelog
+* Tue Apr  8 2014 Nikos Mavrogiannopoulos <nmav at redhat.com> - 3.1.23-1
+- fixes liberal wildcard expansion (#1085264)
+- fixes certtool generation of encrypted keys even without password (#1085272)
+
 * Thu Feb 27 2014 Nikos Mavrogiannopoulos <nmav at redhat.com> - 3.1.20-4
 - fixes CVE-2014-0092 (#1071795)
 
diff --git a/sources b/sources
index e702ad0..cd8e86a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-77a71225d23f825c655e0b57011ce1e1  gnutls-3.1.20-hobbled.tar.xz
+23adedfbd3290f1ee9fbf5ad0a9e367e  gnutls-3.1.23-hobbled.tar.xz


More information about the scm-commits mailing list