[mingw-gnutls/f17] New upstream release.
mooninite
mooninite at fedoraproject.org
Tue Mar 5 02:40:52 UTC 2013
commit 4ce359cd856f06828f20b219baeca2ecc451ffb2
Author: Michael Cronenworth <mike at cchtml.com>
Date: Mon Mar 4 20:40:44 2013 -0600
New upstream release.
.gitignore | 1 +
gnutls-2.12.20-build.patch | 24 ---
...s.patch => gnutls-2.12.21-fips-algorithms.patch | 32 +++-
gnutls-CVE-2013-1619-patch1.patch | 163 --------------------
gnutls-CVE-2013-1619-patch2.patch | 98 ------------
mingw-gnutls.spec | 17 +--
sources | 2 +-
7 files changed, 33 insertions(+), 304 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 26fff5b..40e7002 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ gnutls-2.6.4-nosrp.tar.bz2
/gnutls-2.12.14-nosrp.tar.bz2
/gnutls-2.12.17-nosrp.tar.xz
/gnutls-2.12.20-nosrp.tar.xz
+/gnutls-2.12.23-nosrp.tar.xz
diff --git a/gnutls-2.12.20-fips-algorithms.patch b/gnutls-2.12.21-fips-algorithms.patch
similarity index 81%
rename from gnutls-2.12.20-fips-algorithms.patch
rename to gnutls-2.12.21-fips-algorithms.patch
index f714bd4..f40af01 100644
--- a/gnutls-2.12.20-fips-algorithms.patch
+++ b/gnutls-2.12.21-fips-algorithms.patch
@@ -1,6 +1,6 @@
-diff -up gnutls-2.12.20/lib/gcrypt/init.c.fips gnutls-2.12.20/lib/gcrypt/init.c
---- gnutls-2.12.20/lib/gcrypt/init.c.fips 2012-01-06 20:06:23.000000000 +0100
-+++ gnutls-2.12.20/lib/gcrypt/init.c 2012-11-01 11:00:34.954835974 +0100
+diff -up gnutls-2.12.21/lib/gcrypt/init.c.fips gnutls-2.12.21/lib/gcrypt/init.c
+--- gnutls-2.12.21/lib/gcrypt/init.c.fips 2012-01-06 20:06:23.000000000 +0100
++++ gnutls-2.12.21/lib/gcrypt/init.c 2012-11-09 19:57:54.651624659 +0100
@@ -43,6 +43,8 @@ static struct gcry_thread_cbs gct = {
.recvmsg = NULL,
};
@@ -19,9 +19,29 @@ diff -up gnutls-2.12.20/lib/gcrypt/init.c.fips gnutls-2.12.20/lib/gcrypt/init.c
/* for gcrypt in order to be able to allocate memory */
gcry_control (GCRYCTL_DISABLE_SECMEM, NULL, 0);
-diff -up gnutls-2.12.20/lib/gnutls_priority.c.fips gnutls-2.12.20/lib/gnutls_priority.c
---- gnutls-2.12.20/lib/gnutls_priority.c.fips 2012-01-06 20:06:23.000000000 +0100
-+++ gnutls-2.12.20/lib/gnutls_priority.c 2012-11-01 11:02:52.505807199 +0100
+diff -up gnutls-2.12.21/lib/gnutls_algorithms.c.fips gnutls-2.12.21/lib/gnutls_algorithms.c
+--- gnutls-2.12.21/lib/gnutls_algorithms.c.fips 2012-01-06 20:06:23.000000000 +0100
++++ gnutls-2.12.21/lib/gnutls_algorithms.c 2012-11-28 14:19:34.507948036 +0100
+@@ -44,11 +44,11 @@ typedef struct
+ } gnutls_sec_params_entry;
+
+ static const gnutls_sec_params_entry sec_params[] = {
+- {"Weak", GNUTLS_SEC_PARAM_WEAK, 64, 816, 1024, 128, 128},
+- {"Low", GNUTLS_SEC_PARAM_LOW, 80, 1248, 2048, 160, 160},
+- {"Normal", GNUTLS_SEC_PARAM_NORMAL, 112, 2432, 3072, 224, 224},
+- {"High", GNUTLS_SEC_PARAM_HIGH, 128, 3248, 3072, 256, 256},
+- {"Ultra", GNUTLS_SEC_PARAM_ULTRA, 256, 15424, 3072, 512, 512},
++ {"Weak", GNUTLS_SEC_PARAM_WEAK, 64, 1024, 1024, 128, 128},
++ {"Low", GNUTLS_SEC_PARAM_LOW, 80, 1280, 2048, 160, 160},
++ {"Normal", GNUTLS_SEC_PARAM_NORMAL, 112, 2560, 3072, 224, 224},
++ {"High", GNUTLS_SEC_PARAM_HIGH, 128, 3328, 3072, 256, 256},
++ {"Ultra", GNUTLS_SEC_PARAM_ULTRA, 256, 15616, 3072, 512, 512},
+ {NULL, 0, 0, 0, 0, 0}
+ };
+
+diff -up gnutls-2.12.21/lib/gnutls_priority.c.fips gnutls-2.12.21/lib/gnutls_priority.c
+--- gnutls-2.12.21/lib/gnutls_priority.c.fips 2012-11-08 17:11:11.000000000 +0100
++++ gnutls-2.12.21/lib/gnutls_priority.c 2012-11-09 19:57:54.651624659 +0100
@@ -30,6 +30,7 @@
#include "gnutls_algorithms.h"
#include "gnutls_errors.h"
diff --git a/mingw-gnutls.spec b/mingw-gnutls.spec
index cfa0b65..705cb6b 100644
--- a/mingw-gnutls.spec
+++ b/mingw-gnutls.spec
@@ -4,7 +4,7 @@
%global mingw_build_win64 1
Name: mingw-gnutls
-Version: 2.12.20
+Version: 2.12.23
Release: 1%{?dist}
Summary: MinGW GnuTLS TLS/SSL encryption library
@@ -24,16 +24,10 @@ Patch2: gnutls-2.8.6-link-libgcrypt.patch
Patch3: gnutls-2.12.2-nosrp.patch
# Skip tests that are expected to fail on libgcrypt build
Patch4: gnutls-2.12.7-dsa-skiptests.patch
-# Make it build with recent glibc that removed gets
-Patch5: gnutls-2.12.20-build.patch
# Fix the gnutls-cli-debug manpage
Patch6: gnutls-2.12.20-cli-debug-manpage.patch
# Use only FIPS approved ciphers in the FIPS mode
-Patch7: gnutls-2.12.20-fips-algorithms.patch
-
-# CVE patches
-Patch900: gnutls-CVE-2013-1619-patch1.patch
-Patch901: gnutls-CVE-2013-1619-patch2.patch
+Patch7: gnutls-2.12.21-fips-algorithms.patch
# MinGW-specific patches.
Patch1001: gnutls-mingw-compile-fix.patch
@@ -109,13 +103,9 @@ for MinGW.
%patch2 -p1 -b .link
%patch3 -p1 -b .nosrp
%patch4 -p1 -b .dsa-skiptests
-%patch5 -p1 -b .build
%patch6 -p1 -b .cli-debug
%patch7 -p1 -b .fips
-%patch900 -p1 -b .cve-2013-1619-1
-%patch901 -p1 -b .cve-2013-1619-2
-
%patch1001 -p0 -b .mingw_compile
for i in auth_srp_rsa.c auth_srp_sb64.c auth_srp_passwd.c auth_srp.c gnutls_srp.c ext_srp.c; do
@@ -203,6 +193,9 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_mandir}
%changelog
+* Mon Mar 04 2013 Michael Cronenworth <mike at cchtml.com> - 2.12.23-1
+- Update to 2.12.23
+
* Thu Feb 07 2013 Michael Cronenworth <mike at cchtml.com> - 2.12.20-1
- Update to 2.12.20
- Apply patches for CVE-2013-1619
diff --git a/sources b/sources
index bca8ce5..34af036 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5051728a2cf76d2335a9854f521db98b gnutls-2.12.20-nosrp.tar.xz
+43ab9b4c2c9063596323ee63999ff838 gnutls-2.12.23-nosrp.tar.xz
More information about the scm-commits
mailing list