Hello community, here is the log from the commit of package mupdf for openSUSE:Factory checked in at 2017-11-14 14:18:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mupdf (Old) and /work/SRC/openSUSE:Factory/.mupdf.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mupdf" Tue Nov 14 14:18:16 2017 rev:29 rq:540468 version:1.11 Changes: -------- --- /work/SRC/openSUSE:Factory/mupdf/mupdf.changes 2017-08-12 19:33:07.610771701 +0200 +++ /work/SRC/openSUSE:Factory/.mupdf.new/mupdf.changes 2017-11-14 14:18:20.337174963 +0100 @@ -1,0 +2,20 @@ +Fri Nov 10 08:15:18 UTC 2017 - [email protected] + +- Update to version 1.11 + * This is primarily a bug fix release. + * PDF portfolio support with command line tool "mutool + portfolio". + * Add callbacks to load fallback fonts from the system. + * Use system fonts in Android to reduce install size. + * Flag to disable publisher styles in EPUB layout. + * Improved SVG output. + +- Refreshed fix-openjpeg-flags.patch and reproducible.patch + +- Dropped CVE-2017-5896.patch, bsc1023760.patch, + CVE-2016-10221.patch, CVE-2016-8728.patch, CVE-2017-7976.patch, + CVE-2016-10132.patch, CVE-2016-10133.patch, + CVE-2016-10141.patch, CVE-2017-5627.patch + and CVE-2017-5628.patch (merged or adapted upstream) + +------------------------------------------------------------------- Old: ---- CVE-2016-10132.patch CVE-2016-10133.patch CVE-2016-10141.patch CVE-2016-10221.patch CVE-2016-8728.patch CVE-2017-5627.patch CVE-2017-5628.patch CVE-2017-5896.patch CVE-2017-7976.patch bsc1023760.patch mupdf-1.10a-source.tar.gz New: ---- mupdf-1.11-source.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mupdf.spec ++++++ --- /var/tmp/diff_new_pack.16edEG/_old 2017-11-14 14:18:22.601092378 +0100 +++ /var/tmp/diff_new_pack.16edEG/_new 2017-11-14 14:18:22.601092378 +0100 @@ -18,40 +18,30 @@ Name: mupdf -Version: 1.10a +Version: 1.11 Release: 0 Summary: Lightweight PDF and XPS Viewer and Parser and Rendering Library License: AGPL-3.0+ Group: Productivity/Office/Other -Url: http://mupdf.com/ -Source0: http://mupdf.com/downloads/mupdf-%{version}-source.tar.gz +Url: https://mupdf.com/ +Source0: https://mupdf.com/downloads/mupdf-%{version}-source.tar.gz Source1: mupdf.desktop Source2: mupdf.png Patch1: fix-openjpeg-flags.patch -Patch2: CVE-2016-10132.patch -Patch3: CVE-2016-10133.patch -Patch4: CVE-2016-10141.patch -Patch5: CVE-2017-5627.patch -Patch6: CVE-2017-5628.patch -Patch7: CVE-2017-5896.patch -Patch8: bsc1023760.patch # PATCH-FIX-UPSTREAM https://bugs.ghostscript.com/show_bug.cgi?id=697958 Patch9: reproducible.patch -Patch10: CVE-2016-8728.patch -Patch11: CVE-2017-7976.patch -Patch12: CVE-2016-10221.patch BuildRequires: freetype-devel BuildRequires: gcc-c++ BuildRequires: jbig2dec-devel BuildRequires: libcurl-devel BuildRequires: libjpeg-devel BuildRequires: openjpeg2-devel +BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: xorg-x11-devel BuildRequires: zlib-devel BuildRequires: pkgconfig(harfbuzz) Requires: xdg-utils -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description MuPDF is a lightweight PDF and XPS viewer and parser/rendering library. @@ -76,20 +66,7 @@ %prep %setup -q -n %{name}-%{version}-source %patch1 -p1 -%patch7 -p1 -%patch8 -p1 %patch9 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 - -pushd ./thirdparty/mujs -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -popd # do not use the inlined copies of build dpendencies except for mujs rm -rf $(ls -d thirdparty/*/ | grep -v mujs) @@ -101,7 +78,8 @@ fi done -sed -i s,'INSTALL_APPS := .*','INSTALL_APPS := $(MUTOOL) $(MUVIEW_CURL)', Makefile +sed -e s,'INSTALL_APPS := .*','INSTALL_APPS := $(MUTOOL_EXE) $(MUVIEW_X11_CURL_EXE)', \ + -e '/^INSTALL_APPS +=/d' -i Makefile %build # do no set CFLAGS which is used by the build system itself! @@ -133,24 +111,25 @@ %suse_update_desktop_file mupdf +%if 0%{?suse_version} <= 1320 %post %desktop_database_post %postun %desktop_database_postun +%endif %files -%defattr(-,root,root) %doc CHANGES COPYING README docs/naming.txt docs/overview.txt %doc docs/progressive.txt docs/refcount.txt docs/examples/ %{_bindir}/mupdf %{_bindir}/mutool %{_datadir}/applications/mupdf.desktop %{_datadir}/pixmaps/mupdf.png -%{_mandir}/man1/mu*.1* +%{_mandir}/man1/mupdf.1%{ext_man} +%{_mandir}/man1/mutool.1%{ext_man} %files devel-static -%defattr(-,root,root,-) %{_includedir}/mupdf/ %{_libdir}/libmupdf.a %{_libdir}/libmupdfthird.a ++++++ fix-openjpeg-flags.patch ++++++ --- /var/tmp/diff_new_pack.16edEG/_old 2017-11-14 14:18:22.633091211 +0100 +++ /var/tmp/diff_new_pack.16edEG/_new 2017-11-14 14:18:22.637091065 +0100 @@ -1,15 +1,12 @@ -Index: mupdf-1.10a-source/source/fitz/load-jpx.c +Index: mupdf-1.11-source/source/fitz/load-jpx.c =================================================================== ---- mupdf-1.10a-source.orig/source/fitz/load-jpx.c -+++ mupdf-1.10a-source/source/fitz/load-jpx.c -@@ -481,10 +481,6 @@ fz_load_jpx_info(fz_context *ctx, unsign +--- mupdf-1.11-source.orig/source/fitz/load-jpx.c ++++ mupdf-1.11-source/source/fitz/load-jpx.c +@@ -444,7 +444,6 @@ 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 -- * linux toolchains too. */ -#define OPJ_STATIC - #ifndef _MSC_VER + #define OPJ_HAVE_INTTYPES_H + #if !defined(_WIN32) && !defined(_WIN64) #define OPJ_HAVE_STDINT_H - #endif ++++++ mupdf-1.10a-source.tar.gz -> mupdf-1.11-source.tar.gz ++++++ /work/SRC/openSUSE:Factory/mupdf/mupdf-1.10a-source.tar.gz /work/SRC/openSUSE:Factory/.mupdf.new/mupdf-1.11-source.tar.gz differ: char 5, line 1 ++++++ reproducible.patch ++++++ --- /var/tmp/diff_new_pack.16edEG/_old 2017-11-14 14:18:22.705088584 +0100 +++ /var/tmp/diff_new_pack.16edEG/_new 2017-11-14 14:18:22.709088438 +0100 @@ -1,10 +1,10 @@ -Index: mupdf-1.10a-source/Makefile +Index: mupdf-1.11-source/Makefile =================================================================== ---- mupdf-1.10a-source.orig/Makefile -+++ mupdf-1.10a-source/Makefile -@@ -83,13 +83,13 @@ PDF_HDR := include/mupdf/pdf.h $(wildcar - SVG_HDR := include/mupdf/svg.h +--- mupdf-1.11-source.orig/Makefile ++++ mupdf-1.11-source/Makefile +@@ -125,14 +125,14 @@ SVG_HDR := include/mupdf/svg.h HTML_HDR := include/mupdf/html.h + THREAD_HDR := include/mupdf/helpers/mu-threads.h -FITZ_SRC := $(wildcard source/fitz/*.c) -PDF_SRC := $(wildcard source/pdf/*.c) @@ -13,6 +13,7 @@ -CBZ_SRC := $(wildcard source/cbz/*.c) -HTML_SRC := $(wildcard source/html/*.c) -GPRF_SRC := $(wildcard source/gprf/*.c) +-THREAD_SRC := $(wildcard source/helpers/mu-threads/*.c) +FITZ_SRC := $(sort $(wildcard source/fitz/*.c)) +PDF_SRC := $(sort $(wildcard source/pdf/*.c)) +XPS_SRC := $(sort $(wildcard source/xps/*.c)) @@ -20,12 +21,13 @@ +CBZ_SRC := $(sort $(wildcard source/cbz/*.c)) +HTML_SRC := $(sort $(wildcard source/html/*.c)) +GPRF_SRC := $(sort $(wildcard source/gprf/*.c)) ++THREAD_SRC := $(sort $(wildcard source/helpers/mu-threads/*.c)) FITZ_SRC_HDR := $(wildcard source/fitz/*.h) PDF_SRC_HDR := $(wildcard source/pdf/*.h) source/pdf/pdf-name-table.h -@@ -116,11 +116,11 @@ $(GPRF_OBJ) : $(FITZ_HDR) $(GPRF_HDR) $( +@@ -180,11 +180,11 @@ generate: $(NAME_GEN) - # --- Generated embedded font files --- + HEXDUMP_EXE := $(OUT)/scripts/hexdump.exe -FONT_BIN_DROID := $(wildcard resources/fonts/droid/*.ttf) -FONT_BIN_NOTO := $(wildcard resources/fonts/noto/*.ttf) @@ -38,20 +40,20 @@ +FONT_BIN_URW := $(sort $(wildcard resources/fonts/urw/*.cff)) +FONT_BIN_SIL := $(sort $(wildcard resources/fonts/sil/*.cff)) - FONT_GEN_DROID := $(subst resources/fonts/droid/, $(GEN)/, $(addsuffix .c, $(basename $(FONT_BIN_DROID)))) - FONT_GEN_NOTO := $(subst resources/fonts/noto/, $(GEN)/, $(addsuffix .c, $(basename $(FONT_BIN_NOTO)))) -@@ -210,10 +210,10 @@ NAMEDUMP := $(OUT)/namedump - CQUOTE := $(OUT)/cquote - BIN2HEX := $(OUT)/bin2hex - --CMAP_CNS_SRC := $(wildcard resources/cmaps/cns/*) --CMAP_GB_SRC := $(wildcard resources/cmaps/gb/*) --CMAP_JAPAN_SRC := $(wildcard resources/cmaps/japan/*) --CMAP_KOREA_SRC := $(wildcard resources/cmaps/korea/*) -+CMAP_CNS_SRC := $(sort $(wildcard resources/cmaps/cns/*)) -+CMAP_GB_SRC := $(sort $(wildcard resources/cmaps/gb/*)) -+CMAP_JAPAN_SRC := $(sort $(wildcard resources/cmaps/japan/*)) -+CMAP_KOREA_SRC := $(sort $(wildcard resources/cmaps/korea/*)) + FONT_GEN_DROID := $(subst resources/fonts/droid/, generated/, $(addsuffix .c, $(basename $(FONT_BIN_DROID)))) + FONT_GEN_NOTO := $(subst resources/fonts/noto/, generated/, $(addsuffix .c, $(basename $(FONT_BIN_NOTO)))) +@@ -224,10 +224,10 @@ generate: $(FONT_GEN) + + CMAPDUMP_EXE := $(OUT)/scripts/cmapdump.exe + +-CMAP_CJK_SRC := $(wildcard resources/cmaps/cjk/*) +-CMAP_EXTRA_SRC := $(wildcard resources/cmaps/extra/*) +-CMAP_UTF8_SRC := $(wildcard resources/cmaps/utf8/*) +-CMAP_UTF32_SRC := $(wildcard resources/cmaps/utf32/*) ++CMAP_CJK_SRC := $(sort $(wildcard resources/cmaps/cjk/*)) ++CMAP_EXTRA_SRC := $(sort $(wildcard resources/cmaps/extra/*)) ++CMAP_UTF8_SRC := $(sort $(wildcard resources/cmaps/utf8/*)) ++CMAP_UTF32_SRC := $(sort $(wildcard resources/cmaps/utf32/*)) - $(GEN)/gen_cmap_cns.h : $(CMAP_CNS_SRC) - $(QUIET_GEN) $(CMAPDUMP) $@ $(CMAP_CNS_SRC) + generated/gen_cmap_cjk.h : $(CMAP_CJK_SRC) | generated + $(QUIET_GEN) $(CMAPDUMP_EXE) $@ $(CMAP_CJK_SRC)
