[arch-commits] Commit in mupdf/repos/community-x86_64 (7 files)
Christian Hesse
eworm at archlinux.org
Thu Mar 18 12:15:21 UTC 2021
Date: Thursday, March 18, 2021 @ 12:15:21
Author: eworm
Revision: 894395
archrelease: copy trunk to community-x86_64
Added:
mupdf/repos/community-x86_64/0001-bug-703366-fix-double-free.patch
(from rev 894394, mupdf/trunk/0001-bug-703366-fix-double-free.patch)
mupdf/repos/community-x86_64/PKGBUILD
(from rev 894394, mupdf/trunk/PKGBUILD)
mupdf/repos/community-x86_64/mupdf.desktop
(from rev 894394, mupdf/trunk/mupdf.desktop)
mupdf/repos/community-x86_64/mupdf.xpm
(from rev 894394, mupdf/trunk/mupdf.xpm)
Deleted:
mupdf/repos/community-x86_64/PKGBUILD
mupdf/repos/community-x86_64/mupdf.desktop
mupdf/repos/community-x86_64/mupdf.xpm
---------------------------------------+
0001-bug-703366-fix-double-free.patch | 44 +++++
PKGBUILD | 235 ++++++++++++++++----------------
mupdf.desktop | 30 ++--
3 files changed, 179 insertions(+), 130 deletions(-)
Copied: mupdf/repos/community-x86_64/0001-bug-703366-fix-double-free.patch (from rev 894394, mupdf/trunk/0001-bug-703366-fix-double-free.patch)
===================================================================
--- 0001-bug-703366-fix-double-free.patch (rev 0)
+++ 0001-bug-703366-fix-double-free.patch 2021-03-18 12:15:21 UTC (rev 894395)
@@ -0,0 +1,44 @@
+From: Robin Watts <Robin.Watts at artifex.com>
+Date: Fri, 22 Jan 2021 17:05:15 +0000 (+0000)
+Subject: Bug 703366: Fix double free of object during linearization.
+X-Git-Url: https://git.ghostscript.com/?p=mupdf.git;a=commitdiff_plain;h=cee7cefc610d42fd383b3c80c12cbc675443176a
+
+Bug 703366: Fix double free of object during linearization.
+
+This appears to happen because we parse an illegal object from
+a broken file and assign it to object 0, which is defined to
+be free.
+
+Here, we fix the parsing code so this can't happen.
+---
+
+diff --git a/source/pdf/pdf-parse.c b/source/pdf/pdf-parse.c
+index 7abc8c3d4..5761c3351 100644
+--- a/source/pdf/pdf-parse.c
++++ b/source/pdf/pdf-parse.c
+@@ -749,6 +749,12 @@ pdf_parse_ind_obj(fz_context *ctx, pdf_document *doc,
+ fz_throw(ctx, FZ_ERROR_SYNTAX, "expected generation number (%d ? obj)", num);
+ }
+ gen = buf->i;
++ if (gen < 0 || gen >= 65536)
++ {
++ if (try_repair)
++ *try_repair = 1;
++ fz_throw(ctx, FZ_ERROR_SYNTAX, "invalid generation number (%d)", gen);
++ }
+
+ tok = pdf_lex(ctx, file, buf);
+ if (tok != PDF_TOK_OBJ)
+diff --git a/source/pdf/pdf-xref.c b/source/pdf/pdf-xref.c
+index 1b2bdcd59..30197b4b8 100644
+--- a/source/pdf/pdf-xref.c
++++ b/source/pdf/pdf-xref.c
+@@ -1190,6 +1190,8 @@ pdf_read_new_xref(fz_context *ctx, pdf_document *doc, pdf_lexbuf *buf)
+ {
+ ofs = fz_tell(ctx, doc->file);
+ trailer = pdf_parse_ind_obj(ctx, doc, doc->file, buf, &num, &gen, &stm_ofs, NULL);
++ if (num == 0)
++ fz_throw(ctx, FZ_ERROR_GENERIC, "Trailer object number cannot be 0\n");
+ }
+ fz_catch(ctx)
+ {
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-03-18 12:15:15 UTC (rev 894394)
+++ PKGBUILD 2021-03-18 12:15:21 UTC (rev 894395)
@@ -1,115 +0,0 @@
-# Maintainer: Christian Hesse <mail at eworm.de>
-# Contributor: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
-# Contributor: Brad Fanella <bradfanella at archlinux.us>
-# Contributor: Stefan Husmann <stefan-husmann at t-online.de>
-# Contributor: Pierre-Paul Paquin <pierrepaulpaquin at gmail.com>
-# Contributor: xduugu
-
-pkgbase=mupdf
-pkgname=(libmupdf mupdf mupdf-gl mupdf-tools)
-pkgver=1.18.0
-pkgrel=1
-pkgdesc='Lightweight PDF and XPS viewer'
-arch=('x86_64')
-url='https://mupdf.com/'
-license=('AGPL3')
-makedepends=('desktop-file-utils' 'freetype2' 'freeglut' 'glu' 'harfbuzz'
- 'jbig2dec' 'libjpeg' 'mesa-libgl' 'openjpeg2' 'libxext'
- 'gumbo-parser')
-# we need static libs for zathura-pdf-mupdf
-options=('staticlibs')
-source=("https://mupdf.com/downloads/archive/mupdf-${pkgver/_/}-source.tar.xz"
- 'mupdf.desktop'
- 'mupdf.xpm')
-sha256sums=('592d4f6c0fba41bb954eb1a41616661b62b134d5b383e33bd45a081af5d4a59a'
- 'ccff66979249bd4ab4ba8918660f194eb90eb0ae231b16e36a6cecdcf471883f'
- 'a435f44425f5432c074dee745d8fbaeb879038ec1f1ec64f037c74662f09aca8')
-
-prepare() {
- cd $pkgbase-${pkgver/_/}-source
-
- # remove bundled packages, we want our system libraries
- rm -rf thirdparty/{freeglut,freetype,harfbuzz,jbig2dec,libjpeg,openjpeg,zlib}
-}
-
-build() {
- CFLAGS+=' -fPIC'
- CXXFLAGS+=' -fPIC'
- export CFLAGS CXXFLAGS
-
- USE_SYSTEM_LIBS='yes'
- export USE_SYSTEM_LIBS
-
- cd $pkgbase-${pkgver/_/}-source
- make build=release libs apps
-}
-
-package_libmupdf() {
- pkgdesc='Library for Lightweight PDF and XPS viewer'
-
- cd $pkgbase-${pkgver/_/}-source
-
- make build=release prefix="$pkgdir"/usr install
-
- rm -rf "$pkgdir"/usr/{bin,share/man}
- mv "$pkgdir"/usr/share/doc/mupdf "$pkgdir"/usr/share/doc/libmupdf
-
- find "$pkgdir"/usr/include "$pkgdir"/usr/share "$pkgdir"/usr/lib \
- -type f -exec chmod 0644 {} +
-}
-
-package_mupdf() {
- pkgdesc='Lightweight PDF and XPS viewer'
- depends=('desktop-file-utils' 'freetype2' 'harfbuzz' 'jbig2dec'
- 'libjpeg' 'openjpeg2' 'openssl' 'libxext' 'gumbo-parser')
-
- cd $pkgbase-${pkgver/_/}-source
-
- install -D -m0755 build/release/mupdf-x11 "$pkgdir"/usr/bin/mupdf
-
- install -D -m0644 docs/man/mupdf.1 "$pkgdir"/usr/share/man/man1/mupdf.1
-
- install -d "$pkgdir"/usr/share/doc/mupdf
- install -m0644 README COPYING CHANGES "$pkgdir"/usr/share/doc/mupdf
-
- install -D -m0644 ../mupdf.desktop "$pkgdir"/usr/share/applications/mupdf.desktop
- install -D -m0644 ../mupdf.xpm "$pkgdir"/usr/share/pixmaps/mupdf.xpm
-}
-
-package_mupdf-gl() {
- pkgdesc='Lightweight PDF and XPS viewer with OpenGL backend'
- conflicts=('mupdf')
- provides=("mupdf=${pkgver}")
- depends=('desktop-file-utils' 'freetype2' 'freeglut' 'glu' 'harfbuzz' 'jbig2dec'
- 'libjpeg' 'openjpeg2' 'openssl' 'gumbo-parser')
-
- cd $pkgbase-${pkgver/_/}-source
-
- install -D -m0755 build/release/mupdf-gl "$pkgdir"/usr/bin/mupdf
-
- install -D -m0644 docs/man/mupdf.1 "$pkgdir"/usr/share/man/man1/mupdf.1
-
- install -d "$pkgdir"/usr/share/doc/mupdf
- install -m0644 README COPYING CHANGES "$pkgdir"/usr/share/doc/mupdf
-
- install -D -m0644 ../mupdf.desktop "$pkgdir"/usr/share/applications/mupdf.desktop
- install -D -m0644 ../mupdf.xpm "$pkgdir"/usr/share/pixmaps/mupdf.xpm
-}
-
-package_mupdf-tools() {
- pkgdesc='Tools for Lightweight PDF and XPS viewer'
- depends=('mupdf')
- depends=('freetype2' 'jbig2dec' 'libjpeg' 'openjpeg2' 'harfbuzz' 'openssl'
- 'gumbo-parser')
-
- cd $pkgbase-${pkgver/_/}-source
-
- install -D -m0755 build/release/mutool "$pkgdir"/usr/bin/mutool
- install -D -m0755 build/release/muraster "$pkgdir"/usr/bin/muraster
-
- install -D -m0644 docs/man/mutool.1 "$pkgdir"/usr/share/man/man1/mutool.1
-
- install -d "$pkgdir"/usr/share/doc/mupdf-tools
- install -m0644 README COPYING CHANGES "$pkgdir"/usr/share/doc/mupdf-tools
-}
-
Copied: mupdf/repos/community-x86_64/PKGBUILD (from rev 894394, mupdf/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-03-18 12:15:21 UTC (rev 894395)
@@ -0,0 +1,120 @@
+# Maintainer: Christian Hesse <mail at eworm.de>
+# Contributor: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Contributor: Brad Fanella <bradfanella at archlinux.us>
+# Contributor: Stefan Husmann <stefan-husmann at t-online.de>
+# Contributor: Pierre-Paul Paquin <pierrepaulpaquin at gmail.com>
+# Contributor: xduugu
+
+pkgbase=mupdf
+pkgname=(libmupdf mupdf mupdf-gl mupdf-tools)
+pkgver=1.18.0
+pkgrel=2
+pkgdesc='Lightweight PDF and XPS viewer'
+arch=('x86_64')
+url='https://mupdf.com/'
+license=('AGPL3')
+makedepends=('desktop-file-utils' 'freetype2' 'freeglut' 'glu' 'harfbuzz'
+ 'jbig2dec' 'libjpeg' 'mesa-libgl' 'openjpeg2' 'libxext'
+ 'gumbo-parser')
+# we need static libs for zathura-pdf-mupdf
+options=('staticlibs')
+source=("https://mupdf.com/downloads/archive/mupdf-${pkgver/_/}-source.tar.xz"
+ '0001-bug-703366-fix-double-free.patch'
+ 'mupdf.desktop'
+ 'mupdf.xpm')
+sha256sums=('592d4f6c0fba41bb954eb1a41616661b62b134d5b383e33bd45a081af5d4a59a'
+ '16d9af14436cc864646a3b384fa3adfaa6b3eea0b73959a693095ddee4845ce1'
+ 'ccff66979249bd4ab4ba8918660f194eb90eb0ae231b16e36a6cecdcf471883f'
+ 'a435f44425f5432c074dee745d8fbaeb879038ec1f1ec64f037c74662f09aca8')
+
+prepare() {
+ cd $pkgbase-${pkgver/_/}-source
+
+ # remove bundled packages, we want our system libraries
+ rm -rf thirdparty/{freeglut,freetype,harfbuzz,jbig2dec,libjpeg,openjpeg,zlib}
+
+ # Bug 703366: Fix double free of object during linearization.
+ patch -Np1 < ../0001-bug-703366-fix-double-free.patch
+}
+
+build() {
+ CFLAGS+=' -fPIC'
+ CXXFLAGS+=' -fPIC'
+ export CFLAGS CXXFLAGS
+
+ USE_SYSTEM_LIBS='yes'
+ export USE_SYSTEM_LIBS
+
+ cd $pkgbase-${pkgver/_/}-source
+ make build=release libs apps
+}
+
+package_libmupdf() {
+ pkgdesc='Library for Lightweight PDF and XPS viewer'
+
+ cd $pkgbase-${pkgver/_/}-source
+
+ make build=release prefix="$pkgdir"/usr install
+
+ rm -rf "$pkgdir"/usr/{bin,share/man}
+ mv "$pkgdir"/usr/share/doc/mupdf "$pkgdir"/usr/share/doc/libmupdf
+
+ find "$pkgdir"/usr/include "$pkgdir"/usr/share "$pkgdir"/usr/lib \
+ -type f -exec chmod 0644 {} +
+}
+
+package_mupdf() {
+ pkgdesc='Lightweight PDF and XPS viewer'
+ depends=('desktop-file-utils' 'freetype2' 'harfbuzz' 'jbig2dec'
+ 'libjpeg' 'openjpeg2' 'openssl' 'libxext' 'gumbo-parser')
+
+ cd $pkgbase-${pkgver/_/}-source
+
+ install -D -m0755 build/release/mupdf-x11 "$pkgdir"/usr/bin/mupdf
+
+ install -D -m0644 docs/man/mupdf.1 "$pkgdir"/usr/share/man/man1/mupdf.1
+
+ install -d "$pkgdir"/usr/share/doc/mupdf
+ install -m0644 README COPYING CHANGES "$pkgdir"/usr/share/doc/mupdf
+
+ install -D -m0644 ../mupdf.desktop "$pkgdir"/usr/share/applications/mupdf.desktop
+ install -D -m0644 ../mupdf.xpm "$pkgdir"/usr/share/pixmaps/mupdf.xpm
+}
+
+package_mupdf-gl() {
+ pkgdesc='Lightweight PDF and XPS viewer with OpenGL backend'
+ conflicts=('mupdf')
+ provides=("mupdf=${pkgver}")
+ depends=('desktop-file-utils' 'freetype2' 'freeglut' 'glu' 'harfbuzz' 'jbig2dec'
+ 'libjpeg' 'openjpeg2' 'openssl' 'gumbo-parser')
+
+ cd $pkgbase-${pkgver/_/}-source
+
+ install -D -m0755 build/release/mupdf-gl "$pkgdir"/usr/bin/mupdf
+
+ install -D -m0644 docs/man/mupdf.1 "$pkgdir"/usr/share/man/man1/mupdf.1
+
+ install -d "$pkgdir"/usr/share/doc/mupdf
+ install -m0644 README COPYING CHANGES "$pkgdir"/usr/share/doc/mupdf
+
+ install -D -m0644 ../mupdf.desktop "$pkgdir"/usr/share/applications/mupdf.desktop
+ install -D -m0644 ../mupdf.xpm "$pkgdir"/usr/share/pixmaps/mupdf.xpm
+}
+
+package_mupdf-tools() {
+ pkgdesc='Tools for Lightweight PDF and XPS viewer'
+ depends=('mupdf')
+ depends=('freetype2' 'jbig2dec' 'libjpeg' 'openjpeg2' 'harfbuzz' 'openssl'
+ 'gumbo-parser')
+
+ cd $pkgbase-${pkgver/_/}-source
+
+ install -D -m0755 build/release/mutool "$pkgdir"/usr/bin/mutool
+ install -D -m0755 build/release/muraster "$pkgdir"/usr/bin/muraster
+
+ install -D -m0644 docs/man/mutool.1 "$pkgdir"/usr/share/man/man1/mutool.1
+
+ install -d "$pkgdir"/usr/share/doc/mupdf-tools
+ install -m0644 README COPYING CHANGES "$pkgdir"/usr/share/doc/mupdf-tools
+}
+
Deleted: mupdf.desktop
===================================================================
--- mupdf.desktop 2021-03-18 12:15:15 UTC (rev 894394)
+++ mupdf.desktop 2021-03-18 12:15:21 UTC (rev 894395)
@@ -1,15 +0,0 @@
-[Desktop Entry]
-Name=MuPDF
-GenericName=PDF file viewer
-Exec=mupdf %f
-TryExec=mupdf
-Icon=mupdf
-Terminal=false
-Type=Application
-MimeType=application/epub+zip;application/pdf;application/x-pdf;application/x-cbz;application/oxps;application/vnd.ms-xpsdocument;image/jpeg;image/pjpeg;image/png;image/tiff;image/x-tiff
-Categories=Viewer;Graphics;
-Actions=View
-NoDisplay=true
-[Desktop Action View]
-Name=View with mupdf
-Exec=mupdf %f
Copied: mupdf/repos/community-x86_64/mupdf.desktop (from rev 894394, mupdf/trunk/mupdf.desktop)
===================================================================
--- mupdf.desktop (rev 0)
+++ mupdf.desktop 2021-03-18 12:15:21 UTC (rev 894395)
@@ -0,0 +1,15 @@
+[Desktop Entry]
+Name=MuPDF
+GenericName=PDF file viewer
+Exec=mupdf %f
+TryExec=mupdf
+Icon=mupdf
+Terminal=false
+Type=Application
+MimeType=application/epub+zip;application/pdf;application/x-pdf;application/x-cbz;application/oxps;application/vnd.ms-xpsdocument;image/jpeg;image/pjpeg;image/png;image/tiff;image/x-tiff
+Categories=Viewer;Graphics;
+Actions=View
+NoDisplay=true
+[Desktop Action View]
+Name=View with mupdf
+Exec=mupdf %f
Deleted: mupdf.xpm
===================================================================
(Binary files differ)
Copied: mupdf/repos/community-x86_64/mupdf.xpm (from rev 894394, mupdf/trunk/mupdf.xpm)
===================================================================
(Binary files differ)
More information about the arch-commits
mailing list