<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/2fe07c791cf3df873ab41f6cd57a40cbe3f5e7a9">https://github.com/macports/macports-ports/commit/2fe07c791cf3df873ab41f6cd57a40cbe3f5e7a9</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 2fe07c7  GraphicsMagick: Fix crash with png files
</span>2fe07c7 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 2fe07c791cf3df873ab41f6cd57a40cbe3f5e7a9
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue Jul 9 10:50:34 2019 -0500

<span style='display:block; white-space:pre;color:#404040;'>    GraphicsMagick: Fix crash with png files
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/58693
</span>---
 graphics/GraphicsMagick/Portfile                   |  4 ++-
 .../GraphicsMagick/files/fix-strlcat-crash.patch   | 41 ++++++++++++++++++++++
 2 files changed, 44 insertions(+), 1 deletion(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/GraphicsMagick/Portfile b/graphics/GraphicsMagick/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 17c74f5..7c910de 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/GraphicsMagick/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/GraphicsMagick/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem              1.0
</span> 
 name                    GraphicsMagick
 version                 1.3.32
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision                0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision                1
</span> checksums               rmd160  1d2db9804e2fc31223219abd9653896be641b0af \
                         sha256  b842a5a0d6c84fd6c5f161b5cd8e02bbd210b0c0b6728dd762b7c53062ba94e1 \
                         size    5535224
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,6 +43,8 @@ depends_lib             port:libxml2 \
</span> 
 use_xz                  yes
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append       fix-strlcat-crash.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # llvm-gcc-4.2 gives "Undefined symbols for architecture x86_64: ___builtin_object_size"
 compiler.blacklist      *llvm-gcc-4.2
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/GraphicsMagick/files/fix-strlcat-crash.patch b/graphics/GraphicsMagick/files/fix-strlcat-crash.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..289f47d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/GraphicsMagick/files/fix-strlcat-crash.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,41 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix crash when invoking strlcat
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://sourceforge.net/p/graphicsmagick/bugs/609/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://sourceforge.net/p/graphicsmagick/code/ci/f30492f40f78d867b43422215057dd21de4ba447/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- coders/png.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ coders/png.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6427,26 +6427,26 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       *version='\0';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined(PNG_LIBPNG_VER_STRING)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-      (void) strlcat(version,"libpng ",MaxTextExtent);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-      (void) strlcat(version,PNG_LIBPNG_VER_STRING,MaxTextExtent);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++      (void) strlcat(version,"libpng ",sizeof(version));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++      (void) strlcat(version,PNG_LIBPNG_VER_STRING,sizeof(version));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if (PNG_LIBPNG_VER > 10005)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       if (LocaleCompare(PNG_LIBPNG_VER_STRING,png_get_header_ver(NULL)) != 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-          (void) strlcat(version,",",MaxTextExtent);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-          (void) strlcat(version,png_get_libpng_ver(NULL),MaxTextExtent);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++          (void) strlcat(version,",",sizeof(version));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++          (void) strlcat(version,png_get_libpng_ver(NULL),sizeof(version));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined(ZLIB_VERSION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       if (*version != '\0')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        (void) strlcat(version,", ",MaxTextExtent);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-      (void) strlcat(version,"zlib ",MaxTextExtent);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-      (void) strlcat(version,ZLIB_VERSION,MaxTextExtent);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        (void) strlcat(version,", ",sizeof(version));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++      (void) strlcat(version,"zlib ",sizeof(version));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++      (void) strlcat(version,ZLIB_VERSION,sizeof(version));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       if (LocaleCompare(ZLIB_VERSION,zlib_version) != 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-          (void) strlcat(version,",",MaxTextExtent);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-          (void) strlcat(version,zlib_version,MaxTextExtent);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++          (void) strlcat(version,",",sizeof(version));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++          (void) strlcat(version,zlib_version,sizeof(version));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span></pre><pre style='margin:0'>

</pre>