[csw-devel] SF.net SVN: gar:[21862] csw/mgar/pkg/libassuan/trunk

[lblume at users.sourceforge.net]

Revision: 21862
          http://gar.svn.sourceforge.net/gar/?rev=21862&view=rev
Author:   lblume
Date:     2013-08-28 14:50:13 +0000 (Wed, 28 Aug 2013)
Log Message:
-----------
libassuan/trunk: Fix for the segfault (slowfranklin did it!)

Modified Paths:
--------------
    csw/mgar/pkg/libassuan/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/libassuan/trunk/files/0001-Fix-usage-of-variadic-arguments.patch

Modified: csw/mgar/pkg/libassuan/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libassuan/trunk/Makefile	2013-08-27 13:52:27 UTC (rev 21861)
+++ csw/mgar/pkg/libassuan/trunk/Makefile	2013-08-28 14:50:13 UTC (rev 21862)
@@ -13,6 +13,12 @@
 
 BUILD_DEP_PKGS += CSWlibgpg-error-dev
 
+# Related to:
+# https://bugs.g10code.com/gnupg/msg4081
+# http://bugs.g10code.com/gnupg/issue1477
+# http://bugs.g10code.com/gnupg/issue1350
+PATCHFILES += 0001-Fix-usage-of-variadic-arguments.patch
+
 PACKAGES += CSWlibassuan0
 SPKG_DESC_CSWlibassuan0 = IPC library used by some GnuPG related software, libassuan.so.0
 PKGFILES_CSWlibassuan0 += $(call pkgfiles_lib,libassuan.so.0)
@@ -26,8 +32,4 @@
 
 BUILD64_LIBS_ONLY = 1
 
-# Disable tests until this is fixed:
-#   https://bugs.g10code.com/gnupg/msg4081
-SKIPTEST ?= 1
-
 include gar/category.mk

Added: csw/mgar/pkg/libassuan/trunk/files/0001-Fix-usage-of-variadic-arguments.patch
===================================================================
--- csw/mgar/pkg/libassuan/trunk/files/0001-Fix-usage-of-variadic-arguments.patch	                        (rev 0)
+++ csw/mgar/pkg/libassuan/trunk/files/0001-Fix-usage-of-variadic-arguments.patch	2013-08-28 14:50:13 UTC (rev 21862)
@@ -0,0 +1,65 @@
+From 0fff25442b1661069e4e995864d7b32924305ac6 Mon Sep 17 00:00:00 2001
+From: Ralph Boehme <sloowfranklin at gmail.com>
+Date: Wed, 28 Aug 2013 12:22:08 +0200
+Subject: [PATCH] Fix usage of variadic arguments
+
+---
+ src/vasprintf.c | 11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/src/vasprintf.c b/src/vasprintf.c
+index bacb71c..fffeb71 100644
+--- a/src/vasprintf.c
++++ b/src/vasprintf.c
+@@ -43,13 +43,13 @@ Boston, MA 02111-1307, USA.  */
+ int global_total_width;
+ #endif
+ 
+-static int int_vasprintf (char **, const char *, va_list *);
++static int int_vasprintf (char **, const char *, va_list);
+ 
+ static int
+ int_vasprintf (result, format, args)
+      char **result;
+      const char *format;
+-     va_list *args;
++     va_list args;
+ {
+ #if defined(HAVE_W32CE_SYSTEM) && defined(_MSC_VER)
+   /* No va_copy and the replacement above doesn't work.  */
+@@ -70,7 +70,7 @@ int_vasprintf (result, format, args)
+   int total_width = strlen (format) + 1;
+   va_list ap;
+ 
+-  va_copy (ap, *args);
++  va_copy (ap, args);
+ 
+   while (*p != '\0')
+     {
+@@ -138,12 +138,13 @@ int_vasprintf (result, format, args)
+ 	  p++;
+ 	}
+     }
++  va_end(ap);
+ #ifdef TEST
+   global_total_width = total_width;
+ #endif
+   *result = malloc (total_width);
+   if (*result != NULL)
+-    return vsprintf (*result, format, *args);
++    return vsprintf (*result, format, args);
+   else
+     return 0;
+ #endif
+@@ -154,7 +155,7 @@ int_vasprintf (result, format, args)
+ int
+ _assuan_vasprintf (char **result, const char *format, va_list args)
+ {
+-  return int_vasprintf (result, format, &args);
++  return int_vasprintf (result, format, args);
+ }
+ 
+ 
+-- 
+1.8.3.4
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.