[Pkg-gnutls-commits] r708 - in /packages/gnutls26/trunk/debian: changelog patches/14_version_gettextcat.diff patches/15_tasn1inpc.diff patches/16_test_initgcrypt.diff

[ametzler at users.alioth.debian.org]

Author: ametzler
Date: Tue May 19 17:57:53 2009
New Revision: 708

URL: http://svn.debian.org/wsvn/pkg-gnutls/?sc=1&rev=708
Log:
Update remaining patches. Add [patches/16_test_initgcrypt.diff] to initialize gcrypt before enabling gcrypt's QUICK_RANDOM mode.

Added:
    packages/gnutls26/trunk/debian/patches/16_test_initgcrypt.diff
Modified:
    packages/gnutls26/trunk/debian/changelog
    packages/gnutls26/trunk/debian/patches/14_version_gettextcat.diff
    packages/gnutls26/trunk/debian/patches/15_tasn1inpc.diff

Modified: packages/gnutls26/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/trunk/debian/changelog?rev=708&op=diff
==============================================================================
--- packages/gnutls26/trunk/debian/changelog (original)
+++ packages/gnutls26/trunk/debian/changelog Tue May 19 17:57:53 2009
@@ -1,4 +1,4 @@
-gnutls26 (2.7.10-1) experimental; urgency=low
+gnutls26 (2.7.11-1) experimental; urgency=low
 
   * Fix typo in changelog. Closes: #526427
   * New upstream release.
@@ -7,6 +7,9 @@
       standard autoconf test. Drop manpages and
       both patches/13_lessdeps_gnutls-config.diff and
       patches/13_lessdeps_gnutls-config.diff from the debian diff.
+    + Update remaining patches.
+  * [patches/16_test_initgcrypt.diff] Initialize gcrypt before enabling
+    gcrypt's QUICK_RANDOM mode in crq_key_id test. 
 
  -- Andreas Metzler <ametzler at debian.org>  Thu, 14 May 2009 19:16:06 +0200
 

Modified: packages/gnutls26/trunk/debian/patches/14_version_gettextcat.diff
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/trunk/debian/patches/14_version_gettextcat.diff?rev=708&op=diff
==============================================================================
--- packages/gnutls26/trunk/debian/patches/14_version_gettextcat.diff (original)
+++ packages/gnutls26/trunk/debian/patches/14_version_gettextcat.diff Tue May 19 17:57:53 2009
@@ -1,9 +1,6 @@
-Ship the gettext translations as /usr/share/locales/*/gnutls13.mo instead of
-/usr/share/locales/*/gnutls.mo to not break co-installability of 
-multiple libgnutls packages.
-
---- gnutls13-1.6.1/po/Makevars.orig	2006-03-03 16:16:16.000000000 +0000
-+++ gnutls13-1.6.1/po/Makevars	2007-02-11 10:22:01.000000000 +0000
+diff -NurbB gnutls-2.7.10.orig/lib/po/Makevars gnutls-2.7.10/lib/po/Makevars
+--- gnutls-2.7.10.orig/lib/po/Makevars	2009-05-11 18:15:43.000000000 +0200
++++ gnutls-2.7.10/lib/po/Makevars	2009-05-14 19:29:24.000000000 +0200
 @@ -1,7 +1,7 @@
  # Makefile variables for PO directory in any package using GNU gettext.
  

Modified: packages/gnutls26/trunk/debian/patches/15_tasn1inpc.diff
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/trunk/debian/patches/15_tasn1inpc.diff?rev=708&op=diff
==============================================================================
--- packages/gnutls26/trunk/debian/patches/15_tasn1inpc.diff (original)
+++ packages/gnutls26/trunk/debian/patches/15_tasn1inpc.diff Tue May 19 17:57:53 2009
@@ -1,15 +1,7 @@
---- gnutls26-2.6.5.orig/lib/gnutls.pc.in
-+++ gnutls26-2.6.5/lib/gnutls.pc.in
-@@ -19,5 +19,5 @@
- Description: Transport Security Layer implementation for the GNU system
- Version: @VERSION@
- Libs: -L${libdir} -lgnutls
--Libs.private: @LIBGNUTLS_LIBS@ 
-+Libs.private: @LIBGNUTLS_LIBS@ @LTLIBTASN1@
- Cflags: -I${includedir}
---- gnutls26-2.6.5.orig/libextra/gnutls-extra.pc.in
-+++ gnutls26-2.6.5/libextra/gnutls-extra.pc.in
-@@ -20,5 +20,5 @@
+diff -NurbB gnutls-2.7.10.ginol/libextra/gnutls-extra.pc.in gnutls-2.7.10/libextra/gnutls-extra.pc.in
+--- gnutls-2.7.10.ginol/libextra/gnutls-extra.pc.in	2009-05-11 18:15:43.000000000 +0200
++++ gnutls-2.7.10/libextra/gnutls-extra.pc.in	2009-05-14 19:33:54.000000000 +0200
+@@ -21,5 +21,5 @@
  Requires: gnutls
  Version: @VERSION@
  Libs: -L${libdir} -lgnutls-extra

Added: packages/gnutls26/trunk/debian/patches/16_test_initgcrypt.diff
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/trunk/debian/patches/16_test_initgcrypt.diff?rev=708&op=file
==============================================================================
--- packages/gnutls26/trunk/debian/patches/16_test_initgcrypt.diff (added)
+++ packages/gnutls26/trunk/debian/patches/16_test_initgcrypt.diff Tue May 19 17:57:53 2009
@@ -1,0 +1,12 @@
+--- gnutls-2.7.11.orig/tests/crq_key_id.c	2009-05-11 18:15:43.000000000 +0200
++++ gnutls-2.7.11/tests/crq_key_id.c	2009-05-19 19:44:58.000000000 +0200
+@@ -55,6 +55,9 @@
+ 
+   int ret;
+ 
++  /* initialize gcrypt explicitely */
++  gcry_check_version (NULL);
++
+   gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0);
+ 
+   ret = gnutls_global_init ();