[csw-devel] SF.net SVN: gar:[17890] csw/mgar/pkg/p11-kit/trunk

[dmichelsen at users.sourceforge.net]

Revision: 17890
          http://gar.svn.sourceforge.net/gar/?rev=17890&view=rev
Author:   dmichelsen
Date:     2012-04-27 12:14:26 +0000 (Fri, 27 Apr 2012)
Log Message:
-----------
p11-kit/trunk: Update to 0.12

Modified Paths:
--------------
    csw/mgar/pkg/p11-kit/trunk/Makefile
    csw/mgar/pkg/p11-kit/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/p11-kit/trunk/files/0001-Use-getexecname-instead-of-directly-accessing-__argv.patch

Removed Paths:
-------------
    csw/mgar/pkg/p11-kit/trunk/files/0001-Hack-around-missing-__argv.patch

Modified: csw/mgar/pkg/p11-kit/trunk/Makefile
===================================================================
--- csw/mgar/pkg/p11-kit/trunk/Makefile	2012-04-27 11:04:39 UTC (rev 17889)
+++ csw/mgar/pkg/p11-kit/trunk/Makefile	2012-04-27 12:14:26 UTC (rev 17890)
@@ -2,18 +2,18 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
 NAME = p11-kit
-VERSION = 0.8
+VERSION = 0.12
 GARTYPE = v2
 CATEGORIES = lib
 
 DESCRIPTION = Load and enumerate PKCS#11 modules
-define BLURB
-endef
 
 MASTER_SITES = http://p11-glue.freedesktop.org/releases/
 DISTFILES  = $(DISTNAME).tar.gz
 
-PATCHFILES += 0001-Hack-around-missing-__argv.patch
+# Use patch until this has been fixed:
+#   http://bugs.freedesktop.org/show_bug.cgi?id=49218
+PATCHFILES += 0001-Use-getexecname-instead-of-directly-accessing-__argv.patch
 
 VENDOR_URL = http://p11-glue.freedesktop.org/p11-kit.html
 

Modified: csw/mgar/pkg/p11-kit/trunk/checksums
===================================================================
--- csw/mgar/pkg/p11-kit/trunk/checksums	2012-04-27 11:04:39 UTC (rev 17889)
+++ csw/mgar/pkg/p11-kit/trunk/checksums	2012-04-27 12:14:26 UTC (rev 17890)
@@ -1 +1 @@
-0928ab06acbdeda48645df4791f4d28d  p11-kit-0.8.tar.gz
+66baf7ddde982d1b7294d3bd63be7446  p11-kit-0.12.tar.gz

Deleted: csw/mgar/pkg/p11-kit/trunk/files/0001-Hack-around-missing-__argv.patch
===================================================================
--- csw/mgar/pkg/p11-kit/trunk/files/0001-Hack-around-missing-__argv.patch	2012-04-27 11:04:39 UTC (rev 17889)
+++ csw/mgar/pkg/p11-kit/trunk/files/0001-Hack-around-missing-__argv.patch	2012-04-27 12:14:26 UTC (rev 17890)
@@ -1,52 +0,0 @@
-From 8dbe61abe2af6ce7633337a2d1005b8ddfcf5610 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Tue, 25 Oct 2011 17:55:17 +0200
-Subject: [PATCH] Hack around missing __argv
-
----
- tools/compat.c |   14 +++++++++-----
- 1 files changed, 9 insertions(+), 5 deletions(-)
-
-diff --git a/tools/compat.c b/tools/compat.c
-index 93ba77c..a708ac5 100644
---- a/tools/compat.c
-+++ b/tools/compat.c
-@@ -42,6 +42,7 @@
- #include <stdio.h>
- #include <string.h>
- #include <stdarg.h>
-+#include <errno.h>
- 
- static const char *
- calc_prog_name (void)
-@@ -51,19 +52,22 @@ calc_prog_name (void)
- 
- 	if(!prepared)
- 	{
--		const char* beg = strrchr(__argv[0], '\\');
--		const char* temp = strrchr(__argv[0], '/');
-+		strcpy( prognamebuf, "" );
-+/*
-+		const char* beg = strrchr(argv[0], '\\');
-+		const char* temp = strrchr(argv[0], '/');
- 		beg = (beg > temp) ? beg : temp;
--		beg = (beg) ? beg + 1 : __argv[0];
-+		beg = (beg) ? beg + 1 : argv[0];
- 
--		temp = strrchr(__argv[0], '.');
--		temp = (temp > beg) ? temp : __argv[0] + strlen(__argv[0]);
-+		temp = strrchr(argv[0], '.');
-+		temp = (temp > beg) ? temp : argv[0] + strlen(argv[0]);
- 
- 		if((temp - beg) > 255)
- 			temp = beg + 255;
- 
- 		strncpy(prognamebuf, beg, temp - beg);
- 		prognamebuf[temp - beg] = 0;
-+*/
- 		prepared = 1;
- 	}
- 
--- 
-1.7.6.1
-

Added: csw/mgar/pkg/p11-kit/trunk/files/0001-Use-getexecname-instead-of-directly-accessing-__argv.patch
===================================================================
--- csw/mgar/pkg/p11-kit/trunk/files/0001-Use-getexecname-instead-of-directly-accessing-__argv.patch	                        (rev 0)
+++ csw/mgar/pkg/p11-kit/trunk/files/0001-Use-getexecname-instead-of-directly-accessing-__argv.patch	2012-04-27 12:14:26 UTC (rev 17890)
@@ -0,0 +1,34 @@
+From 2826e9f33625e56ae9c44f7441c3b65882822b60 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <da\xC2m at opencsw.org>
+Date: Fri, 27 Apr 2012 14:00:32 +0200
+Subject: [PATCH] Use getexecname() instead of directly accessing __argv
+
+---
+ tools/compat.c |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/tools/compat.c b/tools/compat.c
+index 93ba77c..fd596a2 100644
+--- a/tools/compat.c
++++ b/tools/compat.c
+@@ -42,6 +42,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <stdarg.h>
++#include <errno.h>
+ 
+ static const char *
+ calc_prog_name (void)
+@@ -51,6 +52,9 @@ calc_prog_name (void)
+ 
+ 	if(!prepared)
+ 	{
++		const char *__argv[1];
++
++		__argv[0] = getexecname();
+ 		const char* beg = strrchr(__argv[0], '\\');
+ 		const char* temp = strrchr(__argv[0], '/');
+ 		beg = (beg > temp) ? beg : temp;
+-- 
+1.7.10
+

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