ports/90109: Update port: misc/ossp-uuid to 1.3.2

[Vasil Dimov]

>Number:         90109
>Category:       ports
>Synopsis:       Update port: misc/ossp-uuid to 1.3.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Dec 08 17:00:14 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Vasil Dimov
>Release:        FreeBSD 6.0-STABLE amd64
>Organization:
DataMax
>Environment:

>Description:

Update misc/ossp-uuid from 1.3.1 to 1.3.2 + bugfix in uuid_str.c,
related to va_list structure being used after it is exhausted, e.g.
being used twice causing segfaults during ``make test''.

>How-To-Repeat:

>Fix:

--- ossp-uuid_1.3.1-1.3.2.diff begins here ---
diff -urN --exclude=CVS ossp-uuid.orig/Makefile ossp-uuid/Makefile
--- ossp-uuid.orig/Makefile	Wed Nov 16 02:20:45 2005
+++ ossp-uuid/Makefile	Thu Dec  8 18:51:01 2005
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	uuid
-PORTVERSION=	1.3.1
+PORTVERSION=	1.3.2
 CATEGORIES=	misc devel
 MASTER_SITES=	${MASTER_SITE_OSSP}
 MASTER_SITE_SUBDIR=	lib/${PORTNAME}
@@ -36,8 +36,8 @@
 PLIST_SUB+=		WITH_PERL='@comment '
 .endif
 
-test:
-	cd ${WRKSRC}; ${MAKE} check
+test: build
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check
 
 .include <bsd.port.pre.mk>
 
diff -urN --exclude=CVS ossp-uuid.orig/distinfo ossp-uuid/distinfo
--- ossp-uuid.orig/distinfo	Thu Nov 10 12:38:59 2005
+++ ossp-uuid/distinfo	Thu Dec  8 17:52:26 2005
@@ -1,3 +1,3 @@
-MD5 (uuid-1.3.1.tar.gz) = 004c12ee8e1a1c390573edae6f30392b
-SHA256 (uuid-1.3.1.tar.gz) = 34b9d69feed9aa42441387800cc4a430becf1474671b1d31e6a02444a50f49e2
-SIZE (uuid-1.3.1.tar.gz) = 378496
+MD5 (uuid-1.3.2.tar.gz) = df520ef922e944468345a4011c14a769
+SHA256 (uuid-1.3.2.tar.gz) = 9db27e0392e5685ef6487bf153dcb906deb4ff202d3d9c9d9735690b2dd4b991
+SIZE (uuid-1.3.2.tar.gz) = 442679
diff -urN --exclude=CVS ossp-uuid.orig/files/patch-uuid_str.c ossp-uuid/files/patch-uuid_str.c
--- ossp-uuid.orig/files/patch-uuid_str.c	Thu Jan  1 02:00:00 1970
+++ ossp-uuid/files/patch-uuid_str.c	Thu Dec  8 18:46:41 2005
@@ -0,0 +1,32 @@
+--- uuid_str.c.orig	Tue Mar 29 21:39:51 2005
++++ uuid_str.c	Thu Dec  8 18:46:13 2005
+@@ -690,8 +690,10 @@
+ {
+     char *rv;
+     int n;
++    va_list ap_tmp;
+ 
+-    n = str_vsnprintf(NULL, 0, fmt, ap);
++    va_copy(ap_tmp, ap);
++    n = str_vsnprintf(NULL, 0, fmt, ap_tmp);
+     if ((rv = (char *)malloc(n+1)) == NULL)
+         return NULL;
+     str_vsnprintf(rv, n+1, fmt, ap);
+@@ -720,6 +722,7 @@
+ {
+     int rv;
+     size_t n;
++    va_list ap_tmp;
+ 
+     if (str == NULL)
+         return -1;
+@@ -729,7 +732,8 @@
+     }
+     else {
+         n = strlen(*str);
+-        rv = str_vsnprintf(NULL, 0, fmt, ap);
++        va_copy(ap_tmp, ap);
++        rv = str_vsnprintf(NULL, 0, fmt, ap_tmp);
+         if ((*str = (char *)realloc(*str, n+rv+1)) == NULL)
+             return -1;
+         str_vsnprintf((*str)+n, rv+1, fmt, ap);
--- ossp-uuid_1.3.1-1.3.2.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted: