<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[119235] trunk/dports/gnome/gnome-keyring</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/119235">119235</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-04-20 23:31:00 -0700 (Sun, 20 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>gnome-keyring: disable p11 tests, add build fix for SL and earlier, delete unused patch file.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgnomegnomekeyringPortfile">trunk/dports/gnome/gnome-keyring/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsgnomegnomekeyringfilespatchpkcs11wraplayermocksecretstorecdiff">trunk/dports/gnome/gnome-keyring/files/patch-pkcs11-wrap-layer-mock-secret-store.c.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsgnomegnomekeyringfilespatchdisablepkcs11testsdiff">trunk/dports/gnome/gnome-keyring/files/patch-disable-pkcs11-tests.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgnomegnomekeyringPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/gnome-keyring/Portfile (119234 => 119235)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -6,6 +6,7 @@
</span><span class="cx"> name gnome-keyring
</span><span class="cx"> epoch 1
</span><span class="cx"> version 3.12.0
</span><ins>+revision 1
</ins><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> maintainers devans openmaintainer
</span><span class="cx"> categories gnome
</span><span class="lines">@@ -27,10 +28,9 @@
</span><span class="cx"> sha256 92695ed4d78a576ae77a9ac6faa8fe59db14358ec46b073199e70d537e29ec5f
</span><span class="cx">
</span><span class="cx"> patchfiles patch-egg-egg-asn1x.h.diff \
</span><del>- patch-egg-egg-armor.c.diff
</del><ins>+ patch-egg-egg-armor.c.diff \
+ patch-pkcs11-wrap-layer-mock-secret-store.c.diff
</ins><span class="cx">
</span><del>-# patch-disable-pkcs11-tests.diff
-
</del><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool \
</span><span class="cx"> port:gnome-common \
</span><span class="lines">@@ -51,6 +51,7 @@
</span><span class="cx"> autoreconf.args -fvi
</span><span class="cx">
</span><span class="cx"> configure.args --without-libcap-ng \
</span><ins>+ --disable-p11-tests \
</ins><span class="cx"> --disable-silent-rules \
</span><span class="cx"> --disable-schemas-compile
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsgnomegnomekeyringfilespatchdisablepkcs11testsdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/gnome/gnome-keyring/files/patch-disable-pkcs11-tests.diff (119234 => 119235)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,8 +0,0 @@
</span><del>---- 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 = .
</del></span></pre></div>
<a id="trunkdportsgnomegnomekeyringfilespatchpkcs11wraplayermocksecretstorecdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/gnome/gnome-keyring/files/patch-pkcs11-wrap-layer-mock-secret-store.c.diff (0 => 119235)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,46 @@
</span><ins>+--- 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)
+ {
</ins></span></pre>
</div>
</div>
</body>
</html>