[Pkg-gnutls-commits] r858 - in /packages/gnutls26/branches/branch2.9.x/debian: changelog patches/15_gnutlspriority.diff patches/series

[ametzler at users.alioth.debian.org]

Author: ametzler
Date: Thu May 27 17:04:16 2010
New Revision: 858

URL: http://svn.debian.org/wsvn/pkg-gnutls/?sc=1&rev=858
Log:
Restore compatibility with programs using gnutls_*_set_priority #579831

Added:
    packages/gnutls26/branches/branch2.9.x/debian/patches/15_gnutlspriority.diff
Modified:
    packages/gnutls26/branches/branch2.9.x/debian/changelog
    packages/gnutls26/branches/branch2.9.x/debian/patches/series

Modified: packages/gnutls26/branches/branch2.9.x/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/branches/branch2.9.x/debian/changelog?rev=858&op=diff
==============================================================================
--- packages/gnutls26/branches/branch2.9.x/debian/changelog (original)
+++ packages/gnutls26/branches/branch2.9.x/debian/changelog Thu May 27 17:04:16 2010
@@ -1,8 +1,10 @@
-gnutls26 (2.9.10-2) UNRELEASED; urgency=low
-
-  * NOT RELEASED YET
-
- -- Andreas Metzler <ametzler at debian.org>  Thu, 22 Apr 2010 20:15:26 +0200
+gnutls26 (2.9.10-2) experimental; urgency=low
+
+  * [15_gnutlspriority.diff] Restore compatibility with programs using 
+    gnutls_*_set_priority() instead of gnutls_priority_*(), e.g. exim.
+    Closes: #579831
+
+ -- Andreas Metzler <ametzler at debian.org>  Thu, 27 May 2010 18:40:53 +0200
 
 gnutls26 (2.9.10-1) experimental; urgency=low
 

Added: packages/gnutls26/branches/branch2.9.x/debian/patches/15_gnutlspriority.diff
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/branches/branch2.9.x/debian/patches/15_gnutlspriority.diff?rev=858&op=file
==============================================================================
--- packages/gnutls26/branches/branch2.9.x/debian/patches/15_gnutlspriority.diff (added)
+++ packages/gnutls26/branches/branch2.9.x/debian/patches/15_gnutlspriority.diff Thu May 27 17:04:16 2010
@@ -1,0 +1,21 @@
+Description: Re-introduce compat with gnutls__priority functions
+ 2.9.10 broke for programs using the old style gnutls_*_priority instead
+ of gnutls_priority_* functions. 
+Author: Nikos Mavrogiannopoulos <nmav at gnutls.org>
+Origin: upstream
+Bug-Debian: http://bugs.debian.org/579831
+
+--- gnutls26-2.9.10.orig/lib/gnutls_state.c
++++ gnutls26-2.9.10/lib/gnutls_state.c
+@@ -350,6 +350,11 @@ gnutls_init (gnutls_session_t * session,
+ 
+   _gnutls_handshake_internal_state_init (*session);
+ 
++  /* emulate old gnutls behavior for old applications that do not use the priority_*
++   * functions.
++   */
++  (*session)->internals.priorities.unsafe_renegotiation = 1;
++
+   return 0;
+ }
+ 

Modified: packages/gnutls26/branches/branch2.9.x/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/branches/branch2.9.x/debian/patches/series?rev=858&op=diff
==============================================================================
--- packages/gnutls26/branches/branch2.9.x/debian/patches/series (original)
+++ packages/gnutls26/branches/branch2.9.x/debian/patches/series Thu May 27 17:04:16 2010
@@ -1,1 +1,2 @@
 14_version_gettextcat.diff
+15_gnutlspriority.diff