[mingw-gnutls] Update to 2.12.17, use system libtasn1.
mooninite
mooninite at fedoraproject.org
Thu Mar 29 19:56:05 UTC 2012
commit 0ccb135c33214653ea05cc2fdada8b5b196173e2
Author: Michael Cronenworth <mike at cchtml.com>
Date: Thu Mar 29 14:55:28 2012 -0500
Update to 2.12.17, use system libtasn1.
.gitignore | 1 +
gnutls-2.12.14-leak.patch | 56 +++++++++++++++++++++++++++++++++++++++++++++
mingw-gnutls.spec | 17 ++++++++++---
sources | 2 +-
4 files changed, 71 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f01a188..6fd753d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ gnutls-2.6.4-nosrp.tar.bz2
/gnutls-2.12.11-nosrp.tar.bz2
/gnutls-2.12.12-nosrp.tar.bz2
/gnutls-2.12.14-nosrp.tar.bz2
+/gnutls-2.12.17-nosrp.tar.xz
diff --git a/gnutls-2.12.14-leak.patch b/gnutls-2.12.14-leak.patch
new file mode 100644
index 0000000..0a649df
--- /dev/null
+++ b/gnutls-2.12.14-leak.patch
@@ -0,0 +1,56 @@
+diff -up gnutls-2.12.14/lib/gcrypt/pk.c.leak gnutls-2.12.14/lib/gcrypt/pk.c
+--- gnutls-2.12.14/lib/gcrypt/pk.c.leak 2011-09-18 00:16:53.000000000 +0200
++++ gnutls-2.12.14/lib/gcrypt/pk.c 2012-03-08 17:54:16.821192070 +0100
+@@ -627,7 +627,6 @@ _rsa_generate_params (bigint_t * resarr,
+
+ int ret, i;
+ gcry_sexp_t parms, key, list;
+- bigint_t tmp;
+
+ if (*resarr_len < RSA_PRIVATE_PARAMS)
+ {
+@@ -733,14 +732,6 @@ _rsa_generate_params (bigint_t * resarr,
+
+ *resarr_len = 6;
+
+- tmp = _gnutls_mpi_alloc_like (resarr[0]);
+- if (tmp == NULL)
+- {
+- gnutls_assert ();
+- ret = GNUTLS_E_MEMORY_ERROR;
+- goto cleanup;
+- }
+-
+ ret = _gnutls_calc_rsa_exp (resarr, 2 + *resarr_len);
+ if (ret < 0)
+ {
+diff -up gnutls-2.12.14/lib/gnutls_pk.c.leak gnutls-2.12.14/lib/gnutls_pk.c
+--- gnutls-2.12.14/lib/gnutls_pk.c.leak 2011-09-18 00:16:53.000000000 +0200
++++ gnutls-2.12.14/lib/gnutls_pk.c 2012-03-08 17:40:58.725314720 +0100
+@@ -544,6 +544,7 @@ _generate_params (int algo, bigint_t * r
+ }
+ else
+ {
++ gnutls_pk_params_release(¶ms);
+ gnutls_assert ();
+ return GNUTLS_E_INVALID_REQUEST;
+ }
+diff -up gnutls-2.12.14/lib/x509/privkey.c.leak gnutls-2.12.14/lib/x509/privkey.c
+--- gnutls-2.12.14/lib/x509/privkey.c.leak 2011-09-18 00:16:54.000000000 +0200
++++ gnutls-2.12.14/lib/x509/privkey.c 2012-03-08 17:45:55.467830355 +0100
+@@ -1466,6 +1466,7 @@ gnutls_x509_privkey_generate (gnutls_x50
+ {
+ gnutls_assert ();
+ ret = GNUTLS_E_INTERNAL_ERROR;
++ goto cleanup;
+ }
+
+ if (ret < 0)
+@@ -1490,6 +1491,7 @@ gnutls_x509_privkey_generate (gnutls_x50
+ {
+ gnutls_assert ();
+ ret = GNUTLS_E_INTERNAL_ERROR;
++ goto cleanup;
+ }
+ if (ret < 0)
+ {
diff --git a/mingw-gnutls.spec b/mingw-gnutls.spec
index 0045b13..8f8ec40 100644
--- a/mingw-gnutls.spec
+++ b/mingw-gnutls.spec
@@ -4,8 +4,9 @@
%global mingw_build_win64 1
Name: mingw-gnutls
-Version: 2.12.14
-Release: 7%{?dist}
+Version: 2.12.17
+Release: 1.fc18
+# Release: 1%{?dist}
Summary: MinGW GnuTLS TLS/SSL encryption library
License: GPLv3+ and LGPLv2+
@@ -14,7 +15,7 @@ URL: http://www.gnutls.org/
#Source0: ftp://ftp.gnutls.org/pub/gnutls/gnutls-%{version}.tar.bz2
# We use the same source tarball as Fedora native package, which
# has the patent tainted SRP code removed.
-Source0: gnutls-%{version}-nosrp.tar.bz2
+Source0: gnutls-%{version}-nosrp.tar.xz
BuildArch: noarch
@@ -24,6 +25,7 @@ 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
+Patch5: gnutls-2.12.14-leak.patch
# MinGW-specific patches.
Patch1001: gnutls-mingw-compile-fix.patch
@@ -34,6 +36,7 @@ BuildRequires: mingw32-gcc-c++
BuildRequires: mingw32-binutils
BuildRequires: mingw32-libgpg-error
BuildRequires: mingw32-libgcrypt
+BuildRequires: mingw32-libtasn1
BuildRequires: mingw32-gettext
BuildRequires: mingw32-win-iconv
BuildRequires: mingw32-readline
@@ -46,6 +49,7 @@ BuildRequires: mingw64-gcc-c++
BuildRequires: mingw64-binutils
BuildRequires: mingw64-libgpg-error
BuildRequires: mingw64-libgcrypt
+BuildRequires: mingw64-libtasn1
BuildRequires: mingw64-gettext
BuildRequires: mingw64-win-iconv
BuildRequires: mingw64-readline
@@ -97,6 +101,7 @@ for MinGW.
%patch2 -p1 -b .link
%patch3 -p1 -b .nosrp
%patch4 -p1 -b .dsa-skiptests
+%patch5 -p1 -b .leak
%patch1001 -p0 -b .mingw_compile
@@ -113,7 +118,7 @@ autoreconf
%build
%mingw_configure \
- --with-included-libtasn1 \
+ --with-libtasn1-prefix=%{_prefix} \
--with-included-libcfg \
--disable-srp-authentication \
--disable-static \
@@ -185,6 +190,10 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_mandir}
%changelog
+* Thu Mar 29 2012 Michael Cronenworth <mike at cchtml.com> - 2.12.17-1
+- New upstream version.
+- Use system libtasn1.
+
* Sun Mar 11 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.12.14-7
- Added win64 support
- Dropped .def files
diff --git a/sources b/sources
index 76c11be..a663029 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-afdef648e4e77895ce6c15ee622ef061 gnutls-2.12.14-nosrp.tar.bz2
+c4815ceca3e799fc16cbef3f743d3fed gnutls-2.12.17-nosrp.tar.xz
More information about the scm-commits
mailing list