Attachment 178879 Details for Bug 216061 – patch

[patch] patch

mupdf-1.10a_1,1.diff (text/plain), 7.33 KB, created by Zsolt Udvari on 2017-01-14 10:53:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Zsolt Udvari

Created: 2017-01-14 10:53:45 UTC

Size: 7.33 KB

patch

obsolete

>diff -urN ./Makefile /usr/local/poudriere/ports/default/graphics/mupdf/Makefile
>--- ./Makefile	2017-01-13 20:28:15.698726000 +0100
>+++ /usr/local/poudriere/ports/default/graphics/mupdf/Makefile	2017-01-13 19:16:02.133763000 +0100
>@@ -1,8 +1,8 @@
> # Created by: Martin Dieringer <martin.dieringer@gmx.de>
>-# $FreeBSD$
>+# $FreeBSD: head/graphics/mupdf/Makefile 423807 2016-10-12 00:11:07Z feld $
> 
> PORTNAME=	mupdf
>-PORTVERSION=	1.9a
>+PORTVERSION=	1.10a
> PORTREVISION=	1
> DISTVERSIONSUFFIX=	-source
> PORTEPOCH=	1
>diff -urN ./distinfo /usr/local/poudriere/ports/default/graphics/mupdf/distinfo
>--- ./distinfo	2017-01-13 20:28:15.698800000 +0100
>+++ /usr/local/poudriere/ports/default/graphics/mupdf/distinfo	2017-01-13 19:16:04.641879000 +0100
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1466328793
>-SHA256 (mupdf-1.9a-source.tar.gz) = 8015c55f4e6dd892d3c50db4f395c1e46660a10b460e2ecd180a497f55bbc4cc
>-SIZE (mupdf-1.9a-source.tar.gz) = 20493793
>+TIMESTAMP = 1484331364
>+SHA256 (mupdf-1.10a-source.tar.gz) = aacc1f36b9180f562022ef1ab3439b009369d944364f3cff8a2a898834e3a836
>+SIZE (mupdf-1.10a-source.tar.gz) = 42264707
>diff -urN ./files/patch-scripts_fontdump.c /usr/local/poudriere/ports/default/graphics/mupdf/files/patch-scripts_fontdump.c
>--- ./files/patch-scripts_fontdump.c	2017-01-13 20:28:15.698926000 +0100
>+++ /usr/local/poudriere/ports/default/graphics/mupdf/files/patch-scripts_fontdump.c	2017-01-13 19:20:26.676363000 +0100
>@@ -1,4 +1,4 @@
>---- scripts/fontdump.c.orig	2016-04-21 11:14:32 UTC
>+--- scripts/fontdump.c.orig	2016-11-28 13:34:04 UTC
> +++ scripts/fontdump.c
> @@ -50,7 +50,6 @@ main(int argc, char **argv)
>  	fprintf(fo, "#ifndef __STRICT_ANSI__\n");
>diff -urN ./files/patch-source__fitz__load-jpx.c /usr/local/poudriere/ports/default/graphics/mupdf/files/patch-source__fitz__load-jpx.c
>--- ./files/patch-source__fitz__load-jpx.c	2017-01-13 20:28:15.699028000 +0100
>+++ /usr/local/poudriere/ports/default/graphics/mupdf/files/patch-source__fitz__load-jpx.c	2017-01-13 19:20:26.680253000 +0100
>@@ -1,7 +1,8 @@
>---- source/fitz/load-jpx.c.orig	2016-04-21 11:14:32 UTC
>+--- source/fitz/load-jpx.c.orig	2016-11-28 13:34:04 UTC
> +++ source/fitz/load-jpx.c
>-@@ -1,14 +1,6 @@
>- #include "mupdf/fitz.h"
>+@@ -481,15 +481,7 @@ fz_load_jpx_info(fz_context *ctx, unsign
>+ 
>+ #else /* HAVE_LURATECH */
>  
> -/* Without the definition of OPJ_STATIC, compilation fails on windows
> - * due to the use of __stdcall. We believe it is required on some
>@@ -14,14 +15,5 @@
> -#include <openjpeg.h>
> +#include <openjpeg-2.1/openjpeg.h>
>  
>- static void fz_opj_error_callback(const char *msg, void *client_data)
>- {
>-@@ -117,7 +109,7 @@ fz_load_jpx(fz_context *ctx, unsigned ch
>- 	opj_stream_set_read_function(stream, fz_opj_stream_read);
>- 	opj_stream_set_skip_function(stream, fz_opj_stream_skip);
>- 	opj_stream_set_seek_function(stream, fz_opj_stream_seek);
>--	opj_stream_set_user_data(stream, &sb);
>-+	opj_stream_set_user_data(stream, &sb,NULL);
>- 	/* Set the length to avoid an assert */
>- 	opj_stream_set_user_data_length(stream, size);
>- 
>+ /* OpenJPEG does not provide a safe mechanism to intercept
>+  * allocations. In the latest version all allocations go
>diff -urN ./files/patch-source_pdf_pdf-shade.c /usr/local/poudriere/ports/default/graphics/mupdf/files/patch-source_pdf_pdf-shade.c
>--- ./files/patch-source_pdf_pdf-shade.c	2017-01-13 20:28:15.699102000 +0100
>+++ /usr/local/poudriere/ports/default/graphics/mupdf/files/patch-source_pdf_pdf-shade.c	1970-01-01 01:00:00.000000000 +0100
>@@ -1,17 +0,0 @@
>-$OpenBSD: patch-source_pdf_pdf-shade_c,v 1.1 2016/08/27 20:58:48 jca Exp $
>-
>-  CVE-2016-6525
>-
>-  http://git.ghostscript.com/?p=mupdf.git;a=commitdiff;h=39b0f07dd960f34e7e6bf230ffc3d87c41ef0f2e;hp=fa1936405b6a84e5c9bb440912c23d532772f958
>-
>---- source/pdf/pdf-shade.c.orig	2016-04-21 11:14:32 UTC
>-+++ source/pdf/pdf-shade.c
>-@@ -206,7 +206,7 @@ pdf_load_mesh_params(fz_context *ctx, pd
>- 	obj = pdf_dict_get(ctx, dict, PDF_NAME_Decode);
>- 	if (pdf_array_len(ctx, obj) >= 6)
>- 	{
>--		n = (pdf_array_len(ctx, obj) - 4) / 2;
>-+		n = fz_mini(FZ_MAX_COLORS, (pdf_array_len(ctx, obj) - 4) / 2);
>- 		shade->u.m.x0 = pdf_to_real(ctx, pdf_array_get(ctx, obj, 0));
>- 		shade->u.m.x1 = pdf_to_real(ctx, pdf_array_get(ctx, obj, 1));
>- 		shade->u.m.y0 = pdf_to_real(ctx, pdf_array_get(ctx, obj, 2));
>diff -urN ./files/patch-source_pdf_pdf-xref.c /usr/local/poudriere/ports/default/graphics/mupdf/files/patch-source_pdf_pdf-xref.c
>--- ./files/patch-source_pdf_pdf-xref.c	2017-01-13 20:28:15.699175000 +0100
>+++ /usr/local/poudriere/ports/default/graphics/mupdf/files/patch-source_pdf_pdf-xref.c	1970-01-01 01:00:00.000000000 +0100
>@@ -1,25 +0,0 @@
>-$OpenBSD: patch-source_pdf_pdf-xref_c,v 1.1 2016/08/27 20:58:48 jca Exp $
>-
>-  CVE-2016-6265
>-
>-  http://git.ghostscript.com/?p=mupdf.git;a=commitdiff;h=fa1936405b6a84e5c9bb440912c23d532772f958
>-
>---- source/pdf/pdf-xref.c.orig	2016-04-21 11:14:32 UTC
>-+++ source/pdf/pdf-xref.c
>-@@ -1191,8 +1191,14 @@ pdf_load_xref(fz_context *ctx, pdf_docum
>- 				fz_throw(ctx, FZ_ERROR_GENERIC, "object offset out of range: %d (%d 0 R)", (int)entry->ofs, i);
>- 		}
>- 		if (entry->type == 'o')
>--			if (entry->ofs <= 0 || entry->ofs >= xref_len || pdf_get_xref_entry(ctx, doc, entry->ofs)->type != 'n')
>--				fz_throw(ctx, FZ_ERROR_GENERIC, "invalid reference to an objstm that does not exist: %d (%d 0 R)", (int)entry->ofs, i);
>-+		{
>-+			/* Read this into a local variable here, because pdf_get_xref_entry
>-+			 * may solidify the xref, hence invalidating "entry", meaning we
>-+			 * need a stashed value for the throw. */
>-+			fz_off_t ofs = entry->ofs;
>-+			if (ofs <= 0 || ofs >= xref_len || pdf_get_xref_entry(ctx, doc, ofs)->type != 'n')
>-+				fz_throw(ctx, FZ_ERROR_GENERIC, "invalid reference to an objstm that does not exist: %d (%d 0 R)", (int)ofs, i);
>-+		}
>- 	}
>- }
>- 
>diff -urN ./pkg-plist /usr/local/poudriere/ports/default/graphics/mupdf/pkg-plist
>--- ./pkg-plist	2017-01-13 20:28:15.699410000 +0100
>+++ /usr/local/poudriere/ports/default/graphics/mupdf/pkg-plist	2017-01-13 19:37:23.559209000 +0100
>@@ -2,14 +2,17 @@
> bin/mupdf
> bin/mupdf-gl
> bin/mupdf-x11-curl
>+bin/muraster
> bin/mutool
> include/mupdf/fitz.h
> include/mupdf/fitz/annotation.h
>+include/mupdf/fitz/archive.h
> include/mupdf/fitz/bidi.h
> include/mupdf/fitz/bitmap.h
> include/mupdf/fitz/buffer.h
> include/mupdf/fitz/colorspace.h
> include/mupdf/fitz/compressed-buffer.h
>+include/mupdf/fitz/config.h
> include/mupdf/fitz/context.h
> include/mupdf/fitz/crypt.h
> include/mupdf/fitz/device.h
>@@ -45,12 +48,13 @@
> include/mupdf/fitz/structured-text.h
> include/mupdf/fitz/system.h
> include/mupdf/fitz/text.h
>+include/mupdf/fitz/track-usage.h
> include/mupdf/fitz/transition.h
> include/mupdf/fitz/tree.h
> include/mupdf/fitz/ucdn.h
>-include/mupdf/fitz/unzip.h
> include/mupdf/fitz/util.h
> include/mupdf/fitz/version.h
>+include/mupdf/fitz/writer.h
> include/mupdf/fitz/xml.h
> include/mupdf/html.h
> include/mupdf/memento.h
>@@ -65,7 +69,6 @@
> include/mupdf/pdf/event.h
> include/mupdf/pdf/field.h
> include/mupdf/pdf/font.h
>-include/mupdf/pdf/graft.h
> include/mupdf/pdf/interpret.h
> include/mupdf/pdf/javascript.h
> include/mupdf/pdf/name-table.h
>@@ -76,7 +79,7 @@
> include/mupdf/pdf/resource.h
> include/mupdf/pdf/widget.h
> include/mupdf/pdf/xref.h
>-include/mupdf/xps.h
>+include/mupdf/svg.h
> lib/libmupdf.a
> lib/libmupdfthird.a
> lib/libmupdfthird_pic.a
>@@ -91,3 +94,4 @@
> %%PORTDOCS%%%%DOCSDIR%%/progressive.txt
> %%PORTDOCS%%%%DOCSDIR%%/refcount.txt
> %%PORTDOCS%%%%DOCSDIR%%/thirdparty.txt
>+%%PORTDOCS%%%%DOCSDIR%%/types.txt

Flags:

uzsolt: maintainer-approval+

Actions: View | Diff

Attachments on bug 216061: 178879