Attachment 173094 Details for Bug 211405 – patch tiff to remove gif2tiff and its docs

[patch] patch tiff to remove gif2tiff and its docs

tiff.patch (text/plain), 4.43 KB, created by Mark Felder on 2016-07-29 14:38:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Felder

Created: 2016-07-29 14:38:13 UTC

Size: 4.43 KB

patch

obsolete

>Index: graphics/tiff/Makefile
>===================================================================
>--- graphics/tiff/Makefile	(revision 419257)
>+++ graphics/tiff/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	tiff
> PORTVERSION=	4.0.6
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	graphics
> MASTER_SITES=	ftp://ftp.remotesensing.org/pub/libtiff/ \
> 		http://download.osgeo.org/libtiff/
>@@ -101,6 +101,7 @@
> 
> post-patch:
> 	@${REINPLACE_CMD} "/\.po 0/d" ${WRKSRC}/man/*
>+	${RM} ${WRKSRC}/html/man/gif2tiff.1.html
> 
> pre-configure:
> 	${REINPLACE_CMD} \
>Index: graphics/tiff/files/patch-man_Makefile.in
>===================================================================
>--- graphics/tiff/files/patch-man_Makefile.in	(nonexistent)
>+++ graphics/tiff/files/patch-man_Makefile.in	(working copy)
>@@ -0,0 +1,10 @@
>+--- man/Makefile.in.orig	2016-07-29 14:27:21 UTC
>++++ man/Makefile.in
>+@@ -332,7 +332,6 @@ dist_man1_MANS = \
>+ 	bmp2tiff.1 \
>+ 	fax2ps.1 \
>+ 	fax2tiff.1 \
>+-	gif2tiff.1 \
>+ 	pal2rgb.1 \
>+ 	ppm2tiff.1 \
>+ 	ras2tiff.1 \
>
>Property changes on: graphics/tiff/files/patch-man_Makefile.in
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: graphics/tiff/files/patch-tools_Makefile.in
>===================================================================
>--- graphics/tiff/files/patch-tools_Makefile.in	(nonexistent)
>+++ graphics/tiff/files/patch-tools_Makefile.in	(working copy)
>@@ -0,0 +1,11 @@
>+--- tools/Makefile.in.orig	2015-09-12 19:48:45 UTC
>++++ tools/Makefile.in
>+@@ -114,7 +114,7 @@ POST_UNINSTALL = :
>+ build_triplet = @build@
>+ host_triplet = @host@
>+ bin_PROGRAMS = bmp2tiff$(EXEEXT) fax2ps$(EXEEXT) fax2tiff$(EXEEXT) \
>+-	gif2tiff$(EXEEXT) pal2rgb$(EXEEXT) ppm2tiff$(EXEEXT) \
>++	pal2rgb$(EXEEXT) ppm2tiff$(EXEEXT) \
>+ 	ras2tiff$(EXEEXT) raw2tiff$(EXEEXT) rgb2ycbcr$(EXEEXT) \
>+ 	thumbnail$(EXEEXT) tiff2bw$(EXEEXT) tiff2pdf$(EXEEXT) \
>+ 	tiff2ps$(EXEEXT) tiff2rgba$(EXEEXT) tiffcmp$(EXEEXT) \
>
>Property changes on: graphics/tiff/files/patch-tools_Makefile.in
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: graphics/tiff/files/patch-tools_gif2tiff.c
>===================================================================
>--- graphics/tiff/files/patch-tools_gif2tiff.c	(revision 419257)
>+++ graphics/tiff/files/patch-tools_gif2tiff.c	(nonexistent)
>@@ -1,14 +0,0 @@
>-CVE-2016-3186, patch from:
>-https://bugzilla.redhat.com/show_bug.cgi?id=1319666
>-
>---- tools/gif2tiff.c.orig	Fri Jul  1 13:11:43 2016
>-+++ tools/gif2tiff.c	Fri Jul  1 13:12:07 2016
>-@@ -349,7 +349,7 @@ readextension(void)
>-     int status = 1;
>- 
>-     (void) getc(infile);
>--    while ((count = getc(infile)) && count <= 255)
>-+    while ((count = getc(infile)) && count >= 0 && count <= 255)
>-         if (fread(buf, 1, count, infile) != (size_t) count) {
>-             fprintf(stderr, "short read from file %s (%s)\n",
>-                     filename, strerror(errno));
>
>Property changes on: graphics/tiff/files/patch-tools_gif2tiff.c
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: graphics/tiff/pkg-plist
>===================================================================
>--- graphics/tiff/pkg-plist	(revision 419257)
>+++ graphics/tiff/pkg-plist	(working copy)
>@@ -1,7 +1,6 @@
> bin/bmp2tiff
> bin/fax2ps
> bin/fax2tiff
>-bin/gif2tiff
> bin/pal2rgb
> bin/ppm2tiff
> bin/ras2tiff
>@@ -39,7 +38,6 @@
> man/man1/bmp2tiff.1.gz
> man/man1/fax2ps.1.gz
> man/man1/fax2tiff.1.gz
>-man/man1/gif2tiff.1.gz
> man/man1/pal2rgb.1.gz
> man/man1/ppm2tiff.1.gz
> man/man1/ras2tiff.1.gz
>@@ -235,7 +233,6 @@
> %%PORTDOCS%%%%DOCSDIR%%/man/bmp2tiff.1.html
> %%PORTDOCS%%%%DOCSDIR%%/man/fax2ps.1.html
> %%PORTDOCS%%%%DOCSDIR%%/man/fax2tiff.1.html
>-%%PORTDOCS%%%%DOCSDIR%%/man/gif2tiff.1.html
> %%PORTDOCS%%%%DOCSDIR%%/man/index.html
> %%PORTDOCS%%%%DOCSDIR%%/man/libtiff.3tiff.html
> %%PORTDOCS%%%%DOCSDIR%%/man/pal2rgb.1.html

Flags:

koobs: maintainer-approval-

Actions: View | Diff

Attachments on bug 211405: 173094