Pullup ticket #5459 - requested by sevan

graphics/graphite2: security update

Revisions pulled up:
- graphics/graphite2/Makefile                                   1.6
- graphics/graphite2/distinfo                                   1.8
- graphics/graphite2/patches/patch-src_CMakeLists.txt           deleted

-------------------------------------------------------------------
   Module Name:    pkgsrc
   Committed By:   he
   Date:           Mon May 22 08:00:06 UTC 2017

   Modified Files:
           pkgsrc/graphics/graphite2: Makefile distinfo
   Removed Files:
           pkgsrc/graphics/graphite2/patches: patch-src_CMakeLists.txt

   Log Message:
   Update to graphite2 version 1.3.10, for some "highly recommended"
   bug fixes, possibly some security fixes, although they are not
   explicitly mentioned in the change log.

   Pkgsrc changes:
    * Remove patch which no longer applies.

   Upstream changes:

   1.3.10
    . Address floating point build parameters to give consistent positioning
      results across platforms
    . Various bug fixes

   1.3.9
    . Add Collision COLL_ISSPACE to allow for visible spaces in collision
      avoidance
    . Add segment and pass direction information to tracing output
    . Bug fix rule length testing in 32-bit
    . Increase slanted margin distances for collision avoidance
    . Change kerning algorithm to simple outline expansion.
      Seems to make no visible difference.
    . Add trace2svg to test tools

   1.3.8
    . Various bug fixes arising from fuzzing
    . Fix regression that stopped piglatin from working
    . Make collision avoidance kerning give more regular results
    . Minor modification to clustering algorithm to handle variable width chars


   To generate a diff of this commit:
   cvs rdiff -u -r1.5 -r1.6 pkgsrc/graphics/graphite2/Makefile
   cvs rdiff -u -r1.7 -r1.8 pkgsrc/graphics/graphite2/distinfo
   cvs rdiff -u -r1.4 -r0 \
       pkgsrc/graphics/graphite2/patches/patch-src_CMakeLists.txt

3 files changed, 7 insertions, 53 deletions

diff --git a/graphics/graphite2/Makefile b/graphics/graphite2/Makefile
index 134bbd35dc3..f169d4f1c28 100644
--- a/graphics/graphite2/Makefile
+++ b/graphics/graphite2/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2016/09/08 17:32:49 richard Exp $
+# $NetBSD: Makefile,v 1.5.6.1 2017/05/28 08:31:18 spz Exp $
 
-DISTNAME=	graphite2-1.3.7
+DISTNAME=	graphite2-1.3.10
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=silgraphite/}
 EXTRACT_SUFX=	.tgz
diff --git a/graphics/graphite2/distinfo b/graphics/graphite2/distinfo
index 4e7303630e4..67b126d91e9 100644
--- a/graphics/graphite2/distinfo
+++ b/graphics/graphite2/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.7 2016/03/24 20:31:02 wiz Exp $
+$NetBSD: distinfo,v 1.7.10.1 2017/05/28 08:31:18 spz Exp $
 
-SHA1 (graphite2-1.3.7.tgz) = 83fde60cca7ce82d3b90b335a6e6ea719d15ffec
-RMD160 (graphite2-1.3.7.tgz) = a4fe7f52d67e126c20678863309aaf2b85a7ddf7
-SHA512 (graphite2-1.3.7.tgz) = 163ac1455003398690b173f2ce56509bba1ae1e480585635888e3b061fef1ff8493c86f4647efde65ea10cd82b4048fcc8e882ea56811a8169956ad27bd10b8f
-Size (graphite2-1.3.7.tgz) = 3883666 bytes
-SHA1 (patch-src_CMakeLists.txt) = 4751d4cb699a368b9b612a18c45176346e29968b
+SHA1 (graphite2-1.3.10.tgz) = 668f3bce96fc02d90ea875b401ed36b2e8957d2f
+RMD160 (graphite2-1.3.10.tgz) = 9c3ed660f18d4b86553f54e23ba746ee9cb51835
+SHA512 (graphite2-1.3.10.tgz) = d6d578feaa2d9304dc9bcd3926958070b8c23b27437a9fcb801e08e62f33a5549b7a6aa9636c7f8eb80a2a2c6d5cac97d58050fb30fd102b9fd0f8c558f4252b
+Size (graphite2-1.3.10.tgz) = 3889647 bytes
diff --git a/graphics/graphite2/patches/patch-src_CMakeLists.txt b/graphics/graphite2/patches/patch-src_CMakeLists.txt
deleted file mode 100644
index 1ce6df21856..00000000000
--- a/graphics/graphite2/patches/patch-src_CMakeLists.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD: patch-src_CMakeLists.txt,v 1.4 2016/02/07 01:05:11 ryoon Exp $
-
-Don't pass -nodefaultlibs to compiler or the build fails for missing
-symbols on PowerPC and possibly other platforms. I can't see any
-reason why they do this at all.
-
-The problem is already reported to the upstream:
-http://sourceforge.net/p/silgraphite/bugs/56/
-
---- src/CMakeLists.txt.orig	2016-01-15 04:17:18.000000000 +0000
-+++ src/CMakeLists.txt
-@@ -109,7 +109,7 @@ set_target_properties(graphite2 PROPERTI
- if  (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-     set_target_properties(graphite2 PROPERTIES 
-         COMPILE_FLAGS   "-Wall -Wextra -Wno-unknown-pragmas -Wendif-labels -Wshadow -Wctor-dtor-privacy -Wnon-virtual-dtor -fno-rtti -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden -fno-stack-protector"
--        LINK_FLAGS      "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}" 
-+        LINK_FLAGS      "${GRAPHITE_LINK_FLAGS}" 
-         LINKER_LANGUAGE C)
-     if (CMAKE_COMPILER_IS_GNUCXX)
-         add_definitions(-Wdouble-promotion)
-@@ -126,23 +126,17 @@ if  (${CMAKE_SYSTEM_NAME} STREQUAL "Linu
-         else (GRAPHITE2_ASAN)
-             target_link_libraries(graphite2 c gcc)
-         endif (GRAPHITE2_ASAN)
--        include(Graphite)
--        nolib_test(stdc++ $<TARGET_SONAME_FILE:graphite2>)
-     endif (${CMAKE_CXX_COMPILER} MATCHES  ".*mingw.*")
-     set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "")
--    CREATE_LIBTOOL_FILE(graphite2 "/lib${LIB_SUFFIX}")
- endif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
- 
- if  (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
-     set_target_properties(graphite2 PROPERTIES 
-         COMPILE_FLAGS   "-Wall -Wextra -Wno-unknown-pragmas -Wimplicit-fallthrough -Wendif-labels -Wshadow -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor -fno-rtti -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden -fno-stack-protector"
--        LINK_FLAGS      "-nodefaultlibs" 
-+        LINK_FLAGS      "${GRAPHITE_LINK_FLAGS}" 
-         LINKER_LANGUAGE C)
-     target_link_libraries(graphite2 c)
--    include(Graphite)
--    nolib_test(stdc++ $<TARGET_SONAME_FILE:graphite2>)
-     set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "")
--    CREATE_LIBTOOL_FILE(graphite2 "/lib${LIB_SUFFIX}")
- endif (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
- 
- if  (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")