<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e5791acebbf7c6a6c003c0618f0c2edcb7481a79">https://github.com/macports/macports-ports/commit/e5791acebbf7c6a6c003c0618f0c2edcb7481a79</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit e5791acebbf7c6a6c003c0618f0c2edcb7481a79
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Tue Jan 29 11:07:34 2019 -0800
<span style='display:block; white-space:pre;color:#404040;'> gnome-keyring: use legacysupport portgroup rather than memmem() patch
</span>---
gnome/gnome-keyring/Portfile | 5 ++-
...atch-pkcs11-wrap-layer-mock-secret-store.c.diff | 46 ----------------------
2 files changed, 3 insertions(+), 48 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnome-keyring/Portfile b/gnome/gnome-keyring/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bbe9990..5c8bea4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnome-keyring/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnome-keyring/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,10 +2,12 @@
</span>
PortSystem 1.0
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup legacysupport 1.0
</span>
name gnome-keyring
epoch 1
version 3.28.2
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> set branch [join [lrange [split ${version} .] 0 1] .]
maintainers {devans @dbevans} openmaintainer
categories gnome
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,8 +44,7 @@ depends_lib path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span> # blacklist compilers that do not support C11 (redefinition of typedef 'GckSession' in daemon/login/gkd-login.h)
compiler.blacklist *gcc-3.* *gcc-4.* {clang < 300}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-egg-egg-armor.c.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-pkcs11-wrap-layer-mock-secret-store.c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-egg-egg-armor.c.diff
</span>
# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnome-keyring/files/patch-pkcs11-wrap-layer-mock-secret-store.c.diff b/gnome/gnome-keyring/files/patch-pkcs11-wrap-layer-mock-secret-store.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 666d054..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnome-keyring/files/patch-pkcs11-wrap-layer-mock-secret-store.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,46 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- pkcs11/wrap-layer/mock-secret-store.c.orig 2014-04-20 22:59:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ pkcs11/wrap-layer/mock-secret-store.c 2014-04-20 23:09:50.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -32,6 +32,43 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EGG_SECURE_DEFINE_GLIB_GLOBALS ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <Availability.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if __MAC_OS_X_VERSION_MIN_REQUIRED <= 1060
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define memmem mp_memmem
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static void *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+mp_memmem(const void *b1, size_t len1, const void *b2, size_t len2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static void *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+mp_memmem(const void *b1, size_t len1, const void *b2, size_t len2)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* Initialize search pointer */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ char *sp = (char *) b1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* Initialize pattern pointer */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ char *pp = (char *) b2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* Intialize end of search address space pointer */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ char *eos = sp + len1 - len2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* Sanity check */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(!(b1 && b2 && len1 && len2))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while (sp <= eos) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (*sp == *pp)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (memcmp(sp, pp, len2) == 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return sp;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sp++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static CK_RV
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mock_secret_C_Initialize (CK_VOID_PTR pInitArgs)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span></pre><pre style='margin:0'>
</pre>