[Pkg-citadel-commit] r155 - in libcitadel/trunk/debian: . patches

[dothebart-guest at alioth.debian.org]

Author: dothebart-guest
Date: 2008-09-09 17:24:47 +0000 (Tue, 09 Sep 2008)
New Revision: 155

Added:
   libcitadel/trunk/debian/patches/r6580_add_vcard_version.diff
Modified:
   libcitadel/trunk/debian/changelog
   libcitadel/trunk/debian/patches/series
Log:
[r6580] add upstream prepatch to fix debian Bug#497948


Modified: libcitadel/trunk/debian/changelog
===================================================================
--- libcitadel/trunk/debian/changelog	2008-09-08 09:32:41 UTC (rev 154)
+++ libcitadel/trunk/debian/changelog	2008-09-09 17:24:47 UTC (rev 155)
@@ -1,3 +1,11 @@
+libcitadel (7.37-4) unstable; urgency=low
+
+  [Wilfried Goesgens]
+  * [r6580] add upstream prepatch to fix debian Bug#497948: Violates vcard
+    standard
+
+ -- Michael Meskes <meskes at debian.org>  Tue, 9 Sep 2008 19:08:29 +0200
+
 libcitadel (7.37-3) unstable; urgency=low
 
   * Enable patching in debian/rules.

Added: libcitadel/trunk/debian/patches/r6580_add_vcard_version.diff
===================================================================
--- libcitadel/trunk/debian/patches/r6580_add_vcard_version.diff	                        (rev 0)
+++ libcitadel/trunk/debian/patches/r6580_add_vcard_version.diff	2008-09-09 17:24:47 UTC (rev 155)
@@ -0,0 +1,82 @@
+Index: lib/vcard.c
+===================================================================
+--- libcitadel-7.37.orig/lib/vcard.c	(revision 6579)
++++ libcitadel-7.37/lib/vcard.c	(revision 6580)
+@@ -3,7 +3,7 @@
+  *
+  * vCard implementation for Citadel
+  *
+- * Copyright (C) 1999-2007 by the citadel.org development team.
++ * Copyright (C) 1999-2008 by the citadel.org development team.
+  * This code is freely redistributable under the terms of the GNU General
+  * Public License.  All other rights reserved.
+  */
+@@ -34,7 +34,7 @@
+ #include <libcitadel.h>
+ 
+ 
+-/** 
++/* 
+  * Constructor (empty vCard)
+  * Returns an empty vcard
+  */
+@@ -51,7 +51,7 @@
+ 	return v;
+ }
+ 
+-/**
++/*
+  * Remove the "charset=" attribute from a vCard property name
+  *
+  */
+@@ -93,7 +93,7 @@
+ 
+ 
+ 
+-/**
++/*
+  * Constructor - returns a new struct vcard given a serialized vcard
+  */
+ struct vCard *vcard_load(char *vtext) {
+@@ -108,7 +108,7 @@
+ 	mycopy = strdup(vtext);
+ 	if (mycopy == NULL) return NULL;
+ 
+-	/**
++	/*
+ 	 * First, fix this big pile o' vCard to make it more parseable.
+ 	 * To make it easier to parse, we convert CRLF to LF, and unfold any
+ 	 * multi-line fields into single lines.
+@@ -176,7 +176,7 @@
+ }
+ 
+ 
+-/**
++/*
+  * Fetch the value of a particular key.
+  * If is_partial is set to 1, a partial match is ok (for example,
+  * a key of "tel;home" will satisfy a search for "tel").
+@@ -255,7 +255,7 @@
+ 
+ 	if (v->magic != CTDL_VCARD_MAGIC) return;	/* Self-check */
+ 
+-	/** If this key is already present, replace it */
++	/* If this key is already present, replace it */
+ 	if (!append) if (v->numprops) for (i=0; i<(v->numprops); ++i) {
+ 		if (!strcasecmp(v->prop[i].name, name)) {
+ 			free(v->prop[i].name);
+@@ -287,9 +287,13 @@
+ 	size_t len;
+ 	int is_utf8 = 0;
+ 
++	if (v == NULL) return NULL;			/* self check */
+ 	if (v->magic != CTDL_VCARD_MAGIC) return NULL;	/* self check */
+ 
+-	/** Figure out how big a buffer we need to allocate */
++	/* Set the vCard version number to 3.0 at this time. */
++	vcard_set_prop(v, "VERSION", "3.0", 0);
++
++	/* Figure out how big a buffer we need to allocate */
+ 	len = 64;	/* for begin, end, and a little padding for safety */
+ 	if (v->numprops) for (i=0; i<(v->numprops); ++i) {
+ 		len = len +

Modified: libcitadel/trunk/debian/patches/series
===================================================================
--- libcitadel/trunk/debian/patches/series	2008-09-08 09:32:41 UTC (rev 154)
+++ libcitadel/trunk/debian/patches/series	2008-09-09 17:24:47 UTC (rev 155)
@@ -1,2 +1,3 @@
 r6413_64_bit_cleanness.diff
 r6475_close_dirhandle.diff
+r6580_add_vcard_version.diff