[Pkg-gnutls-commits] r1678 - in /packages/p11-kit/branches/experimental/debian: changelog patches/Fix-dereference-of-varargs-in-p11attrsbuild.patch patches/Remove-unnecessary-code-to-be-more-compatible-with.patch patches/series

ametzler at users.alioth.debian.org ametzler at users.alioth.debian.org
Tue Feb 12 14:34:27 UTC 2013


Author: ametzler
Date: Tue Feb 12 14:34:27 2013
New Revision: 1678

URL: http://svn.debian.org/wsvn/pkg-gnutls/?sc=1&rev=1678
Log:
Fix-dereference-of-varargs-in-p11attrsbuild.patch - fixes a testsuite
error.

Remove-unnecessary-code-to-be-more-compatible-with.patch - allows building
with libtasn1 2.14 and 3.x.

Added:
    packages/p11-kit/branches/experimental/debian/patches/Fix-dereference-of-varargs-in-p11attrsbuild.patch
    packages/p11-kit/branches/experimental/debian/patches/Remove-unnecessary-code-to-be-more-compatible-with.patch
    packages/p11-kit/branches/experimental/debian/patches/series
Modified:
    packages/p11-kit/branches/experimental/debian/changelog

Modified: packages/p11-kit/branches/experimental/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/p11-kit/branches/experimental/debian/changelog?rev=1678&op=diff
==============================================================================
--- packages/p11-kit/branches/experimental/debian/changelog (original)
+++ packages/p11-kit/branches/experimental/debian/changelog Tue Feb 12 14:34:27 2013
@@ -4,6 +4,10 @@
     number).
     + Add build-depends on pkg-config and libtasn1-6-dev.
     + Point --with-system-anchors to /etc/ssl/certs/ca-certificates.crt.
+  * Fix-dereference-of-varargs-in-p11attrsbuild.patch - fixes a testsuite
+    error.
+  * Remove-unnecessary-code-to-be-more-compatible-with.patch - allows building
+    with libtasn1 2.14 and 3.x.
 
  -- Andreas Metzler <ametzler at debian.org>  Thu, 06 Sep 2012 19:40:17 +0200
 

Added: packages/p11-kit/branches/experimental/debian/patches/Fix-dereference-of-varargs-in-p11attrsbuild.patch
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/p11-kit/branches/experimental/debian/patches/Fix-dereference-of-varargs-in-p11attrsbuild.patch?rev=1678&op=file
==============================================================================
--- packages/p11-kit/branches/experimental/debian/patches/Fix-dereference-of-varargs-in-p11attrsbuild.patch (added)
+++ packages/p11-kit/branches/experimental/debian/patches/Fix-dereference-of-varargs-in-p11attrsbuild.patch Tue Feb 12 14:34:27 2013
@@ -1,0 +1,25 @@
+From 04781672277a537551c369ae71ecdc8410e31dc3 Mon Sep 17 00:00:00 2001
+From: Stef Walter <stefw at gnome.org>
+Date: Mon, 11 Feb 2013 20:50:55 +0100
+Subject: [PATCH] Fix dereference of varargs in p11_attrs_build()
+
+https://bugs.freedesktop.org/show_bug.cgi?id=60473
+---
+ common/attrs.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/common/attrs.c b/common/attrs.c
+index ab1bc59..f9d947e 100644
+--- a/common/attrs.c
++++ b/common/attrs.c
+@@ -158,7 +158,7 @@ p11_attrs_build (CK_ATTRIBUTE *attrs,
+ 	va_end (va);
+ 
+ 	va_start (va, attrs);
+-	attrs = attrs_build (attrs, count, true, vararg_generator, va);
++	attrs = attrs_build (attrs, count, true, vararg_generator, &va);
+ 	va_end (va);
+ 
+ 	return attrs;
+-- 
+1.8.1

Added: packages/p11-kit/branches/experimental/debian/patches/Remove-unnecessary-code-to-be-more-compatible-with.patch
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/p11-kit/branches/experimental/debian/patches/Remove-unnecessary-code-to-be-more-compatible-with.patch?rev=1678&op=file
==============================================================================
--- packages/p11-kit/branches/experimental/debian/patches/Remove-unnecessary-code-to-be-more-compatible-with.patch (added)
+++ packages/p11-kit/branches/experimental/debian/patches/Remove-unnecessary-code-to-be-more-compatible-with.patch Tue Feb 12 14:34:27 2013
@@ -1,0 +1,36 @@
+From 077fd91bed34bb6226e0a43a26f9e546372db54a Mon Sep 17 00:00:00 2001
+From: Stef Walter <stefw at gnome.org>
+Date: Mon, 11 Feb 2013 20:29:02 +0100
+Subject: [PATCH] Remove unnecessary code to be more compatible with various
+ libtasn1 versions
+
+https://bugs.freedesktop.org/show_bug.cgi?id=60434
+---
+ common/asn1.c | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/common/asn1.c b/common/asn1.c
+index 3df56d9..4f650ee 100644
+--- a/common/asn1.c
++++ b/common/asn1.c
+@@ -165,7 +165,6 @@ p11_asn1_encode (node_asn *asn,
+                  size_t *der_len)
+ {
+ 	char message[ASN1_MAX_ERROR_DESCRIPTION_SIZE];
+-	struct asn1_data_node data = { NULL, };
+ 	unsigned char *der;
+ 	int len;
+ 	int ret;
+@@ -184,9 +183,7 @@ p11_asn1_encode (node_asn *asn,
+ 	}
+ 
+ 	if (ret != ASN1_SUCCESS) {
+-		asn1_read_node_value (asn, &data);
+-		p11_debug_precond ("failed to encode %s: %s\n",
+-		                   data.name ? data.name : "(unknown)", message);
++		p11_debug_precond ("failed to encode: %s\n", message);
+ 		return NULL;
+ 	}
+ 
+-- 
+1.8.1

Added: packages/p11-kit/branches/experimental/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/p11-kit/branches/experimental/debian/patches/series?rev=1678&op=file
==============================================================================
--- packages/p11-kit/branches/experimental/debian/patches/series (added)
+++ packages/p11-kit/branches/experimental/debian/patches/series Tue Feb 12 14:34:27 2013
@@ -1,0 +1,2 @@
+Fix-dereference-of-varargs-in-p11attrsbuild.patch
+Remove-unnecessary-code-to-be-more-compatible-with.patch




More information about the Pkg-gnutls-commits mailing list