[Pkg-gnutls-commits] r160 - in /packages/gnutls12/trunk/debian: README.source_and_patches changelog patches/GNUTLS-SA-2006-2.diff rules

[ametzler at users.alioth.debian.org]

Author: ametzler
Date: Sat Aug 12 10:41:32 2006
New Revision: 160

URL: http://svn.debian.org/wsvn/pkg-gnutls/?sc=1&rev=160
Log:
enable simple-patchsys.mk. Pull fix for GNUTLS-SA-2006-2 from 1.4.2

Added:
    packages/gnutls12/trunk/debian/README.source_and_patches
    packages/gnutls12/trunk/debian/patches/GNUTLS-SA-2006-2.diff
Modified:
    packages/gnutls12/trunk/debian/changelog
    packages/gnutls12/trunk/debian/rules

Added: packages/gnutls12/trunk/debian/README.source_and_patches
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls12/trunk/debian/README.source_and_patches?rev=160&op=file
==============================================================================
--- packages/gnutls12/trunk/debian/README.source_and_patches (added)
+++ packages/gnutls12/trunk/debian/README.source_and_patches Sat Aug 12 10:41:32 2006
@@ -1,0 +1,10 @@
+Uses cdbs with simple-patchsys.mk.
+
+Patches in debian/patches (i.e. *diff *patch) are applied automatically in
+alphanumeric order.
+
+Use
+debian/rules apply-patches
+to see the patched source.
+
+See cdbs-edit-patch for a useful way to make modifications.

Modified: packages/gnutls12/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls12/trunk/debian/changelog?rev=160&op=diff
==============================================================================
--- packages/gnutls12/trunk/debian/changelog (original)
+++ packages/gnutls12/trunk/debian/changelog Sat Aug 12 10:41:32 2006
@@ -1,8 +1,12 @@
-gnutls12 (1.2.11-3) UNRELEASED; urgency=low
-
-  * NOT RELEASED YET
-
- -- Andreas Metzler <ametzler at downhill.aus.cc>  Sat, 17 Jun 2006 09:49:48 +0200
+gnutls12 (1.2.11-3) unstable; urgency=medium
+
+  [Andreas Metzler]
+  * enable simple-patchsys.mk
+  * Pulled from gnutls13 1.4.2:
+    - GNUTLS-SA-2006-2.diff - Fixes a crash in the certificate verification
+      logic.
+
+ -- Andreas Metzler <ametzler at debian.org>  Sat, 12 Aug 2006 11:51:02 +0200
 
 gnutls12 (1.2.11-2) unstable; urgency=low
 

Added: packages/gnutls12/trunk/debian/patches/GNUTLS-SA-2006-2.diff
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls12/trunk/debian/patches/GNUTLS-SA-2006-2.diff?rev=160&op=file
==============================================================================
--- packages/gnutls12/trunk/debian/patches/GNUTLS-SA-2006-2.diff (added)
+++ packages/gnutls12/trunk/debian/patches/GNUTLS-SA-2006-2.diff Sat Aug 12 10:41:32 2006
@@ -1,0 +1,13 @@
+http://www.gnu.org/software/gnutls/security.html
+http://lists.gnupg.org/pipermail/gnutls-dev/2006-August/001190.html
+--- lib/gnutls_algorithms.c.orig	2005-10-27 16:06:56.000000000 +0200
++++ lib/gnutls_algorithms.c	2006-08-12 12:29:54.655483704 +0200
+@@ -542,7 +542,7 @@
+ {
+ gnutls_mac_algorithm_t ret = 0;
+ 
+-    GNUTLS_HASH_LOOP(if (strcmp(oid, p->oid)==0) {ret = p->id;break;});
++    GNUTLS_HASH_LOOP(if (p->oid && strcmp(oid, p->oid)==0) {ret = p->id;break;});
+ 
+     if (ret == 0) return GNUTLS_MAC_UNKNOWN;
+     return ret;

Modified: packages/gnutls12/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls12/trunk/debian/rules?rev=160&op=diff
==============================================================================
--- packages/gnutls12/trunk/debian/rules (original)
+++ packages/gnutls12/trunk/debian/rules Sat Aug 12 10:41:32 2006
@@ -7,6 +7,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 DEB_CONFIGURE_EXTRA_FLAGS = --with-mcrypt=no --enable-ld-version-script
 DEB_MAKE_CHECK_TARGET = check