Accepting request 441873 from Publishing
- Update to version 1.10 * FictionBook (FB2) e-book support. * Simple SVG parser (a small subset of SVG only). * mutool convert: a new document conversion tool and interface. * Multi-threaded rendering in mudraw. * Updated base 14 fonts from URW. * New CJK font with language specific variants. * Hyperlink support in EPUB. * Alpha channel is now optional in pixmaps. * More aggressive purging of cached objects. * Partial image decoding for lower memory use when banding. * Reduced default set of built-in CMap tables to the minimum required. * FZ_ENABLE_PDF, _XPS, _JS, to disable features at compile time. * Function level linking. * Dropped pdf object generation numbers from public interfaces. * Simplified PDF page, xobject, and annotation internals. * Closing and freeing devices and writers are now separate steps. * Improved PDF annotation editing interface (still a work in progress). * Document writer interface. * Banded image writer interface. - Drop CVE-2016-6265.patch and mupdf-fix-openjpeg2.patch, both are fixed upstream. OBS-URL: https://build.opensuse.org/request/show/441873 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mupdf?expand=0&rev=21
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
18ac9e18e6
@ -1,23 +0,0 @@
|
||||
X-Git-Url: http://git.ghostscript.com/?p=mupdf.git;a=blobdiff_plain;f=source%2Fpdf%2Fpdf-xref.c;h=32225998178b7c4d465046ff5158a3796103d73d;hp=576c315de2a30cfd553652bfa82521edb07043c2;hb=fa1936405b6a84e5c9bb440912c23d532772f958;hpb=e98091d56afdf1cf6c9a017fa0bd35dd0b8968f0
|
||||
|
||||
diff --git a/source/pdf/pdf-xref.c b/source/pdf/pdf-xref.c
|
||||
index 576c315..3222599 100644
|
||||
--- a/source/pdf/pdf-xref.c
|
||||
+++ b/source/pdf/pdf-xref.c
|
||||
@@ -1184,8 +1184,14 @@ pdf_load_xref(fz_context *ctx, pdf_document *doc, pdf_lexbuf *buf)
|
||||
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);
|
||||
+ }
|
||||
}
|
||||
}
|
||||
|
||||
3
mupdf-1.10-source.tar.gz
Normal file
3
mupdf-1.10-source.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:1185637a93055cdae8335db14fef3e0fbd2acadae94eabd2ec0111d89a04a667
|
||||
size 42265171
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:8015c55f4e6dd892d3c50db4f395c1e46660a10b460e2ecd180a497f55bbc4cc
|
||||
size 20493793
|
||||
@ -1,13 +0,0 @@
|
||||
Index: mupdf-1.5-source/source/fitz/load-jpx.c
|
||||
===================================================================
|
||||
--- mupdf-1.5-source.orig/source/fitz/load-jpx.c
|
||||
+++ mupdf-1.5-source/source/fitz/load-jpx.c
|
||||
@@ -116,7 +116,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);
|
||||
|
||||
@ -1,3 +1,29 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 24 14:56:53 UTC 2016 - idonmez@suse.com
|
||||
|
||||
- Update to version 1.10
|
||||
* FictionBook (FB2) e-book support.
|
||||
* Simple SVG parser (a small subset of SVG only).
|
||||
* mutool convert: a new document conversion tool and interface.
|
||||
* Multi-threaded rendering in mudraw.
|
||||
* Updated base 14 fonts from URW.
|
||||
* New CJK font with language specific variants.
|
||||
* Hyperlink support in EPUB.
|
||||
* Alpha channel is now optional in pixmaps.
|
||||
* More aggressive purging of cached objects.
|
||||
* Partial image decoding for lower memory use when banding.
|
||||
* Reduced default set of built-in CMap tables to the minimum required.
|
||||
* FZ_ENABLE_PDF, _XPS, _JS, to disable features at compile time.
|
||||
* Function level linking.
|
||||
* Dropped pdf object generation numbers from public interfaces.
|
||||
* Simplified PDF page, xobject, and annotation internals.
|
||||
* Closing and freeing devices and writers are now separate steps.
|
||||
* Improved PDF annotation editing interface (still a work in progress).
|
||||
* Document writer interface.
|
||||
* Banded image writer interface.
|
||||
- Drop CVE-2016-6265.patch and mupdf-fix-openjpeg2.patch,
|
||||
both are fixed upstream.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 22 11:02:28 UTC 2016 - idonmez@suse.com
|
||||
|
||||
|
||||
11
mupdf.spec
11
mupdf.spec
@ -18,7 +18,7 @@
|
||||
|
||||
|
||||
Name: mupdf
|
||||
Version: 1.9a
|
||||
Version: 1.10
|
||||
Release: 0
|
||||
Summary: Lightweight PDF and XPS Viewer and Parser and Rendering Library
|
||||
License: AGPL-3.0+
|
||||
@ -27,9 +27,6 @@ Url: http://mupdf.com/
|
||||
Source0: http://mupdf.com/downloads/mupdf-%{version}-source.tar.gz
|
||||
Source1: mupdf.desktop
|
||||
Source2: mupdf.png
|
||||
# PATCH-FIX-OPENSUSE mupdf-fix-openjpeg2.patch gber@opensuse.org -- Fix build against openjpeg2 2.1 on openSUSE
|
||||
Patch0: mupdf-fix-openjpeg2.patch
|
||||
Patch1: CVE-2016-6265.patch
|
||||
BuildRequires: freetype-devel
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: jbig2dec-devel
|
||||
@ -69,9 +66,6 @@ based on mupdf.
|
||||
# do not use the inlined copies of build dpendencies except for mujs
|
||||
rm -rf $(ls -d thirdparty/*/ | grep -v mujs)
|
||||
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
|
||||
mkdir docs/examples
|
||||
for src in docs/*.c; do
|
||||
if [ -r "$src" ]; then
|
||||
@ -97,6 +91,8 @@ mv %{buildroot}%{_bindir}/mupdf-x11-curl %{buildroot}%{_bindir}/mupdf
|
||||
|
||||
rm %{buildroot}%{_bindir}/mujstest
|
||||
rm %{buildroot}%{_bindir}/mupdf-x11
|
||||
rm %{buildroot}%{_bindir}/muraster
|
||||
|
||||
rm -rf %{buildroot}%{_datadir}/doc/
|
||||
|
||||
chmod 0644 %{buildroot}%{_includedir}/mupdf/*.h \
|
||||
@ -108,6 +104,7 @@ install -D -p -m 644 %{SOURCE1} \
|
||||
%{buildroot}%{_datadir}/applications/%{name}.desktop
|
||||
install -D -p -m 644 %{SOURCE2} \
|
||||
%{buildroot}%{_datadir}/pixmaps/%{name}.png
|
||||
|
||||
%suse_update_desktop_file mupdf
|
||||
|
||||
%post
|
||||
|
||||
Loading…
Reference in New Issue
Block a user