Date: Monday, November 21, 2016 @ 21:13:47 Author: eworm Revision: 196479
upgpkg: mupdf 1.10-1 new upstream release Modified: mupdf/trunk/0001-mupdf-openjpeg.patch mupdf/trunk/PKGBUILD ---------------------------+ 0001-mupdf-openjpeg.patch | 32 +++++++++++++------------------- PKGBUILD | 26 ++++++-------------------- 2 files changed, 19 insertions(+), 39 deletions(-) Modified: 0001-mupdf-openjpeg.patch =================================================================== --- 0001-mupdf-openjpeg.patch 2016-11-21 21:09:33 UTC (rev 196478) +++ 0001-mupdf-openjpeg.patch 2016-11-21 21:13:47 UTC (rev 196479) @@ -1,6 +1,6 @@ ---- a/source/fitz/load-jpx.c +--- a/source/fitz/load-jpx.c +++ b/source/fitz/load-jpx.c -@@ -3,12 +3,17 @@ +@@ -484,13 +484,18 @@ /* 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. */ @@ -15,23 +15,17 @@ +#endif -#include <openjpeg.h> +- +#include <openjpeg-2.1/openjpeg.h> ++ + /* OpenJPEG does not provide a safe mechanism to intercept + * allocations. In the latest version all allocations go + * though opj_malloc etc, but no context is passed around. +@@ -972,3 +977,7 @@ + } - static void fz_opj_error_callback(const char *msg, void *client_data) - { -@@ -117,7 +122,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); - -@@ -247,3 +252,6 @@ fz_load_jpx(fz_context *ctx, unsigned ch - - return img; - } -+#ifdef __cplusplus -+} + #endif /* HAVE_LURATECH */ ++ ++#ifdef __cplusplus ++} +#endif Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-11-21 21:09:33 UTC (rev 196478) +++ PKGBUILD 2016-11-21 21:13:47 UTC (rev 196479) @@ -8,8 +8,8 @@ pkgbase=mupdf pkgname=(libmupdf mupdf mupdf-gl mupdf-tools) -pkgver=1.9_a -pkgrel=5 +pkgver=1.10 +pkgrel=1 pkgdesc='Lightweight PDF and XPS viewer' arch=('i686' 'x86_64') url='http://mupdf.com' @@ -20,16 +20,12 @@ options=('staticlibs') source=("http://mupdf.com/downloads/mupdf-${pkgver/_/}-source.tar.gz" '0001-mupdf-openjpeg.patch' - 'mupdf-0001-bug-696941-fix-use-after-free.patch::http://git.ghostscript.com/?p=mupdf.git;a=patch;h=fa1936405b6a84e5c9bb440912c23d532772f958' - 'mupdf-0002-make-sure-that-number-of-colors-in-mesh-params-is-valid.patch::http://git.ghostscript.com/?p=mupdf.git;a=patch;h=39b0f07dd960f34e7e6bf230ffc3d87c41ef0f2e' 'mupdf.desktop' 'mupdf.xpm') -md5sums=('658b90788a57d858dcb069cf326e11c3' - 'c2d096ecd41ae26735551d01099c0a3e' - 'cc0d5363bf0fd4daa46380f3799e1d16' - 'f73ad47c6d57aa6cc6fcfbc9aa98465f' - '39b54f82a763aac54e352315a0ee9037' - 'f3f35e7320bafde331250de1c99186a1') +sha256sums=('1185637A93055CDAE8335DB14FEF3E0FBD2ACADAE94EABD2EC0111D89A04A667' + 'e55c3b876149d46983b155b0a237fa7d8d47a49e4ecab848bfca3fd549c644c4' + '70f632e22902ad4224b1d88696702b3ba4eb3c28eb7acf735f06d16e6884a078' + 'a435f44425f5432c074dee745d8fbaeb879038ec1f1ec64f037c74662f09aca8') prepare() { cd $pkgbase-${pkgver/_/}-source @@ -37,16 +33,6 @@ # remove bundled packages, we want our system libraries rm -rf thirdparty/{curl,freetype,glfw,harfbuzz,jbig2dec,jpeg,openjpeg,zlib} - # Bug 696941: Fix use after free. - # CVE-2016-6265 - # https://security-tracker.debian.org/tracker/CVE-2016-6265 - patch -Np1 < "${srcdir}/mupdf-0001-bug-696941-fix-use-after-free.patch" - - # Make sure that number of colors in mesh params is valid. - # CVE-2016-6525 - # https://security-tracker.debian.org/tracker/CVE-2016-6525 - patch -Np1 < "${srcdir}/mupdf-0002-make-sure-that-number-of-colors-in-mesh-params-is-valid.patch" - # fix function for openjpeg 2.1.x patch -Np1 < "${srcdir}/0001-mupdf-openjpeg.patch"