[arch-commits] Commit in mupdf/trunk (2 files)

[Christian Hesse]

    Date: Monday, June 22, 2020 @ 18:13:36
  Author: eworm
Revision: 650827

upgpkg: mupdf 1.17.0-2

set noexecstack on linker-generated binary data files

Added:
  mupdf/trunk/0001-Set-noexecstack-on-linker-generated-binary-data-files.patch
Modified:
  mupdf/trunk/PKGBUILD

------------------------------------------------------------------+
 0001-Set-noexecstack-on-linker-generated-binary-data-files.patch |   24 ++++++++++
 PKGBUILD                                                         |    7 ++
 2 files changed, 30 insertions(+), 1 deletion(-)

Added: 0001-Set-noexecstack-on-linker-generated-binary-data-files.patch
===================================================================
--- 0001-Set-noexecstack-on-linker-generated-binary-data-files.patch	                        (rev 0)
+++ 0001-Set-noexecstack-on-linker-generated-binary-data-files.patch	2020-06-22 18:13:36 UTC (rev 650827)
@@ -0,0 +1,24 @@
+From: Tor Andersson <tor.andersson at artifex.com>
+Date: Thu, 4 Jun 2020 14:38:01 +0000 (+0200)
+Subject: Set noexecstack on linker-generated binary data files.
+X-Git-Url: https://git.ghostscript.com/?p=mupdf.git;a=commitdiff_plain;h=e52e0c2c0297d70d0e4fc293ccd047becb18f322;hp=a86b1fa0119edef1683dc06f035bd329b54613a5
+
+Set noexecstack on linker-generated binary data files.
+
+This will prevent the linker from flagging the mupdf library and
+executables as needing an executable stack.
+---
+
+diff --git a/Makefile b/Makefile
+index f812ac074..417663dd8 100644
+--- a/Makefile
++++ b/Makefile
+@@ -64,7 +64,7 @@ endif
+ LINK_CMD = $(QUIET_LINK) $(MKTGTDIR) ; $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+ TAGS_CMD = $(QUIET_TAGS) ctags -R --c-kinds=+p
+ WINDRES_CMD = $(QUIET_WINDRES) $(MKTGTDIR) ; $(WINDRES) $< $@
+-OBJCOPY_CMD = $(QUIET_OBJCOPY) $(MKTGTDIR) ; $(LD) -r -b binary -o $@ $<
++OBJCOPY_CMD = $(QUIET_OBJCOPY) $(MKTGTDIR) ; $(LD) -r -b binary -z noexecstack -o $@ $<
+ 
+ # --- Rules ---
+ 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-22 18:02:40 UTC (rev 650826)
+++ PKGBUILD	2020-06-22 18:13:36 UTC (rev 650827)
@@ -8,7 +8,7 @@
 pkgbase=mupdf
 pkgname=(libmupdf mupdf mupdf-gl mupdf-tools)
 pkgver=1.17.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Lightweight PDF and XPS viewer'
 arch=('x86_64')
 url='https://mupdf.com/'
@@ -18,9 +18,11 @@
 # we need static libs for zathura-pdf-mupdf
 options=('staticlibs')
 source=("https://mupdf.com/downloads/archive/mupdf-${pkgver/_/}-source.tar.xz"
+        '0001-Set-noexecstack-on-linker-generated-binary-data-files.patch'
         'mupdf.desktop'
         'mupdf.xpm')
 sha256sums=('c935fb2593d9a28d9b56b59dad6e3b0716a6790f8a257a68fa7dcb4430bc6086'
+            '53e3ccc9dd613277a1cfb99dcf7e71216c8497a84f6a7663a2fbff9d58a10be5'
             'ccff66979249bd4ab4ba8918660f194eb90eb0ae231b16e36a6cecdcf471883f'
             'a435f44425f5432c074dee745d8fbaeb879038ec1f1ec64f037c74662f09aca8')
 
@@ -29,6 +31,9 @@
 
   # remove bundled packages, we want our system libraries
   rm -rf thirdparty/{freeglut,freetype,harfbuzz,jbig2dec,libjpeg,openjpeg,zlib}
+
+  # Set noexecstack on linker-generated binary data files.
+  patch -Np1 < ../0001-Set-noexecstack-on-linker-generated-binary-data-files.patch
 }
 
 build() {