diff options
| author | prspkt <prspkt@protonmail.com> | 2018-05-11 16:31:14 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-08-08 18:18:35 +0200 |
| commit | 70bbeef9560773077c355e9816977d9ab61c15c6 (patch) | |
| tree | 5397408985c2edc0ea48e54b0eb004ddaadbeca9 /main/mupdf | |
| parent | dd269d3c71438124e4041c3db6aa73a238dbd4ee (diff) | |
| download | aports-70bbeef9560773077c355e9816977d9ab61c15c6.tar.bz2 aports-70bbeef9560773077c355e9816977d9ab61c15c6.tar.xz | |
main/mupdf: upgrade to 1.13.0
add secfixes comments
fixes #8580
(cherry picked from commit 831d2ee24986330048dfa488c8bb5017656e8efd)
Diffstat (limited to 'main/mupdf')
| -rw-r--r-- | main/mupdf/APKBUILD | 27 | ||||
| -rw-r--r-- | main/mupdf/openjpeg-2.1.patch | 14 |
2 files changed, 19 insertions, 22 deletions
diff --git a/main/mupdf/APKBUILD b/main/mupdf/APKBUILD index c472980d8f..401ff13519 100644 --- a/main/mupdf/APKBUILD +++ b/main/mupdf/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Michael Zhou <zhoumichaely@gmail.com> # Maintainer: Daniel Sabogal <dsabogalcc@gmail.com> pkgname=mupdf -pkgver=1.12.0 +pkgver=1.13.0 pkgrel=0 pkgdesc="A lightweight PDF and XPS viewer" url="http://mupdf.com" @@ -16,10 +16,16 @@ subpackages="$pkgname-doc $pkgname-dev $pkgname-x11:_x11 options="!check" source="http://mupdf.com/downloads/archive/$pkgname-$pkgver-source.tar.xz shared-lib.patch - openjpeg-2.1.patch " # secfixes: +# 1.13-r0: +# - CVE-2018-1000051 +# - CVE-2018-6544 +# - CVE-2018-6192 +# - CVE-2018-6187 +# - CVE-2018-5686 +# - CVE-2017-17858 # 1.11-r1: # - CVE-2017-6060 # 1.10a-r2: @@ -38,12 +44,18 @@ prepare() { } build() { - make prefix=/usr -C "$builddir" + cd "$builddir" + make prefix=/usr build=release all extra-apps } package() { - make prefix=/usr DESTDIR="$pkgdir" \ - -C "$builddir" install + cd "$builddir" + make prefix=/usr DESTDIR="$pkgdir" install + + cd build/release + local app; for app in mjsgen mujstest muraster; do + install -Dm755 $app "$pkgdir"/usr/bin/$app + done ln -s libmupdf.so.0 "$pkgdir"/usr/lib/libmupdf.so ln -s libmupdfthird.so.0 "$pkgdir"/usr/lib/libmupdfthird.so @@ -80,6 +92,5 @@ _tools() { "$subpkgdir"/usr/bin/ } -sha512sums="4c9ce81e7b0e2d77e017776fd9f700bc2f695f34b7fd97be7ba113ec1b340e7046c9db7d396abf19a98b1d0c7d72f01ecc1b44fadd250d2d6c6ffdcd9799bc16 mupdf-1.12.0-source.tar.xz -8d3f22908060351e8bb171c7c8248662dd6ac3fb5c765ad0ce33f33c418f6bcfb1982ea8e97b4fefee067c675cac03f76e8b715640dfd3689e8d7738384b6536 shared-lib.patch -3034e7d3248d904cc23e033a6331fc7a48d8f14e85deaa7b7b7bc37d8a3bc6c788e2fd0a866873a69c5f416d8de5b3a5b9efde4747fa50c2ea3c4b8d170aa549 openjpeg-2.1.patch" +sha512sums="c40694d907bb44f18ccf276b3014867f5e0031259064d6f5f4c2bb17bcf1c6773ea0b12b5b99bc3d88bbe69b574e323c490e387e8199f796b44b76bae01f8924 mupdf-1.13.0-source.tar.xz +8d3f22908060351e8bb171c7c8248662dd6ac3fb5c765ad0ce33f33c418f6bcfb1982ea8e97b4fefee067c675cac03f76e8b715640dfd3689e8d7738384b6536 shared-lib.patch" diff --git a/main/mupdf/openjpeg-2.1.patch b/main/mupdf/openjpeg-2.1.patch deleted file mode 100644 index 437e114cb9..0000000000 --- a/main/mupdf/openjpeg-2.1.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- mupdf-1.12.0-source/source/fitz/load-jpx.c.orig -+++ mupdf-1.12.0-source/source/fitz/load-jpx.c -@@ -445,11 +445,6 @@ - - #else /* HAVE_LURATECH */ - --#define OPJ_STATIC --#define OPJ_HAVE_INTTYPES_H --#if !defined(_MSC_VER) || _MSC_VER >= 1600 --#define OPJ_HAVE_STDINT_H --#endif - #define USE_JPIP - - #include <openjpeg.h> |