[mingw-gnutls/f20] Update to 3.1.26
mooninite
mooninite at fedoraproject.org
Wed Aug 27 04:55:18 UTC 2014
commit 42db5f286bbb71db6690724b0960dfb2c4479391
Author: Michael Cronenworth <mike at cchtml.com>
Date: Tue Aug 26 23:55:12 2014 -0500
Update to 3.1.26
.gitignore | 1 +
gnutls-3.1.26-mingw-autoopts.patch | 11 +++++++++++
mingw-gnutls.spec | 15 ++++++++++-----
sources | 2 +-
4 files changed, 23 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d071559..a84eb22 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@ gnutls-2.6.4-nosrp.tar.bz2
/gnutls-3.1.23-hobbled.tar.xz
/gnutls-3.1.24-hobbled.tar.xz
/gnutls-3.1.25-hobbled.tar.xz
+/gnutls-3.1.26-hobbled.tar.xz
diff --git a/gnutls-3.1.26-mingw-autoopts.patch b/gnutls-3.1.26-mingw-autoopts.patch
new file mode 100644
index 0000000..70095dc
--- /dev/null
+++ b/gnutls-3.1.26-mingw-autoopts.patch
@@ -0,0 +1,11 @@
+--- a/src/libopts/autoopts/options.h 2014-01-01 11:14:11.000000000 -0600
++++ b/src/libopts/autoopts/options.h 2014-08-26 23:43:03.283576635 -0500
+@@ -101,7 +101,7 @@
+ * @{
+ */
+ /// autoopts structure version
+-#define OPTIONS_STRUCT_VERSION 163841
++#define OPTIONS_STRUCT_VERSION 163842
+ /// autoopts structure version string
+ #define OPTIONS_VERSION_STRING "40:1:15"
+ /// minimum version the autoopts library supports
diff --git a/mingw-gnutls.spec b/mingw-gnutls.spec
index 0089251..cf02b16 100644
--- a/mingw-gnutls.spec
+++ b/mingw-gnutls.spec
@@ -1,7 +1,7 @@
%?mingw_package_header
Name: mingw-gnutls
-Version: 3.1.25
+Version: 3.1.26
Release: 1%{?dist}
Summary: MinGW GnuTLS TLS/SSL encryption library
@@ -29,8 +29,9 @@ Patch10: gnutls-3.1.18-suiteb.patch
# MinGW-specific patches.
Patch1000: gnutls-3.1.7-mingw-iconv.patch
-Patch1002: gnutls-fix-external-libtasn1-detection.patch
-Patch1004: gnutls-mingw-cli.patch
+Patch1001: gnutls-fix-external-libtasn1-detection.patch
+Patch1002: gnutls-mingw-cli.patch
+Patch1003: gnutls-3.1.26-mingw-autoopts.patch
BuildRequires: mingw32-filesystem >= 95
BuildRequires: mingw32-gcc
@@ -110,8 +111,9 @@ sed 's/4331/5556/g' -i tests/*.c
%patch10 -p1 -b .suiteb
%patch1000 -p0 -b .iconv
-%patch1002 -p0 -b .libtasn1
-%patch1004 -p1 -b .cli
+%patch1001 -p0 -b .libtasn1
+%patch1002 -p1 -b .cli
+%patch1003 -p1 -b .autoopts
%{SOURCE2} -e
@@ -189,6 +191,9 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_mandir}
%changelog
+* Tue Aug 26 2014 Michael Cronenworth <mike at cchtml.com> - 3.1.26-1
+- Update to 3.1.26
+
* Sat May 31 2014 Michael Cronenworth <mike at cchtml.com> - 3.1.25-1
- Update to 3.1.25
- Fixes CVE-2014-3466 (#1103047)
diff --git a/sources b/sources
index 980380e..000b0a0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a95978708c2a9a7f793a6d24fd49e17d gnutls-3.1.25-hobbled.tar.xz
+3a4a0b8b10355ad33b32ac06cfd34423 gnutls-3.1.26-hobbled.tar.xz
More information about the scm-commits
mailing list