Revision: 25692
http://sourceforge.net/p/gar/code/25692
Author: lblume
Date: 2016-05-04 20:37:51 +0000 (Wed, 04 May 2016)
Log Message:
-----------
ImageMagick/trunk: Add some comments, remove lines from the patch
Modified Paths:
--------------
csw/mgar/pkg/ImageMagick/trunk/Makefile
csw/mgar/pkg/ImageMagick/trunk/files/0003-CVE-2016-3714.patch
Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ImageMagick/trunk/Makefile 2016-05-04 19:36:50 UTC (rev
25691)
+++ csw/mgar/pkg/ImageMagick/trunk/Makefile 2016-05-04 20:37:51 UTC (rev
25692)
@@ -1,3 +1,4 @@
+# $Id: Makefile 25691 2016-05-04 19:36:50Z lblume $
NAME = imagemagick
VERSION = 7.0.1
GARSUBREV = 0
@@ -31,6 +32,8 @@
LICENSE = LICENSE
PATCHFILES += 0002_warn_all_does_not_work.patch
+
+# Mitigation for the CVE
PATCHFILES += 0003-CVE-2016-3714.patch
BUILD_DEP_PKGS += CSWliblcms-dev
Modified: csw/mgar/pkg/ImageMagick/trunk/files/0003-CVE-2016-3714.patch
===================================================================
--- csw/mgar/pkg/ImageMagick/trunk/files/0003-CVE-2016-3714.patch
2016-05-04 19:36:50 UTC (rev 25691)
+++ csw/mgar/pkg/ImageMagick/trunk/files/0003-CVE-2016-3714.patch
2016-05-04 20:37:51 UTC (rev 25692)
@@ -1,5 +1,3 @@
-diff --git a/config/policy.xml b/config/policy.xml
-index b4ee2d2..aaf0e52 100644
--- a/config/policy.xml
+++ b/config/policy.xml
@@ -58,4 +58,12 @@
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
