From owner-svn-ports-all@FreeBSD.ORG Sat May 24 17:40:04 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7077E92; Sat, 24 May 2014 17:40:04 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5CFA82DC6; Sat, 24 May 2014 17:40:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4OHe4LD012676; Sat, 24 May 2014 17:40:04 GMT (envelope-from kwm@svn.freebsd.org) Received: (from kwm@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4OHe3ZA012666; Sat, 24 May 2014 17:40:03 GMT (envelope-from kwm@svn.freebsd.org) Message-Id: <201405241740.s4OHe3ZA012666@svn.freebsd.org> From: Koop Mast Date: Sat, 24 May 2014 17:40:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r355064 - in branches/2014Q2/graphics/openjpeg: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 May 2014 17:40:04 -0000 Author: kwm Date: Sat May 24 17:40:03 2014 New Revision: 355064 URL: http://svnweb.freebsd.org/changeset/ports/355064 QAT: https://qat.redports.org/buildarchive/r355064/ Log: MFH: r355041 Update to 1.5.2. Fixes a number of vulnabilies. Security: 02db20d7-e34a-11e3-bd92-bcaec565249c Approved by: portmgr (miwi@) Deleted: branches/2014Q2/graphics/openjpeg/files/patch-CMake_OpenJPEGConfig.cmake.in branches/2014Q2/graphics/openjpeg/files/patch-libopenjpeg-CMakeLists.txt branches/2014Q2/graphics/openjpeg/files/patch-libopenjpeg1.pc.cmake branches/2014Q2/graphics/openjpeg/files/patch-opj_malloc.h Modified: branches/2014Q2/graphics/openjpeg/Makefile branches/2014Q2/graphics/openjpeg/distinfo branches/2014Q2/graphics/openjpeg/files/patch-CMakeLists.txt branches/2014Q2/graphics/openjpeg/pkg-plist Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/graphics/openjpeg/Makefile ============================================================================== --- branches/2014Q2/graphics/openjpeg/Makefile Sat May 24 17:39:36 2014 (r355063) +++ branches/2014Q2/graphics/openjpeg/Makefile Sat May 24 17:40:03 2014 (r355064) @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= openjpeg -PORTVERSION= 1.5.0 -PORTREVISION= 2 +PORTVERSION= 1.5.2 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} +MASTER_SITES= SF/openjpeg.mirror/${PORTVERSION}/ MAINTAINER= ports@FreeBSD.org COMMENT= Open-source JPEG 2000 codec Modified: branches/2014Q2/graphics/openjpeg/distinfo ============================================================================== --- branches/2014Q2/graphics/openjpeg/distinfo Sat May 24 17:39:36 2014 (r355063) +++ branches/2014Q2/graphics/openjpeg/distinfo Sat May 24 17:40:03 2014 (r355064) @@ -1,2 +1,2 @@ -SHA256 (openjpeg-1.5.0.tar.gz) = c9908fab44432a2ed2550c457cb7e736da6d7c326f1203d23d1082d992364ace -SIZE (openjpeg-1.5.0.tar.gz) = 2117572 +SHA256 (openjpeg-1.5.2.tar.gz) = 15df7b194a5d8dba0052cd21c17a4dc761149a770a907d73fffb972078c28a87 +SIZE (openjpeg-1.5.2.tar.gz) = 1385702 Modified: branches/2014Q2/graphics/openjpeg/files/patch-CMakeLists.txt ============================================================================== --- branches/2014Q2/graphics/openjpeg/files/patch-CMakeLists.txt Sat May 24 17:39:36 2014 (r355063) +++ branches/2014Q2/graphics/openjpeg/files/patch-CMakeLists.txt Sat May 24 17:40:03 2014 (r355064) @@ -1,15 +1,15 @@ ---- CMakeLists.txt.orig 2012-02-07 11:49:55.000000000 +0100 -+++ CMakeLists.txt 2012-06-03 14:26:55.000000000 +0200 -@@ -36,7 +36,7 @@ - "${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}.${OPENJPEG_VERSION_BUILD}") +--- CMakeLists.txt.orig 2014-03-27 11:58:08.000000000 +0100 ++++ CMakeLists.txt 2014-05-24 11:24:37.000000000 +0200 +@@ -54,7 +54,7 @@ + endif(NOT OPENJPEG_SOVERSION) SET(OPENJPEG_LIBRARY_PROPERTIES VERSION "${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}.${OPENJPEG_VERSION_BUILD}" -- SOVERSION "${OPENJPEG_VERSION_MAJOR}" -+ SOVERSION "2" +- SOVERSION "${OPENJPEG_SOVERSION}" ++ SOVERSION 2 ) # -------------------------------------------------------------------------- -@@ -76,7 +76,7 @@ +@@ -94,7 +94,7 @@ # Install directories STRING(TOLOWER ${PROJECT_NAME} projectname) @@ -18,7 +18,12 @@ IF(NOT OPENJPEG_INSTALL_BIN_DIR) SET(OPENJPEG_INSTALL_BIN_DIR "bin") -@@ -99,7 +99,7 @@ +@@ -125,11 +125,11 @@ + ENDIF(NOT OPENJPEG_INSTALL_DATA_DIR) + + IF(NOT OPENJPEG_INSTALL_INCLUDE_DIR) +- SET(OPENJPEG_INSTALL_INCLUDE_DIR "include/${OPENJPEG_INSTALL_SUBDIR}") ++ SET(OPENJPEG_INSTALL_INCLUDE_DIR "include/") ENDIF(NOT OPENJPEG_INSTALL_INCLUDE_DIR) IF(NOT OPENJPEG_INSTALL_MAN_DIR) @@ -27,16 +32,29 @@ ENDIF(NOT OPENJPEG_INSTALL_MAN_DIR) IF(NOT OPENJPEG_INSTALL_DOC_DIR) -@@ -146,7 +146,7 @@ +@@ -148,7 +148,7 @@ + # We could install *.cmake files in share/ however those files contains + # hardcoded path to libraries on a multi-arch system (fedora/debian) those + # path will be different (lib/i386-linux-gnu vs lib/x86_64-linux-gnu) +- SET(OPENJPEG_INSTALL_PACKAGE_DIR "${OPENJPEG_INSTALL_LIB_DIR}/${OPENJPEG_INSTALL_SUBDIR}") ++ SET(OPENJPEG_INSTALL_PACKAGE_DIR "${OPENJPEG_INSTALL_SHARE_DIR}/${OPENJPEG_INSTALL_SUBDIR}") + ENDIF(NOT OPENJPEG_INSTALL_PACKAGE_DIR) + + #----------------------------------------------------------------------------- +@@ -188,10 +188,10 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libopenjpeg1.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libopenjpeg1.pc @ONLY) INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjpeg1.pc DESTINATION -- ${OPENJPEG_INSTALL_SHARE_DIR}/pkgconfig ) +- ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig ) + libdata/pkgconfig ) INSTALL( CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libopenjpeg1.pc\" - \"\$ENV{DESTDIR}${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig/libopenjpeg.pc\")") -@@ -244,6 +241,7 @@ ENDIF(BUILD_TESTING) +- \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_SHARE_DIR}/pkgconfig/libopenjpeg.pc\")") ++ \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig/libopenjpeg.pc\")") + ENDIF(UNIX) + + #----------------------------------------------------------------------------- +@@ -288,6 +288,7 @@ #----------------------------------------------------------------------------- # install all targets referenced as OPENJPEGTargets INSTALL(EXPORT OpenJPEGTargets DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR}) Modified: branches/2014Q2/graphics/openjpeg/pkg-plist ============================================================================== --- branches/2014Q2/graphics/openjpeg/pkg-plist Sat May 24 17:39:36 2014 (r355063) +++ branches/2014Q2/graphics/openjpeg/pkg-plist Sat May 24 17:40:03 2014 (r355064) @@ -3,7 +3,7 @@ bin/j2k_dump bin/j2k_to_image include/openjpeg.h lib/libopenjpeg.so -lib/libopenjpeg.so.1.5.0 +lib/libopenjpeg.so.1.5.2 lib/libopenjpeg.so.2 man/man1/image_to_j2k.1.gz man/man1/j2k_dump.1.gz @@ -14,6 +14,7 @@ man/man3/libopenjpeg.3.gz %%DATADIR%%/OpenJPEGConfig.cmake %%DATADIR%%/OpenJPEGTargets-%%CMAKE_BUILD_TYPE%%.cmake %%DATADIR%%/OpenJPEGTargets.cmake +libdata/pkgconfig/libopenjpeg.pc libdata/pkgconfig/libopenjpeg1.pc @dirrm %%DATADIR%% @dirrm %%DOCSDIR%%