[Pkg-gnutls-commits] r1018 - in /packages/gnutls26/branches/branch2.11.x/debian: changelog patches/17_endian.diff patches/series

[ametzler at users.alioth.debian.org]

Author: ametzler
Date: Wed Feb 23 18:31:31 2011
New Revision: 1018

URL: http://svn.debian.org/wsvn/pkg-gnutls/?sc=1&rev=1018
Log:
17_endian.diff - Pulled from upstream. Fix testsuite error (./tests/resume) on big endian architectures.

Added:
    packages/gnutls26/branches/branch2.11.x/debian/patches/17_endian.diff
Modified:
    packages/gnutls26/branches/branch2.11.x/debian/changelog
    packages/gnutls26/branches/branch2.11.x/debian/patches/series

Modified: packages/gnutls26/branches/branch2.11.x/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/branches/branch2.11.x/debian/changelog?rev=1018&op=diff
==============================================================================
--- packages/gnutls26/branches/branch2.11.x/debian/changelog (original)
+++ packages/gnutls26/branches/branch2.11.x/debian/changelog Wed Feb 23 18:31:31 2011
@@ -1,8 +1,9 @@
-gnutls26 (2.11.6-2) UNRELEASED; urgency=low
-
-  * NOT RELEASED YET
-
- -- Andreas Metzler <ametzler at debian.org>  Sat, 19 Feb 2011 15:40:42 +0100
+gnutls26 (2.11.6-2) experimental; urgency=low
+
+  * 17_endian.diff - Pulled from upstream. Fix testsuite error (./tests/resume)
+    on big endian architectures.
+
+ -- Andreas Metzler <ametzler at debian.org>  Wed, 23 Feb 2011 19:20:40 +0100
 
 gnutls26 (2.11.6-1) experimental; urgency=low
 

Added: packages/gnutls26/branches/branch2.11.x/debian/patches/17_endian.diff
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/branches/branch2.11.x/debian/patches/17_endian.diff?rev=1018&op=file
==============================================================================
--- packages/gnutls26/branches/branch2.11.x/debian/patches/17_endian.diff (added)
+++ packages/gnutls26/branches/branch2.11.x/debian/patches/17_endian.diff Wed Feb 23 18:31:31 2011
@@ -1,0 +1,57 @@
+From 1abe917781a83df1b362cd0192a2baff24979201 Mon Sep 17 00:00:00 2001
+From: Nikos Mavrogiannopoulos <nmav at gnutls.org>
+Date: Tue, 22 Feb 2011 21:55:58 +0100
+Subject: [PATCH] store entities as numbers to avoid issues in big-little endian machines.
+
+--- gnutls26-2.11.6.orig/lib/gnutls_session_pack.c
++++ gnutls26-2.11.6/lib/gnutls_session_pack.c
+@@ -766,17 +766,17 @@ pack_security_parameters (gnutls_session
+   cur_size = ps->length;
+ 
+ 
+-  BUFFER_APPEND (ps, &session->security_parameters.entity, 1);
+-  BUFFER_APPEND (ps, &session->security_parameters.kx_algorithm, 1);
++  BUFFER_APPEND_NUM (ps, session->security_parameters.entity);
++  BUFFER_APPEND_NUM (ps, session->security_parameters.kx_algorithm);
+   BUFFER_APPEND (ps,
+ 		 &session->security_parameters.current_cipher_suite.suite[0],
+ 		 1);
+   BUFFER_APPEND (ps,
+ 		 &session->security_parameters.current_cipher_suite.suite[1],
+ 		 1);
+-  BUFFER_APPEND (ps, &params->compression_algorithm, 1);
+-  BUFFER_APPEND (ps, &session->security_parameters.cert_type, 1);
+-  BUFFER_APPEND (ps, &session->security_parameters.version, 1);
++  BUFFER_APPEND_NUM (ps, params->compression_algorithm);
++  BUFFER_APPEND_NUM (ps, session->security_parameters.cert_type);
++  BUFFER_APPEND_NUM (ps, session->security_parameters.version);
+ 
+   BUFFER_APPEND (ps, session->security_parameters.master_secret,
+ 		 GNUTLS_MASTER_SIZE);
+@@ -813,20 +813,18 @@ unpack_security_parameters (gnutls_sessi
+   memset (&session->internals.resumed_security_parameters, 0,
+ 	  sizeof (session->internals.resumed_security_parameters));
+ 
+-  BUFFER_POP (ps, &session->internals.resumed_security_parameters.entity, 1);
+-  BUFFER_POP (ps,
+-	      &session->internals.resumed_security_parameters.kx_algorithm,
+-	      1);
++  BUFFER_POP_NUM (ps, session->internals.resumed_security_parameters.entity);
++  BUFFER_POP_NUM (ps,
++              session->internals.resumed_security_parameters.kx_algorithm);
+   BUFFER_POP (ps,
+ 	      &session->internals.
+ 	      resumed_security_parameters.current_cipher_suite.suite[0], 1);
+   BUFFER_POP (ps,
+ 	      &session->internals.resumed_security_parameters.
+ 	      current_cipher_suite.suite[1], 1);
+-  BUFFER_POP (ps, &session->internals.resumed_compression_method, 1);
+-  BUFFER_POP (ps, &session->internals.resumed_security_parameters.cert_type,
+-	      1);
+-  BUFFER_POP (ps, &session->internals.resumed_security_parameters.version, 1);
++  BUFFER_POP_NUM (ps, session->internals.resumed_compression_method);
++  BUFFER_POP_NUM (ps, session->internals.resumed_security_parameters.cert_type);
++  BUFFER_POP_NUM (ps, session->internals.resumed_security_parameters.version);
+ 
+   BUFFER_POP (ps,
+ 	      &session->internals.resumed_security_parameters.master_secret,

Modified: packages/gnutls26/branches/branch2.11.x/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/branches/branch2.11.x/debian/patches/series?rev=1018&op=diff
==============================================================================
--- packages/gnutls26/branches/branch2.11.x/debian/patches/series (original)
+++ packages/gnutls26/branches/branch2.11.x/debian/patches/series Wed Feb 23 18:31:31 2011
@@ -1,3 +1,4 @@
 14_version_gettextcat.diff
 15_fixgnutlspc.diff
 16_unnecessarydep.diff
+17_endian.diff