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

[cgrzemba at users.sourceforge.net]

Revision: 22994
          http://sourceforge.net/p/gar/code/22994
Author:   cgrzemba
Date:     2014-02-11 13:36:16 +0000 (Tue, 11 Feb 2014)
Log Message:
-----------
p11-kit/trunk: update version 0.20.2: 8 of 13 tests failed

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/0002-remove-include-paths.h.patch

Modified: csw/mgar/pkg/p11-kit/trunk/Makefile
===================================================================
--- csw/mgar/pkg/p11-kit/trunk/Makefile	2014-02-11 13:34:55 UTC (rev 22993)
+++ csw/mgar/pkg/p11-kit/trunk/Makefile	2014-02-11 13:36:16 UTC (rev 22994)
@@ -2,7 +2,7 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
 NAME = p11-kit
-VERSION = 0.12
+VERSION = 0.20.2
 GARTYPE = v2
 
 DESCRIPTION = Load and enumerate PKCS#11 modules
@@ -12,7 +12,8 @@
 
 # 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
+# PATCHFILES += 0001-Use-getexecname-instead-of-directly-accessing-__argv.patch
+PATCHFILES += 0002-remove-include-paths.h.patch
 
 VENDOR_URL = http://p11-glue.freedesktop.org/p11-kit.html
 
@@ -29,6 +30,8 @@
 RUNTIME_DEP_PKGS_CSWlibp11kit-dev += CSWlibp11kit0 
 
 EXTRA_CPPFLAGS = -features=extensions -D__PRETTY_FUNCTION__=__func__
+EXTRA_CPPFLAGS += -xc99 -D_POSIX_PTHREAD_SEMANTICS -D__FUNCTION__=__func__
+
 EXTRA_LINKER_FLAGS += -lintl
 
 # For fabs(3m)
@@ -40,7 +43,10 @@
 BUILD64_LIBS_ONLY = 1
 
 CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += --without-trust-paths 
 
+EXTRA_BUILD_ENV = V=1
+
 EXTRA_PAX_ARGS = -s ,pkcs11.conf.example,pkcs11.conf,
 
 PRESERVECONF += $(sysconfdir)/pkcs11.conf

Modified: csw/mgar/pkg/p11-kit/trunk/checksums
===================================================================
--- csw/mgar/pkg/p11-kit/trunk/checksums	2014-02-11 13:34:55 UTC (rev 22993)
+++ csw/mgar/pkg/p11-kit/trunk/checksums	2014-02-11 13:36:16 UTC (rev 22994)
@@ -1 +1 @@
-66baf7ddde982d1b7294d3bd63be7446  p11-kit-0.12.tar.gz
+757b97ee4ac0ce598661a90cd784c4f1  p11-kit-0.20.2.tar.gz

Added: csw/mgar/pkg/p11-kit/trunk/files/0002-remove-include-paths.h.patch
===================================================================
--- csw/mgar/pkg/p11-kit/trunk/files/0002-remove-include-paths.h.patch	                        (rev 0)
+++ csw/mgar/pkg/p11-kit/trunk/files/0002-remove-include-paths.h.patch	2014-02-11 13:36:16 UTC (rev 22994)
@@ -0,0 +1,13 @@
+--- a/trust/tests/test-trust.c
++++ b/trust/tests/test-trust.c
+@@ -54,10 +54,6 @@
+ #include <string.h>
+ #include <unistd.h>
+ 
+-#ifdef OS_UNIX
+-#include <paths.h>
+-#endif
+-
+ void
+ test_check_object_msg (const char *file,
+                        int line,

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