Pullup ticket #4940 - requested by sevan

graphics/graphite2: security fix

Revisions pulled up:
- graphics/graphite2/Makefile                                   1.3
- graphics/graphite2/PLIST                                      1.3
- graphics/graphite2/distinfo                                   1.5
- graphics/graphite2/patches/patch-Graphite.cmake               deleted
- graphics/graphite2/patches/patch-src_CMakeLists.txt           1.3

---
   Module Name:    pkgsrc
   Committed By:   wiz
   Date:           Tue Jan 26 13:56:23 UTC 2016

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

   Log Message:
   Update graphite2 to 1.3.5. Updated provided by coypu on pkgsrc-users.

   1.3.5
       . Bug fixes
           . Security bug fix
           . Fix ARM misalignment problem
           . Track latest cmake

   1.3.4
       . Transition from Mercurial to Git
       . Bug fixes
           . Fix Collision Kerning ignoring some diacritics
           . Handle pass bits 16-31 to speed up fonts with > 16 passes
           . Various minor fuzz bug fixes
           . Make Coverity happy
           . Add GR_FALLTHROUGH macro for clang c++11

   1.3.3
       . Slight speed up in Collision Avoidance
       . Remove dead bidi code
       . Bug fixes
           . Between pass bidi reorderings and at the end
           . Decompressor fuzz bugs
           . Other fuzz bugs

   1.3.2
       . Remove full bidi. All segments are assumed to be single directioned.
       . Bug fixes:
           . Decompressor corner cases
           . Various fuzz bugs

   1.3.1
       . Deprecation warning: Full bidi support is about to be deprecated. Make contact
         if this impacts you.
       . Change compression block format slightly to conform to LZ4
       . Bug fixes:
           . Handle mono direction text with diacritics consistently. Fonts
             now see the direction they expect consistently and bidi now
             gives expected results.
           . Fixed lots of fuzz bugs
           . Coverity cleanups
           . Build now works for clang and/or asan and/or afl etc.

   1.3.0
       . Add collision avoidance
           . Shift Collider
           . Kern Collider
           . Octabox outlines and subboxes
       . Add compressed Silf and Glat table support
       . Bug fixes:
           . Stop loops forming in the child, sibling tree
           . Handle bidi mirroring correctly if no bidi occurring

5 files changed, 19 insertions, 41 deletions

diff --git a/graphics/graphite2/Makefile b/graphics/graphite2/Makefile
index 9518077c3ac..fb763978b61 100644
--- a/graphics/graphite2/Makefile
+++ b/graphics/graphite2/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2014/05/16 01:21:12 pho Exp $
+# $NetBSD: Makefile,v 1.2.14.1 2016/02/29 10:14:38 bsiegert Exp $
 
-DISTNAME=	graphite2-1.2.4
+DISTNAME=	graphite2-1.3.5
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=silgraphite/}
 EXTRACT_SUFX=	.tgz
diff --git a/graphics/graphite2/PLIST b/graphics/graphite2/PLIST
index a2c250ccb0d..4a90f9a2e5f 100644
--- a/graphics/graphite2/PLIST
+++ b/graphics/graphite2/PLIST
@@ -1,10 +1,12 @@
-@comment $NetBSD: PLIST,v 1.2 2014/05/16 01:21:12 pho Exp $
+@comment $NetBSD: PLIST,v 1.2.14.1 2016/02/29 10:14:38 bsiegert Exp $
 bin/gr2fonttest
 include/graphite2/Font.h
 include/graphite2/Log.h
 include/graphite2/Segment.h
 include/graphite2/Types.h
-lib/libgraphite2.la
+lib/libgraphite2.so
+lib/libgraphite2.so.3
+lib/libgraphite2.so.3.0.1
 lib/pkgconfig/graphite2.pc
 share/graphite2/graphite2-release.cmake
 share/graphite2/graphite2.cmake
diff --git a/graphics/graphite2/distinfo b/graphics/graphite2/distinfo
index ed8c7060804..a637ba9dee6 100644
--- a/graphics/graphite2/distinfo
+++ b/graphics/graphite2/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.4 2015/11/03 21:34:02 agc Exp $
+$NetBSD: distinfo,v 1.4.2.1 2016/02/29 10:14:38 bsiegert Exp $
 
-SHA1 (graphite2-1.2.4.tgz) = 5b3a907fee3ce0c6efcc2b31d0d98939ec031b7d
-RMD160 (graphite2-1.2.4.tgz) = a4adc89befc86a9adcab3b0dbd6caf2ac3866fb4
-SHA512 (graphite2-1.2.4.tgz) = fb4a7bfd5656233975ce339e4e155ccb4fd401b87e30440edab98739355596e41abf5dccf6487d53f6353840a7c87b8270ee33e79c6630cf13a25ac2cb2114de
-Size (graphite2-1.2.4.tgz) = 6938866 bytes
-SHA1 (patch-Graphite.cmake) = 32cab319afa56ecb5f379e4097fe9059a89d2b59
-SHA1 (patch-src_CMakeLists.txt) = 31f9f7d4751f4a95e0567120aa232dca68029d37
+SHA1 (graphite2-1.3.5.tgz) = 044f65d5b4ade3169f5fcd75a25f047c81f5d33e
+RMD160 (graphite2-1.3.5.tgz) = 49c0c9d919a23ab215402d082670083b7cfba61e
+SHA512 (graphite2-1.3.5.tgz) = 70e85ff44d63dcca6beb55aa68966888453610c4ec1fca0d0986910a8f396ad64fd0b9f393270fd403c93e7e5d45cdc134c3965f47761cd40cd659b92b8abcec
+Size (graphite2-1.3.5.tgz) = 3880214 bytes
+SHA1 (patch-src_CMakeLists.txt) = 6466c211c92374ddafe009ff9e79bfd0be986be9
diff --git a/graphics/graphite2/patches/patch-Graphite.cmake b/graphics/graphite2/patches/patch-Graphite.cmake
deleted file mode 100644
index 9604b9d0721..00000000000
--- a/graphics/graphite2/patches/patch-Graphite.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-Graphite.cmake,v 1.1 2014/05/16 01:21:12 pho Exp $
-
-CREATE_LIBTOOL_FILE: Fix incorrect library_names on Darwin
-
---- Graphite.cmake.orig	2014-05-16 01:00:36.000000000 +0000
-+++ Graphite.cmake
-@@ -46,7 +46,7 @@ FUNCTION(CREATE_LIBTOOL_FILE _target _in
-   FILE(APPEND ${_laname} "dlname='${_soname}'\n\n")
-   FILE(APPEND ${_laname} "# Names of this library.\n")
-   if (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
--    FILE(APPEND ${_laname} "library_names='${_lanamwe}.${_target_current}.${_target_revision}.${_target_age}.${_soext} ${_lanamewe}.${_target_current}.${_soext} ${_soname}'\n\n")
-+    FILE(APPEND ${_laname} "library_names='${_lanamewe}.${_target_current}.${_target_revision}.${_target_age}${_soext} ${_lanamewe}.${_target_current}${_soext} ${_soname}'\n\n")
-   else (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
-     FILE(APPEND ${_laname} "library_names='${_soname}.${_target_current}.${_target_revision}.${_target_age} ${_soname}.${_target_current} ${_soname}'\n\n")
-   endif (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
diff --git a/graphics/graphite2/patches/patch-src_CMakeLists.txt b/graphics/graphite2/patches/patch-src_CMakeLists.txt
index a4e925f63ea..b0991276f76 100644
--- a/graphics/graphite2/patches/patch-src_CMakeLists.txt
+++ b/graphics/graphite2/patches/patch-src_CMakeLists.txt
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_CMakeLists.txt,v 1.2 2014/05/16 12:51:24 wiz Exp $
+$NetBSD: patch-src_CMakeLists.txt,v 1.2.14.1 2016/02/29 10:14:38 bsiegert 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
@@ -7,18 +7,18 @@ 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	2013-11-29 06:21:26.000000000 +0000
+--- src/CMakeLists.txt.orig	2016-01-15 04:17:18.000000000 +0000
 +++ src/CMakeLists.txt
-@@ -113,7 +113,7 @@ endif (${CMAKE_BUILD_TYPE} STREQUAL "Cla
+@@ -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_CXX_COMPILER} MATCHES  ".*mingw.*")
-         target_link_libraries(graphite2 kernel32 msvcr90 mingw32 gcc user32)
-@@ -123,28 +123,27 @@ if  (${CMAKE_SYSTEM_NAME} STREQUAL "Linu
+     if (CMAKE_COMPILER_IS_GNUCXX)
+         add_definitions(-Wdouble-promotion)
+@@ -126,23 +126,19 @@ if  (${CMAKE_SYSTEM_NAME} STREQUAL "Linu
          else (GRAPHITE2_ASAN)
              target_link_libraries(graphite2 c gcc)
          endif (GRAPHITE2_ASAN)
@@ -31,7 +31,7 @@ http://sourceforge.net/p/silgraphite/bugs/56/
  
  if  (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
      set_target_properties(graphite2 PROPERTIES 
-         COMPILE_FLAGS   "-Wall -Wextra -Wno-unknown-pragmas -Wendif-labels -Wshadow -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor -fno-rtti -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden -fno-stack-protector"
+         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)
@@ -43,11 +43,3 @@ http://sourceforge.net/p/silgraphite/bugs/56/
  endif (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
  
  if  (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
-     set_target_properties(graphite2 PROPERTIES 
-         COMPILE_DEFINITIONS "_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;UNICODE;GRAPHITE2_EXPORTING")
-+else  (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
-+include(Graphite)
-+CREATE_LIBTOOL_FILE(graphite2 "/lib${LIB_SUFFIX}")
- endif (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
- 
-