svn commit: r382356 - in head/graphics: tiff tiffgt

[Antoine Brodin]

Author: antoine
Date: Thu Mar 26 23:32:19 2015
New Revision: 382356
URL: https://svnweb.freebsd.org/changeset/ports/382356
QAT: https://qat.redports.org/buildarchive/r382356/

Log:
  - Update to 4.0.4beta
  - Add CPE information
  
  PR:		198862
  MFH:		2015Q1
  Security:	CVE-2014-8127 CVE-2014-8128 CVE-2014-8129 CVE-2014-8130 CVE-2014-9655 CVE-2015-1547

Modified:
  head/graphics/tiff/Makefile
  head/graphics/tiff/distinfo
  head/graphics/tiff/pkg-plist
  head/graphics/tiffgt/Makefile
  head/graphics/tiffgt/distinfo

Modified: head/graphics/tiff/Makefile
==============================================================================
--- head/graphics/tiff/Makefile	Thu Mar 26 23:30:51 2015	(r382355)
+++ head/graphics/tiff/Makefile	Thu Mar 26 23:32:19 2015	(r382356)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	tiff
-PORTVERSION=	4.0.3
-PORTREVISION=	5
+DISTVERSION=	4.0.4beta
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.remotesensing.org/pub/libtiff/ \
 		http://download.osgeo.org/libtiff/
@@ -17,7 +16,10 @@ LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libjbig.so:${PORTSDIR}/graphics/jbigkit
 
-USES=		libtool
+USES=		cpe libtool
+CPE_PRODUCT=	libtiff
+CPE_VERSION=	${DISTVERSION:C/[a-z]+//}
+CPE_UPDATE=	${DISTVERSION:C/[0-9.]+//}
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-jpeg-include-dir=${LOCALBASE}/include \

Modified: head/graphics/tiff/distinfo
==============================================================================
--- head/graphics/tiff/distinfo	Thu Mar 26 23:30:51 2015	(r382355)
+++ head/graphics/tiff/distinfo	Thu Mar 26 23:32:19 2015	(r382356)
@@ -1,2 +1,2 @@
-SHA256 (tiff-4.0.3.tar.gz) = ea1aebe282319537fb2d4d7805f478dd4e0e05c33d0928baba76a7c963684872
-SIZE (tiff-4.0.3.tar.gz) = 2051630
+SHA256 (tiff-4.0.4beta.tar.gz) = 5bd6c8e9be4ec318f6beb0c3f28b9ee31bd8b615195a00e0acc3eb5d08b26c1b
+SIZE (tiff-4.0.4beta.tar.gz) = 2098962

Modified: head/graphics/tiff/pkg-plist
==============================================================================
--- head/graphics/tiff/pkg-plist	Thu Mar 26 23:30:51 2015	(r382355)
+++ head/graphics/tiff/pkg-plist	Thu Mar 26 23:32:19 2015	(r382356)
@@ -30,11 +30,11 @@ lib/libtiff.a
 lib/libtiff.so
 lib/libtiff.so.4
 lib/libtiff.so.5
-lib/libtiff.so.5.2.0
+lib/libtiff.so.5.2.1
 lib/libtiffxx.a
 lib/libtiffxx.so
 lib/libtiffxx.so.5
-lib/libtiffxx.so.5.2.0
+lib/libtiffxx.so.5.2.1
 libdata/pkgconfig/libtiff-4.pc
 man/man1/bmp2tiff.1.gz
 man/man1/fax2ps.1.gz
@@ -301,3 +301,5 @@ man/man3/libtiff.3tiff.gz
 %%PORTDOCS%%%%DOCSDIR%%/v4.0.0.html
 %%PORTDOCS%%%%DOCSDIR%%/v4.0.1.html
 %%PORTDOCS%%%%DOCSDIR%%/v4.0.2.html
+%%PORTDOCS%%%%DOCSDIR%%/v4.0.3.html
+%%PORTDOCS%%%%DOCSDIR%%/v4.0.4beta.html

Modified: head/graphics/tiffgt/Makefile
==============================================================================
--- head/graphics/tiffgt/Makefile	Thu Mar 26 23:30:51 2015	(r382355)
+++ head/graphics/tiffgt/Makefile	Thu Mar 26 23:32:19 2015	(r382356)
@@ -1,12 +1,11 @@
 # $FreeBSD$
 
 PORTNAME=	tiffgt
-PORTVERSION=	4.0.3
-PORTREVISION=	3
+DISTVERSION=	4.0.4beta
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.remotesensing.org/pub/libtiff/ \
 		http://download.osgeo.org/libtiff/
-DISTNAME=	tiff-${PORTVERSION}
+DISTNAME=	tiff-${DISTVERSION}
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	X11 Tools for working with TIFF images
@@ -18,7 +17,10 @@ LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/grap
 		libjbig.so:${PORTSDIR}/graphics/jbigkit \
 		libtiff.so:${PORTSDIR}/${PKGCATEGORY}/tiff
 
-USES=		libtool
+USES=		cpe libtool
+CPE_PRODUCT=	libtiff
+CPE_VERSION=	${DISTVERSION:C/[a-z]+//}
+CPE_UPDATE=	${DISTVERSION:C/[0-9.]+//}
 USE_XORG=	sm ice xmu xi x11
 USE_GL=		glut glu gl
 USE_LDCONFIG=	yes

Modified: head/graphics/tiffgt/distinfo
==============================================================================
--- head/graphics/tiffgt/distinfo	Thu Mar 26 23:30:51 2015	(r382355)
+++ head/graphics/tiffgt/distinfo	Thu Mar 26 23:32:19 2015	(r382356)
@@ -1,2 +1,2 @@
-SHA256 (tiff-4.0.3.tar.gz) = ea1aebe282319537fb2d4d7805f478dd4e0e05c33d0928baba76a7c963684872
-SIZE (tiff-4.0.3.tar.gz) = 2051630
+SHA256 (tiff-4.0.4beta.tar.gz) = 5bd6c8e9be4ec318f6beb0c3f28b9ee31bd8b615195a00e0acc3eb5d08b26c1b
+SIZE (tiff-4.0.4beta.tar.gz) = 2098962