[119235] trunk/dports/gnome/gnome-keyring

[devans at macports.org]

Revision: 119235
          https://trac.macports.org/changeset/119235
Author:   devans at macports.org
Date:     2014-04-20 23:31:00 -0700 (Sun, 20 Apr 2014)
Log Message:
-----------
gnome-keyring: disable p11 tests, add build fix for SL and earlier, delete unused patch file.

Modified Paths:
--------------
    trunk/dports/gnome/gnome-keyring/Portfile

Added Paths:
-----------
    trunk/dports/gnome/gnome-keyring/files/patch-pkcs11-wrap-layer-mock-secret-store.c.diff

Removed Paths:
-------------
    trunk/dports/gnome/gnome-keyring/files/patch-disable-pkcs11-tests.diff

Modified: trunk/dports/gnome/gnome-keyring/Portfile
===================================================================
--- trunk/dports/gnome/gnome-keyring/Portfile	2014-04-21 06:17:54 UTC (rev 119234)
+++ trunk/dports/gnome/gnome-keyring/Portfile	2014-04-21 06:31:00 UTC (rev 119235)
@@ -6,6 +6,7 @@
 name            gnome-keyring
 epoch           1
 version         3.12.0
+revision        1
 set branch      [join [lrange [split ${version} .] 0 1] .]
 maintainers     devans openmaintainer
 categories      gnome
@@ -27,10 +28,9 @@
                 sha256  92695ed4d78a576ae77a9ac6faa8fe59db14358ec46b073199e70d537e29ec5f
 
 patchfiles      patch-egg-egg-asn1x.h.diff \
-                patch-egg-egg-armor.c.diff
+                patch-egg-egg-armor.c.diff \
+                patch-pkcs11-wrap-layer-mock-secret-store.c.diff
 
-#                patch-disable-pkcs11-tests.diff
-
 depends_build   port:pkgconfig \
                 port:intltool \
                 port:gnome-common \
@@ -51,6 +51,7 @@
 autoreconf.args -fvi
 
 configure.args  --without-libcap-ng \
+                --disable-p11-tests \
                 --disable-silent-rules \
                 --disable-schemas-compile
 

Deleted: trunk/dports/gnome/gnome-keyring/files/patch-disable-pkcs11-tests.diff
===================================================================
--- trunk/dports/gnome/gnome-keyring/files/patch-disable-pkcs11-tests.diff	2014-04-21 06:17:54 UTC (rev 119234)
+++ trunk/dports/gnome/gnome-keyring/files/patch-disable-pkcs11-tests.diff	2014-04-21 06:31:00 UTC (rev 119235)
@@ -1,8 +0,0 @@
---- pkcs11/wrap-layer/Makefile.am.orig	2013-11-15 16:46:09.000000000 -0800
-+++ pkcs11/wrap-layer/Makefile.am	2013-11-15 16:46:30.000000000 -0800
-@@ -30,4 +30,4 @@
- 
- # ------------------------------------------------------------------------------
- 
--SUBDIRS = . tests
-+SUBDIRS = .

Added: trunk/dports/gnome/gnome-keyring/files/patch-pkcs11-wrap-layer-mock-secret-store.c.diff
===================================================================
--- trunk/dports/gnome/gnome-keyring/files/patch-pkcs11-wrap-layer-mock-secret-store.c.diff	                        (rev 0)
+++ trunk/dports/gnome/gnome-keyring/files/patch-pkcs11-wrap-layer-mock-secret-store.c.diff	2014-04-21 06:31:00 UTC (rev 119235)
@@ -0,0 +1,46 @@
+--- pkcs11/wrap-layer/mock-secret-store.c.orig	2014-04-20 22:59:11.000000000 -0700
++++ pkcs11/wrap-layer/mock-secret-store.c	2014-04-20 23:09:50.000000000 -0700
+@@ -32,6 +32,43 @@
+ 
+ EGG_SECURE_DEFINE_GLIB_GLOBALS ();
+ 
++#ifdef __APPLE__
++#include <Availability.h>
++#if __MAC_OS_X_VERSION_MIN_REQUIRED <= 1060
++#define memmem mp_memmem
++#endif
++#endif
++
++static void *
++mp_memmem(const void *b1, size_t len1, const void *b2, size_t len2);
++
++static void *
++mp_memmem(const void *b1, size_t len1, const void *b2, size_t len2)
++{
++        /* Initialize search pointer */
++        char *sp = (char *) b1;
++
++        /* Initialize pattern pointer */
++        char *pp = (char *) b2;
++
++        /* Intialize end of search address space pointer */
++        char *eos   = sp + len1 - len2;
++
++        /* Sanity check */
++        if(!(b1 && b2 && len1 && len2))
++                return NULL;
++
++        while (sp <= eos) {
++                if (*sp == *pp)
++                        if (memcmp(sp, pp, len2) == 0)
++                                return sp;
++
++                        sp++;
++        }
++
++        return NULL;
++}
++
+ static CK_RV
+ mock_secret_C_Initialize (CK_VOID_PTR pInitArgs)
+ {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140420/01bd3b54/attachment.html>