[gnutls] * Wed Aug 4 2010 Tomas Mraz <tmraz at redhat.com> 2.10.1-1 - new upstream version
Tomáš Mráz
tmraz at fedoraproject.org
Wed Aug 4 10:50:50 UTC 2010
commit 38c06fe2e443aee1770de2cf654a295c2d958b0e
Author: Tomas Mraz <tmraz at fedoraproject.org>
Date: Wed Aug 4 12:50:27 2010 +0200
* Wed Aug 4 2010 Tomas Mraz <tmraz at redhat.com> 2.10.1-1
- new upstream version
.gitignore | 1 +
gnutls-2.10.1-nosrp.patch | 50 +++++++++++++++++++++++++++++++++++++++++++++
gnutls.spec | 14 +++++++-----
sources | 2 +-
4 files changed, 60 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 576034a..e542d22 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
gnutls-2.8.6-nosrp.tar.bz2
+gnutls-2.10.1-nosrp.tar.bz2
diff --git a/gnutls-2.10.1-nosrp.patch b/gnutls-2.10.1-nosrp.patch
new file mode 100644
index 0000000..46ae493
--- /dev/null
+++ b/gnutls-2.10.1-nosrp.patch
@@ -0,0 +1,50 @@
+diff -up gnutls-2.10.1/doc/gnutls.texi.nosrp gnutls-2.10.1/doc/gnutls.texi
+--- gnutls-2.10.1/doc/gnutls.texi.nosrp 2010-06-21 09:50:55.000000000 +0200
++++ gnutls-2.10.1/doc/gnutls.texi 2010-08-04 11:58:22.000000000 +0200
+@@ -524,7 +524,7 @@ data to the transport layer.
+ @end itemize
+
+ Other callback functions such as the one set by
+- at ref{gnutls_srp_set_server_credentials_function}, may require more
++gnutls_srp_set_server_credentials_function, may require more
+ complicated input, including data to be allocated. These callbacks
+ should allocate and free memory using the functions shown below.
+
+@@ -1576,9 +1576,9 @@ authenticated using a certificate with R
+
+ If clients supporting @acronym{SRP} know the username and password
+ before the connection, should initialize the client credentials and
+-call the function @ref{gnutls_srp_set_client_credentials}.
++call the function gnutls_srp_set_client_credentials.
+ Alternatively they could specify a callback function by using the
+-function @ref{gnutls_srp_set_client_credentials_function}. This has
++function gnutls_srp_set_client_credentials_function. This has
+ the advantage that allows probing the server for @acronym{SRP}
+ support. In that case the callback function will be called twice per
+ handshake. The first time is before the ciphersuite is negotiated,
+@@ -1593,20 +1593,20 @@ In server side the default behaviour of
+ the usernames and @acronym{SRP} verifiers from password files. These
+ password files are the ones used by the @emph{Stanford srp libraries}
+ and can be specified using the
+- at ref{gnutls_srp_set_server_credentials_file}. If a different
++gnutls_srp_set_server_credentials_file. If a different
+ password file format is to be used, then the function
+- at ref{gnutls_srp_set_server_credentials_function}, should be called,
++gnutls_srp_set_server_credentials_function, should be called,
+ in order to set an appropriate callback.
+
+ Some helper functions such as
+
+ @itemize
+
+- at item @ref{gnutls_srp_verifier}
++ at item gnutls_srp_verifier
+
+- at item @ref{gnutls_srp_base64_encode}
++ at item gnutls_srp_base64_encode
+
+- at item @ref{gnutls_srp_base64_decode}
++ at item gnutls_srp_base64_decode
+
+ @end itemize
+
diff --git a/gnutls.spec b/gnutls.spec
index cd13c86..9431336 100644
--- a/gnutls.spec
+++ b/gnutls.spec
@@ -1,7 +1,7 @@
Summary: A TLS protocol implementation
Name: gnutls
-Version: 2.8.6
-Release: 2%{?dist}
+Version: 2.10.1
+Release: 1%{?dist}
# The libgnutls library is LGPLv2+, utilities and remaining libraries are GPLv3+
License: GPLv3+ and LGPLv2+
Group: System Environment/Libraries
@@ -17,7 +17,8 @@ Source0: %{name}-%{version}-nosrp.tar.bz2
Source1: libgnutls-config
Patch1: gnutls-2.8.5-rpath.patch
Patch2: gnutls-2.8.6-link-libgcrypt.patch
-Patch3: gnutls-2.8.6-safe-renegotiation.patch
+# Remove nonexisting references from texinfo file
+Patch3: gnutls-2.10.1-nosrp.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: libgcrypt >= 1.2.2
@@ -72,14 +73,12 @@ This package contains Guile bindings for the library.
%setup -q
%patch1 -p1 -b .rpath
%patch2 -p1 -b .link
-%patch3 -p1 -b .reneg
+%patch3 -p1 -b .nosrp
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
touch lib/$i
done
-chmod a+x tests/safe-renegotiation/testsrn
-
%build
export LDFLAGS="-Wl,--no-add-needed"
@@ -158,6 +157,9 @@ fi
%{_datadir}/guile/site/gnutls.scm
%changelog
+* Wed Aug 4 2010 Tomas Mraz <tmraz at redhat.com> 2.10.1-1
+- new upstream version
+
* Wed Jun 2 2010 Tomas Mraz <tmraz at redhat.com> 2.8.6-2
- add support for safe renegotiation CVE-2009-3555 (#533125)
diff --git a/sources b/sources
index f786729..67cf008 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-23f98683d03f6aa332216c55fe288956 gnutls-2.8.6-nosrp.tar.bz2
+122f83c23c77a3fd95d1d8fc7a7a5d5f gnutls-2.10.1-nosrp.tar.bz2
More information about the scm-commits
mailing list