main/mupdf: upgrade to 1.11

Move muraster to mupdf-tools

Author: Daniel Sabogal

main/mupdf/APKBUILD

@@ -2,8 +2,8 @@
 # Contributor: Michael Zhou <[email protected]>
 # Maintainer: Daniel Sabogal <[email protected]>
 pkgname=mupdf
-pkgver=1.10a
-pkgrel=2
+pkgver=1.11
+pkgrel=0
 pkgdesc="A lightweight PDF and XPS viewer"
 url="http://mupdf.com"
 arch="all"
@@ -17,8 +17,6 @@ options="!check"
 source="http://mupdf.com/downloads/archive/$pkgname-$pkgver-source.tar.gz
 	shared-lib.patch
 	openjpeg-2.1.patch
-	CVE-2017-5896.patch
-	CVE-2017-5991.patch
 	"
 
 # secfixes:
@@ -80,11 +78,10 @@ _tools() {
 	mkdir -p "$subpkgdir"/usr/bin
 	mv "$pkgdir"/usr/bin/mutool \
 		"$pkgdir"/usr/bin/mujstest \
+		"$pkgdir"/usr/bin/muraster \
 		"$subpkgdir"/usr/bin/ || return 1
 }
 
-sha512sums="8c735963364985e74ceb38242afae555a3d2ee7c69abe3fe5c485e8613a83d996a58f231cb689a156019d431fa67d565503247d010b0a404054850483aed9fec  mupdf-1.10a-source.tar.gz
-bc38cc6935ed1c5941773e0671bea25d33897c1018c30f11ff3a1ec1e583276597f521b9e526f9bd38a6f9a1e76aa3e52782995ded72a618d07811abcd7ca734  shared-lib.patch
-bfb509c529e26c3d2dc827298ce3a6083640fbe3fd7491560ffb1e8f86d62bbd4a5d52721079caef8a38d6f332132b581859276000b397f9512673eedb0315a7  openjpeg-2.1.patch
-e9f29b909e016967fc9e6ca6723d63aecfea5c8aeadbd923bbf8a0fa1f4b0e16bd4eedac178bbf5fa359e47a55aa307b6581c6ce45b177ee12430f41c0b49cd7  CVE-2017-5896.patch
-b65a9dce7ba239be788d144c27edb7528ebcf08ead4defe887a08d7879cf72ca3b172a9a33ec3f9426743f45ecb9aac17baf1b526bf5f880beb00bdd84bdc42a  CVE-2017-5991.patch"
+sha512sums="501670f540e298a8126806ebbd9db8b29866f663b7bbf26c9ade1933e42f0c00ad410b9d93f3ddbfb3e45c38722869095de28d832fe3fb3703c55cc9a01dbf63  mupdf-1.11-source.tar.gz
+b3ddbc22da894a8b9a0fa0c93711e2052b5d2ca29497473b6e15ffbae52faaafff9238619680de474c455ebd073c2d29ead4ff5d962fddb99f7ced27057fa77f  shared-lib.patch
+f8283db9a510527e84afeeb6eea89948161899c149a559c4a699c533445b42f30e5bf520616ca69d7feb554529ad494a60c276a1eecc915723ec0f264bbc0ed0  openjpeg-2.1.patch"

main/mupdf/CVE-2017-5896.patch

@@ -1,17 +1,14 @@
---- mupdf-1.10-source/source/fitz/load-jpx.c.orig
-+++ mupdf-1.10-source/source/fitz/load-jpx.c
-@@ -481,14 +481,6 @@
+--- mupdf-1.11-source/source/fitz/load-jpx.c.orig
++++ mupdf-1.11-source/source/fitz/load-jpx.c
+@@ -444,11 +444,6 @@
 
  #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
--
- #include <openjpeg.h>
+ #define USE_JPIP
 
- /* OpenJPEG does not provide a safe mechanism to intercept
+ #include <openjpeg.h>

main/mupdf/CVE-2017-5991.patch

@@ -1,39 +1,39 @@
---- mupdf-1.9a-source/Makefile.orig
-+++ mupdf-1.9a-source/Makefile
-@@ -16,6 +16,7 @@
+--- mupdf-1.11-source/Makefile.orig
++++ mupdf-1.11-source/Makefile
+@@ -15,6 +15,7 @@
  # XCFLAGS or XLIBS instead. Make ignores any lines in the makefile that
  # set a variable that was set on the command line.
- CFLAGS += $(XCFLAGS) -Iinclude -I$(GEN)
+ CFLAGS += $(XCFLAGS) -Iinclude -Igenerated
 +CFLAGS += -fPIC
  LIBS += $(XLIBS) -lm
 
  LIBS += $(FREETYPE_LIBS)
-@@ -52,6 +53,7 @@
+@@ -73,6 +74,7 @@
  CXX_CMD = $(QUIET_CXX) $(CXX) $(CFLAGS) -o $@ -c $<
  AR_CMD = $(QUIET_AR) $(AR) cr $@ $^
  LINK_CMD = $(QUIET_LINK) $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
 +LINK_SHARED_CMD = $(QUIET_LINK) $(CC) $(LDFLAGS) -shared -Wl,-soname,$(notdir $@) -o $@ $^ $(LIBS)
  MKDIR_CMD = $(QUIET_MKDIR) mkdir -p $@
  RM_CMD = $(QUIET_RM) rm -f $@
+ TAGS_CMD = $(QUIET_TAGS) ctags $^
+@@ -88,6 +90,9 @@
+ 	$(AR_CMD)
+ 	$(RANLIB_CMD)
+ 
++$(OUT)/%.so.0: $(OUT)/%.a
++	$(LINK_SHARED_CMD)
++
+ $(OUT)/%.exe: $(OUT)/%.o | $(ALL_DIR)
+ 	$(LINK_CMD)
 
-@@ -141,8 +143,8 @@
+@@ -300,8 +305,8 @@
 
  # --- Library ---
 
 -MUPDF_LIB = $(OUT)/libmupdf.a
 -THIRD_LIB = $(OUT)/libmupdfthird.a
 +MUPDF_LIB = $(OUT)/libmupdf.so.0
 +THIRD_LIB = $(OUT)/libmupdfthird.so.0
+ THREAD_LIB = $(OUT)/libmuthreads.a
 
- MUPDF_OBJ := $(FITZ_OBJ) $(FONT_OBJ) $(PDF_OBJ) $(XPS_OBJ) $(CBZ_OBJ) $(HTML_OBJ) $(GPRF_OBJ)
- THIRD_OBJ := $(FREETYPE_OBJ) $(HARFBUZZ_OBJ) $(JBIG2DEC_OBJ) $(JPEG_OBJ) $(MUJS_OBJ) $(OPENJPEG_OBJ) $(ZLIB_OBJ)
-@@ -161,6 +163,9 @@
- 	$(RM_CMD)
- 	$(AR_CMD)
- 	$(RANLIB_CMD)
-+
-+$(OUT)/%.so.0 : $(OUT)/%.a
-+	$(LINK_SHARED_CMD)
- 
- $(OUT)/%: $(OUT)/%.o
- 	$(LINK_CMD)
+ MUPDF_OBJ := $(FITZ_OBJ) $(FONT_OBJ) $(PDF_OBJ) $(XPS_OBJ) $(SVG_OBJ) $(CBZ_OBJ) $(HTML_OBJ) $(GPRF_OBJ)