From c3b0200e9898d2ea9bce59e4d000b14856e2013f Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Sun, 25 Jan 2015 07:43:13 +0000
Subject: Add more error handling in UUID patch. Bump PKGREVISION.

---
 net/gupnp/Makefile         |  3 ++-
 net/gupnp/distinfo         |  6 +++---
 net/gupnp/patches/patch-ab |  6 +++---
 net/gupnp/patches/patch-ad | 22 +++++++++++++++-------
 4 files changed, 23 insertions(+), 14 deletions(-)

(limited to 'net')

diff --git a/net/gupnp/Makefile b/net/gupnp/Makefile
index 33a8fadfe5d..4041e8e8324 100644
--- a/net/gupnp/Makefile
+++ b/net/gupnp/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2015/01/17 09:23:26 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2015/01/25 07:43:13 wiz Exp $
 
 DISTNAME=	gupnp-0.20.13
+PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gupnp/0.20/}
 EXTRACT_SUFX=	.tar.xz
diff --git a/net/gupnp/distinfo b/net/gupnp/distinfo
index cf50195fb2b..c2831f3182e 100644
--- a/net/gupnp/distinfo
+++ b/net/gupnp/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.21 2015/01/20 10:12:25 wiz Exp $
+$NetBSD: distinfo,v 1.22 2015/01/25 07:43:13 wiz Exp $
 
 SHA1 (gupnp-0.20.13.tar.xz) = eaec209a94e40dc98ba3af96277d79eeba59ddad
 RMD160 (gupnp-0.20.13.tar.xz) = bb1c41f910de4b14e7babda0fef0420415400a4b
 Size (gupnp-0.20.13.tar.xz) = 395356 bytes
-SHA1 (patch-ab) = 64a8c0f31a14f445acf30ae8571905de2182d60c
-SHA1 (patch-ad) = 253dc40d138c88a4bfdf2579f820aca5d23bebb6
+SHA1 (patch-ab) = ca3f0a39fa6df960f24b7660f2340ca63a34999a
+SHA1 (patch-ad) = b07b54ba59b0018df9f8d950e3a12ceb5ee174e8
diff --git a/net/gupnp/patches/patch-ab b/net/gupnp/patches/patch-ab
index 1a99688db88..661c3590030 100644
--- a/net/gupnp/patches/patch-ab
+++ b/net/gupnp/patches/patch-ab
@@ -1,11 +1,11 @@
-$NetBSD: patch-ab,v 1.2 2015/01/20 10:12:25 wiz Exp $
+$NetBSD: patch-ab,v 1.3 2015/01/25 07:43:13 wiz Exp $
 
 More defensive programming.
 https://bugzilla.gnome.org/show_bug.cgi?id=743233
 
---- libgupnp/gupnp-control-point.c.orig	2009-04-30 13:54:20.000000000 +0200
+--- libgupnp/gupnp-control-point.c.orig	2014-05-31 07:49:41.000000000 +0000
 +++ libgupnp/gupnp-control-point.c
-@@ -572,7 +572,7 @@ parse_usn (const char *usn,
+@@ -692,7 +692,7 @@ parse_usn (const char *usn,
          /* Count elements */
          count = g_strv_length (bits);
  
diff --git a/net/gupnp/patches/patch-ad b/net/gupnp/patches/patch-ad
index 7aec5898c56..91efbc137db 100644
--- a/net/gupnp/patches/patch-ad
+++ b/net/gupnp/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.7 2015/01/19 12:42:37 wiz Exp $
+$NetBSD: patch-ad,v 1.8 2015/01/25 07:43:13 wiz Exp $
 
 Add support for BSD uuid library.
 https://bugzilla.gnome.org/show_bug.cgi?id=743072
@@ -18,19 +18,27 @@ https://bugzilla.gnome.org/show_bug.cgi?id=743072
  
  #define SUBSCRIPTION_TIMEOUT 300 /* DLNA (7.2.22.1) enforced */
  
-@@ -1110,9 +1114,19 @@ generate_sid (void)
+@@ -1110,9 +1114,27 @@ generate_sid (void)
  #else
          uuid_t id;
          char out[39];
 -
 +#if defined(__NetBSD__) || defined(__DragonFly__) || defined(__FreeBSD__)
 +        {
-+	        char *myout;
++                char *myout = NULL;
++                uint32_t status;
 +
-+	        uuid_create (&id, 0);
-+	        uuid_to_string (&id, &myout, 0);
-+	        strncpy (out, myout, sizeof(out));
-+	        free (myout);
++                uuid_create (&id, &status);
++                if (status != uuid_s_ok) {
++                        return NULL;
++                }
++                uuid_to_string (&id, &myout, &status);
++                if (status != uuid_s_ok) {
++                        free (myout);
++                        return NULL;
++                }
++                strncpy (out, myout, sizeof(out));
++                free (myout);
 +        }
 +#else
          uuid_generate (id);
-- 
cgit v1.2.3