<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/fe716f7fc00b9ac8ef492a930bd3a0918829cf32">https://github.com/macports/macports-ports/commit/fe716f7fc00b9ac8ef492a930bd3a0918829cf32</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new fe716f7  xscorch: add patch to fix crash
</span>fe716f7 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit fe716f7fc00b9ac8ef492a930bd3a0918829cf32
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sun Nov 19 21:36:11 2017 +1100

<span style='display:block; white-space:pre;color:#404040;'>    xscorch: add patch to fix crash
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    See: https://trac.macports.org/ticket/31231#comment:3
</span>---
 games/xscorch/Portfile                      |  4 +++-
 games/xscorch/files/overlapping-memcpy.diff | 24 ++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/xscorch/Portfile b/games/xscorch/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2bee90a..2d01346 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/xscorch/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/xscorch/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,6 +4,7 @@ PortSystem          1.0
</span> 
 name                xscorch
 version             0.2.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            1
</span> categories          games
 platforms           darwin
 maintainers         nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,7 +30,8 @@ depends_build       port:pkgconfig
</span> depends_lib         port:gtk2 \
                     port:libmikmod
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles          patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles          patch-configure.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    overlapping-memcpy.diff
</span> 
 configure.args      --mandir=${prefix}/share/man \
                     --disable-warn \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/xscorch/files/overlapping-memcpy.diff b/games/xscorch/files/overlapping-memcpy.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..ed34b6a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/xscorch/files/overlapping-memcpy.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Description: Use memmove instead of memcpy for overlapping src/dst
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Author: Yann Dirson <ydirson@free;fr>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Bug-Debian: http://bugs.debian.org/753516
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libj/jstr/str_trim.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libj/jstr/str_trim.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -47,7 +47,7 @@ char *trim(char *s) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       SET_LAST_NWS(ws, s);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       /* Copy the non-ws characters in <s>. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-      if(ws.fnws > d) MEMCPY(d, ws.fnws, NWS_SIZE(ws));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++      if(ws.fnws > d) MEMMOVE(d, ws.fnws, NWS_SIZE(ws));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       *(d + NWS_SIZE(ws)) = '\0';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       return(d);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -93,7 +93,7 @@ char *ltrim(char *s) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if(s != NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       SKIM_WHITESPACE(s);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-      MEMCPY(d, s, STRLEN(s) + 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++      MEMMOVE(d, s, STRLEN(s) + 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       return(d);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    return(NULL);
</span></pre><pre style='margin:0'>

</pre>