[mingw-gnutls: 11/23] Update to 2.10.5
epienbro
epienbro at fedoraproject.org
Wed Mar 7 17:22:21 UTC 2012
commit a26e5bac368519c77fbfe05ffc21ae5bdefb50dc
Author: Kalev Lember <kalev at smartlink.ee>
Date: Mon Apr 25 22:14:32 2011 +0300
Update to 2.10.5
.gitignore | 1 +
gnutls-2.10.1-handshake-errors.patch | 57 ++++++++++++++++++++++++++++
gnutls-2.10.1-nosrp.patch | 50 +++++++++++++++++++++++++
gnutls-2.6.2-nosrp.patch | 20 ----------
gnutls-2.8.6-link-libgcrypt.patch | 24 ++++++++++++
mingw32-gnutls-2.6.3-certtool-build.patch | 58 -----------------------------
mingw32-gnutls.spec | 36 ++++++++++--------
sources | 2 +-
8 files changed, 153 insertions(+), 95 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 08ebe63..8cabef5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
gnutls-2.6.4-nosrp.tar.bz2
+/gnutls-2.10.5-nosrp.tar.bz2
diff --git a/gnutls-2.10.1-handshake-errors.patch b/gnutls-2.10.1-handshake-errors.patch
new file mode 100644
index 0000000..1c11dc7
--- /dev/null
+++ b/gnutls-2.10.1-handshake-errors.patch
@@ -0,0 +1,57 @@
+diff -up gnutls-2.10.1/lib/gnutls_handshake.c.errors gnutls-2.10.1/lib/gnutls_handshake.c
+--- gnutls-2.10.1/lib/gnutls_handshake.c.errors 2010-07-25 10:35:31.000000000 +0200
++++ gnutls-2.10.1/lib/gnutls_handshake.c 2010-09-13 17:16:05.000000000 +0200
+@@ -2769,7 +2769,7 @@ _gnutls_handshake_client (gnutls_session
+ case STATE1:
+ ret = _gnutls_send_hello (session, AGAIN (STATE1));
+ STATE = STATE1;
+- IMED_RET ("send hello", ret, 0);
++ IMED_RET ("send hello", ret, 1);
+
+ case STATE2:
+ /* receive the server hello */
+@@ -2849,7 +2849,7 @@ _gnutls_handshake_client (gnutls_session
+ ret =
+ _gnutls_send_client_certificate_verify (session, AGAIN (STATE9));
+ STATE = STATE9;
+- IMED_RET ("send client certificate verify", ret, 0);
++ IMED_RET ("send client certificate verify", ret, 1);
+
+ STATE = STATE0;
+ default:
+@@ -3002,7 +3002,7 @@ _gnutls_handshake_server (gnutls_session
+ case STATE2:
+ ret = _gnutls_send_hello (session, AGAIN (STATE2));
+ STATE = STATE2;
+- IMED_RET ("send hello", ret, 0);
++ IMED_RET ("send hello", ret, 1);
+
+ case STATE70:
+ if (session->security_parameters.extensions.do_send_supplemental)
+@@ -3044,7 +3044,7 @@ _gnutls_handshake_server (gnutls_session
+ GNUTLS_HANDSHAKE_SERVER_HELLO_DONE,
+ AGAIN (STATE6));
+ STATE = STATE6;
+- IMED_RET ("send server hello done", ret, 0);
++ IMED_RET ("send server hello done", ret, 1);
+
+ case STATE71:
+ if (session->security_parameters.extensions.do_recv_supplemental)
+@@ -3119,7 +3119,7 @@ _gnutls_handshake_common (gnutls_session
+ #endif
+
+ ret = _gnutls_send_handshake_final (session, FALSE);
+- IMED_RET ("send handshake final", ret, 0);
++ IMED_RET ("send handshake final", ret, 1);
+
+ /* only store if we are not resuming */
+ if (session->security_parameters.entity == GNUTLS_SERVER)
+@@ -3132,7 +3132,7 @@ _gnutls_handshake_common (gnutls_session
+ { /* if we are a client not resuming - or we are a server resuming */
+
+ ret = _gnutls_send_handshake_final (session, TRUE);
+- IMED_RET ("send handshake final 2", ret, 0);
++ IMED_RET ("send handshake final 2", ret, 1);
+
+ #ifdef ENABLE_SESSION_TICKET
+ switch (STATE)
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-2.8.6-link-libgcrypt.patch b/gnutls-2.8.6-link-libgcrypt.patch
new file mode 100644
index 0000000..973306f
--- /dev/null
+++ b/gnutls-2.8.6-link-libgcrypt.patch
@@ -0,0 +1,24 @@
+diff -up gnutls-2.8.6/doc/examples/Makefile.am.link gnutls-2.8.6/doc/examples/Makefile.am
+--- gnutls-2.8.6/doc/examples/Makefile.am.link 2010-01-24 11:06:21.000000000 +0100
++++ gnutls-2.8.6/doc/examples/Makefile.am 2010-05-12 21:22:51.000000000 +0200
+@@ -30,7 +30,7 @@ LDADD = libexamples.la \
+ ../../lib/libgnutls.la \
+ ../../libextra/libgnutls-extra.la \
+ ../../gl/libgnu.la \
+- $(LIBSOCKET) $(INET_NTOP_LIB) $(INET_PTON_LIB)
++ $(LTLIBGCRYPT) $(LIBSOCKET) $(INET_NTOP_LIB) $(INET_PTON_LIB)
+
+ CXX_LDADD = $(LDADD) \
+ ../../lib/libgnutlsxx.la
+diff -up gnutls-2.8.6/doc/examples/Makefile.in.link gnutls-2.8.6/doc/examples/Makefile.in
+--- gnutls-2.8.6/doc/examples/Makefile.in.link 2010-03-15 11:29:19.000000000 +0100
++++ gnutls-2.8.6/doc/examples/Makefile.in 2010-05-12 21:23:25.000000000 +0200
+@@ -827,7 +827,7 @@ LDADD = libexamples.la \
+ ../../lib/libgnutls.la \
+ ../../libextra/libgnutls-extra.la \
+ ../../gl/libgnu.la \
+- $(LIBSOCKET) $(INET_NTOP_LIB) $(INET_PTON_LIB)
++ $(LTLIBGCRYPT) $(LIBSOCKET) $(INET_NTOP_LIB) $(INET_PTON_LIB)
+
+ CXX_LDADD = $(LDADD) \
+ ../../lib/libgnutlsxx.la
diff --git a/mingw32-gnutls.spec b/mingw32-gnutls.spec
index 2b257a6..b0d9a33 100644
--- a/mingw32-gnutls.spec
+++ b/mingw32-gnutls.spec
@@ -6,8 +6,8 @@
%define __debug_install_post %{_mingw32_debug_install_post}
Name: mingw32-gnutls
-Version: 2.6.4
-Release: 7%{?dist}
+Version: 2.10.5
+Release: 1%{?dist}
Summary: MinGW GnuTLS TLS/SSL encryption library
License: GPLv3+ and LGPLv2+
@@ -21,10 +21,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-Patch1: gnutls-2.6.2-nosrp.patch
-
-# MinGW-specific patches.
-Patch1000: mingw32-gnutls-2.6.3-certtool-build.patch
+Patch2: gnutls-2.8.6-link-libgcrypt.patch
+# Remove nonexisting references from texinfo file
+Patch3: gnutls-2.10.1-nosrp.patch
+# Backport from upstream git
+Patch4: gnutls-2.10.1-handshake-errors.patch
BuildRequires: mingw32-filesystem >= 40
BuildRequires: mingw32-gcc
@@ -56,15 +57,15 @@ GnuTLS TLS/SSL encryption library. This library is cross-compiled
for MinGW.
-%{_mingw32_debug_package}
+%{?_mingw32_debug_package}
%prep
%setup -q -n gnutls-%{version}
-%patch1 -p1 -b .nosrp
-
-%patch1000 -p1 -b .mingw32
+%patch2 -p1 -b .link
+%patch3 -p1 -b .nosrp
+%patch4 -p1 -b .errors
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
@@ -85,6 +86,7 @@ PATH="%{_mingw32_bindir}:$PATH" \
--disable-static
# %{?_smp_mflags} doesn't build correctly.
make
+cp lib/COPYING COPYING.LIB
%install
@@ -97,14 +99,14 @@ rm -f $RPM_BUILD_ROOT%{_mingw32_datadir}/info/dir
rm -rf $RPM_BUILD_ROOT%{_mingw32_infodir}
rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}
-%find_lang gnutls
+%find_lang libgnutls
%clean
rm -rf $RPM_BUILD_ROOT
-%files -f gnutls.lang
+%files -f libgnutls.lang
%defattr(-,root,root)
%doc COPYING COPYING.LIB
%{_mingw32_bindir}/certtool.exe
@@ -113,12 +115,11 @@ rm -rf $RPM_BUILD_ROOT
%{_mingw32_bindir}/gnutls-serv.exe
%{_mingw32_bindir}/libgnutls-26.def
%{_mingw32_bindir}/libgnutls-26.dll
-%{_mingw32_bindir}/libgnutls-config
%{_mingw32_bindir}/libgnutls-extra-26.def
%{_mingw32_bindir}/libgnutls-extra-26.dll
-%{_mingw32_bindir}/libgnutls-extra-config
%{_mingw32_bindir}/libgnutls-openssl-26.def
%{_mingw32_bindir}/libgnutls-openssl-26.dll
+%{_mingw32_bindir}/libgnutlsxx-26.dll
%{_mingw32_bindir}/psktool.exe
%{_mingw32_libdir}/libgnutls-extra.dll.a
%{_mingw32_libdir}/libgnutls-extra.la
@@ -126,14 +127,17 @@ rm -rf $RPM_BUILD_ROOT
%{_mingw32_libdir}/libgnutls-openssl.la
%{_mingw32_libdir}/libgnutls.dll.a
%{_mingw32_libdir}/libgnutls.la
+%{_mingw32_libdir}/libgnutlsxx.dll.a
+%{_mingw32_libdir}/libgnutlsxx.la
%{_mingw32_libdir}/pkgconfig/gnutls-extra.pc
%{_mingw32_libdir}/pkgconfig/gnutls.pc
%{_mingw32_includedir}/gnutls/
-%{_mingw32_datadir}/aclocal/libgnutls-extra.m4
-%{_mingw32_datadir}/aclocal/libgnutls.m4
%changelog
+* Thu Apr 28 2011 Kalev Lember <kalev at smartlink.ee> - 2.10.5-1
+- Update to 2.10.5
+
* Wed Apr 27 2011 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.6.4-7
- Dropped the proxy-libintl pieces
diff --git a/sources b/sources
index 8e4609d..3378d7f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ac96cacb84b7dd7483a495d3907e7664 gnutls-2.6.4-nosrp.tar.bz2
+9dad7462ffdc3a6866a4aaaa62d8f0ad gnutls-2.10.5-nosrp.tar.bz2
More information about the scm-commits
mailing list