diff options
Diffstat (limited to 'app-text/mupdf')
-rw-r--r-- | app-text/mupdf/Manifest | 13 | ||||
-rw-r--r-- | app-text/mupdf/files/mupdf-1.14-libressl.patch | 45 | ||||
-rw-r--r-- | app-text/mupdf/files/mupdf-1.18-Makefile.patch | 42 | ||||
-rw-r--r-- | app-text/mupdf/files/mupdf-1.18.0-cross-fixes.patch | 128 | ||||
-rw-r--r-- | app-text/mupdf/files/mupdf-1.18.0-fix-oob-in-pdf-layer.c | 102 | ||||
-rw-r--r-- | app-text/mupdf/files/mupdf-1.18.0-fix-oob-in-pixmap.c | 41 | ||||
-rw-r--r-- | app-text/mupdf/metadata.xml | 4 | ||||
-rw-r--r-- | app-text/mupdf/mupdf-1.17.0.ebuild | 2 | ||||
-rw-r--r-- | app-text/mupdf/mupdf-1.18.0-r2.ebuild (renamed from app-text/mupdf/mupdf-1.16.1.ebuild) | 96 |
9 files changed, 382 insertions, 91 deletions
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest index 2eee55978e35..6ddeaf5e2d33 100644 --- a/app-text/mupdf/Manifest +++ b/app-text/mupdf/Manifest @@ -1,12 +1,15 @@ AUX mupdf-1.10a-add-desktop-pc-xpm-files.patch 13387 BLAKE2B e0100380b328cfd8ce6099c35886a6f2e9508f6d08c678dbc1386e88998d01bdacd160020dc6ceefffbe09f4cf2b64d08acfb76f8535ffcc0dc93c65a3a2da78 SHA512 1d6ccfccf785cca01b1a607e94f90a5e31c748154e9fa7664b9863c7b26951f17a584ffc7cd23dd83d1e547498e22c902067e9695006824017e69d33dbf25a5b -AUX mupdf-1.14-libressl.patch 1362 BLAKE2B b52ccec0a03d97b357d5329317143595e0cf3029179b91f3d6134f6b59e313ed71063aee97d1192630fb64bd237997b1a56a6a55461b5e434297756e234990ef SHA512 3094d427a7beedc756e47a367423ffe7c8221f9078bd7bef5e8dddba615e918824778cc8118cd656b2dd1d8c235c770631241eb84a46551c96c32906a7986281 AUX mupdf-1.15-CFLAGS.patch 376 BLAKE2B ace255a4110df9200d627ac68f5950218eeaa993bbd37fa7fe2d676572cad02d50a632750e6a9bdf6269cd97501f709d075a79d7db8b9832909b59b33251b594 SHA512 c00cd5cb30d33a9cbc55557cab3c4e2be1ae86121c5b1b28b6e35f97f93751aa2e96e106f13b7f365a56ebcce8e1c5e4163a440e8c85a48130803f5a7aec63ed AUX mupdf-1.15-Makefile.patch 1189 BLAKE2B 21447e2fd8ca7c396b9b2bd5e1e70ac6ebff5dc8dcbde273e0b23e17281cf2fe16f7a53587f9b0a3b2af1837f3ed5fc4a19666a4cdfa5d491e8b9be71519e1a8 SHA512 6c696b5a522116d075ee1a4759cdf3cae2e8836315f2898a51c15e227d4d57b44095a9927e7d66ab7d522ba6e0c65eed10a379d9e80b791ee8b6022933f615ab AUX mupdf-1.15-openssl-x11.patch 735 BLAKE2B 03e53970a145db913bad9c03de899ffeb7eed3abfad4d3db15819d5e101ba03e376fc0faea9c4939b7167b276fffe022975bae2e99238d5b4bee92edfb924fd5 SHA512 028930d5e6c86a9052de6e1e0f3e937d89a3f22e10b7fb71f1dba998c480c9914520e4248c21d68291c6fd7684c627b5068c1bb2e027ff6a518d1ca5533eb677 AUX mupdf-1.16.1-freeglut-fg_gl2-gcc-10.patch 3410 BLAKE2B 1181234b618d52766e159366bd4358776ec39fc7091c05025a6a70cf626427fb3a36c0909569d4be22aba8c9695366d0b8a61592f5bbab766efbe8190077d66d SHA512 069c8150402fc463def14ff5690ecfe8a376579ad8319bf79f90823a04799bef1bfa25e79b759a0e027595a114bd3cf48f613541eeb2eec2c85e31d2105062f6 AUX mupdf-1.17.0-cross-fixes.patch 4554 BLAKE2B 7956aea05180adc50805f56c000b0704cbaf1eb538889f1569e9f536984fb11581c36956edabb704f519285513aad01cbe0ba5a107838996937c2efa398a9c07 SHA512 0fc71632744a5fe15cace6c7b185b108e78b6676c03f204ba52e90826e7be17039b427a50697004798d51ea357828035e897d2d3ce91da95ea0f2a1a0c668fba -DIST mupdf-1.16.1-source.tar.xz 45800404 BLAKE2B bc4158a457056c55db52a518efc13c289cca537c29a6b563046297dc225f3ce0add781adb8520c4d0829d653ed0539042597e341cb21c4fb4c462ed422bf735b SHA512 fa657e6b9251aff91c25e91b335ea829b797dd91a759505bfd7259f8236613f590a044bc741e9b0587da55817a1ab8c1499c067d65d683d099259d06d91a8f50 +AUX mupdf-1.18-Makefile.patch 1246 BLAKE2B e0054c441b067ef4aec069cb0fd4342f16919af51ac53096f20a2dbc87a81e2bece8478441df493d6825eedca53f4c9634cfe8724980da119d0ac20035a4d423 SHA512 def7524e0468ca15220b2d9c718ef61da4ce007c43f591ae3ad80afe55f86549985b1c5ec3d3d266045a0a6ca399580f8f4e001893d4feaabb7785a8a4df278e +AUX mupdf-1.18.0-cross-fixes.patch 5830 BLAKE2B e91e41b4889f2716d20b112b18924799db5d21274feb3699f2bca04fd3d93528d86e2ef05ccf25d1a0800e81a333d0703f837d45fef926746aeec1ece60c6ced SHA512 0e7a91474c3f31a5d5f7ddc461d74f1bc0cc8de7eb7bedbaa0f6335a6038327f5c7261d16baade5dba567b3d1ad49adf7a65ea40b226fca5f1eb58cc7bc0b07a +AUX mupdf-1.18.0-fix-oob-in-pdf-layer.c 3462 BLAKE2B 861f5d6d0f81aed837d19ed19ba54158856bed5cab3ce8202bad11bb509b017e554ea37d9ebd05213386251b26bce10f83311c3de99fe663bf2995adc1231a9e SHA512 91620d0d429d2f4068e1834ec9466d9e9f9bfb363fba33247636e38651196580a89bd36785e42b31328070c42bd2210585ddabea8a0a970d72e7066e61804d6c +AUX mupdf-1.18.0-fix-oob-in-pixmap.c 1123 BLAKE2B d49194b540b489ad9d3a4b5057bbe6ac3a1414d0123b7c2d4710adad1ed7fd439f8e83162d07a86aee6bd778c35ea6798da166461ac6e358af6910cc6b492624 SHA512 1d836c1a3f37c21ed349da799d5cb0c57d3fc275a632a42343cda81aae76394273c06230fc9c22a6d5366498b51a057d5a11797376a4b2af96b937618ba31e11 DIST mupdf-1.17.0-source.tar.xz 48559964 BLAKE2B f46b09a6d288054da79bea356df4d7d98fe2759cf82bea1f0df2e961b94acebbab58826f7a731c4c68e8b086fd9367fddcabea6c7d2838f25ed84ddc1a0c2bd9 SHA512 39188e6ce3eaefb525b2c32767c4bf52ed881b41889edef086aa64bfe1c38e6f3cb853450c8284d175ef8854f32e9bc67415a692048ead26cf31c35645f9e0e5 -EBUILD mupdf-1.16.1.ebuild 3482 BLAKE2B 2f8f19e665bb7f60a55f08fd841a05e2f5388831d1eeb7bf903bc2014d2723c93bc363fb4930295d54b932e42ec0ef05dc966e5b64cc1c9af0e89727251d84c1 SHA512 90b0634cd1ee1c29c6dc91e563c26f24736429c7be164855df4ece40967ca6b5e1af2d10e5743bcb83e05aed607ffb771115960bb7c299696ec796fb4704e211 -EBUILD mupdf-1.17.0.ebuild 4380 BLAKE2B d0eafbaef397afb3369730800a075c50210c5e057bd598faa59eb40cd52a5258016a61664ad2b6e1787922412a49934dcd2bf288a28f20e7af95f6cf58b0f8a7 SHA512 474615ea48c4cb505b48cb2b59c2ca7456a4da7cf5b2610f9e3dd977a88161a6aaf64946f7c0e63faaf7c5bc1609244a2db4ff429a53a4ff07babd7212d07f37 -MISC metadata.xml 245 BLAKE2B 26bf988c73d073000ab8d21ea881c4088b90e7081410938828744375bfa8de31cce2c78154ccfc61105c853c1f24f4994ca4e5cbb80c4c89dfd489bbd10a09ee SHA512 ecb8a4621081ccdd43f08e4f560b0bc820c27d6a282c87e1a8f77137ec8b215188fe31f11fc6379533afee2ebe7e14d5395a45c1aab9abfe423fd832dba692a4 +DIST mupdf-1.18.0-source.tar.xz 53621544 BLAKE2B d0057f4240bd4f6b4b6d9381ae1c3871c56b97604d5c6ea6438a8bde72d4696c10a9f0e8e2ed8f43d63a04bb1d973bade8a708327c00b0d0c6802b28af697a55 SHA512 7551f18b9bac6e2dc1cf073741cbc975ce3a16dc7e37c9d5a58254c67bf2c07bb36185d6585e435d4126f3ae351f67d7432d19a986c9b47b15105ca43db0edb8 +EBUILD mupdf-1.17.0.ebuild 4380 BLAKE2B 3c75b04d913c07617c738c1fdb6b87a6ab762f5fbf51cf723c8e485516b6de55aabd42857d9f84bc7131f8fac360df9cba112d0e5e40314f4624fdfb5d2ec7f1 SHA512 ae5b7d2b3374cdef700b65669fe3179b63e343a319e1f3c0ca1e624dcf8eca0819d8ec82d33ab348cd2e5d051a94b686e4f2dc3e4f9ad32a09b9a15cd966ff28 +EBUILD mupdf-1.18.0-r2.ebuild 4109 BLAKE2B 6478c0ad3f650356d8e9a0ffc1eabeb569ec0f2eb545356793575ab1e37a4f91d5cb5eb008f83c33fe5baee80622e75e5b1dc503442d6e093fd11e57806c9204 SHA512 6efc10e3f3c5f5f7a4fe86f909589dd0c7ea2a58fbf1e94bcde66de61b649d924023601774cb22f1c5ba89d33fd489938058a796c5f0a687e2267b162caee7b2 +MISC metadata.xml 345 BLAKE2B 6adf08490e4a701eeb6ab07c2e5619cff42ff02bf75ec38fd94f215f000972f0b3d88c8b0fab827728dd12d7906dd580b7650f11da1d77964eb5fddd773ee4a9 SHA512 32902c1fac57a44927a53dbb52fb22cb04317bcdf3dd2ae8e9863bef557178e33565bb122e128908c61ade9a5e2d1f067c530ff05e7ed0242eccf193e6fa2026 diff --git a/app-text/mupdf/files/mupdf-1.14-libressl.patch b/app-text/mupdf/files/mupdf-1.14-libressl.patch deleted file mode 100644 index fcc0a7205c1c..000000000000 --- a/app-text/mupdf/files/mupdf-1.14-libressl.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 8561b744ac95ab6145a1163fa1d7c490a3329465 Mon Sep 17 00:00:00 2001 -From: William <wonko@undefined.re> -Date: Mon, 12 Nov 2018 16:50:07 +0100 -Subject: [PATCH] hardcode missing ssl functions - ---- - source/helpers/pkcs7/pkcs7-openssl.c | 22 ++++++++++++++++++++++ - 1 file changed, 22 insertions(+) - -diff --git a/source/helpers/pkcs7/pkcs7-openssl.c b/source/helpers/pkcs7/pkcs7-openssl.c -index 58dbf65..2b1f9e9 100644 ---- a/source/helpers/pkcs7/pkcs7-openssl.c -+++ b/source/helpers/pkcs7/pkcs7-openssl.c -@@ -511,6 +511,28 @@ static void signer_drop_designated_name(pdf_pkcs7_signer *signer, pdf_pkcs7_desi - fz_free(osigner->ctx, dn); - } - -+int -+PKCS12_SAFEBAG_get_nid(const PKCS12_SAFEBAG *bag) -+{ -+ return OBJ_obj2nid(bag->type); -+} -+ -+const STACK_OF(PKCS12_SAFEBAG) * -+PKCS12_SAFEBAG_get0_safes(const PKCS12_SAFEBAG *bag) -+{ -+ if (OBJ_obj2nid(bag->type) != NID_safeContentsBag) -+ return NULL; -+ return bag->value.safes; -+} -+ -+const PKCS8_PRIV_KEY_INFO * -+PKCS12_SAFEBAG_get0_p8inf(const PKCS12_SAFEBAG *bag) -+{ -+ if (PKCS12_SAFEBAG_get_nid(bag) != NID_keyBag) -+ return NULL; -+ return bag->value.keybag; -+} -+ - static void add_from_bags(X509 **pX509, EVP_PKEY **pPkey, const STACK_OF(PKCS12_SAFEBAG) *bags, const char *pw); - - static void add_from_bag(X509 **pX509, EVP_PKEY **pPkey, PKCS12_SAFEBAG *bag, const char *pw) --- -2.19.1 - diff --git a/app-text/mupdf/files/mupdf-1.18-Makefile.patch b/app-text/mupdf/files/mupdf-1.18-Makefile.patch new file mode 100644 index 000000000000..32ee7e57c493 --- /dev/null +++ b/app-text/mupdf/files/mupdf-1.18-Makefile.patch @@ -0,0 +1,42 @@ +diff --git a/Makefile b/Makefile +index b0fb617..528e117 100644 +--- a/Makefile ++++ b/Makefile +@@ -3,7 +3,7 @@ + -include user.make + + ifndef build +- build := release ++ build := debug + endif + + ifndef OUT +@@ -214,13 +214,15 @@ MUPDF_LIB = $(OUT)/libmupdf.$(SO) + + $(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_OBJ) $(THREAD_OBJ) $(PKCS7_OBJ) + else +-MUPDF_LIB = $(OUT)/libmupdf.a +-THIRD_LIB = $(OUT)/libmupdf-third.a ++MUPDF_LIB = libmupdf.so.$(GENTOO_PV) ++MUPDF_STATIC = $(OUT)/libmupdf.a ++THIRD_LIB = + THREAD_LIB = $(OUT)/libmupdf-threads.a + PKCS7_LIB = $(OUT)/libmupdf-pkcs7.a + +-$(MUPDF_LIB) : $(MUPDF_OBJ) +-$(THIRD_LIB) : $(THIRD_OBJ) ++$(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_OBJ) ++ $(QUIET_LINK) $(CC) $(LDFLAGS) --shared -Wl,-soname -Wl,$(MUPDF_LIB) -o $@ $^ $(THIRD_LIBS) $(LIBS) ++$(MUPDF_STATIC): $(MUPDF_OBJ) $(THIRD_OBJ) + $(THREAD_LIB) : $(THREAD_OBJ) + $(PKCS7_LIB) : $(PKCS7_OBJ) + endif +@@ -374,7 +376,7 @@ install: libs apps + + install -d $(DESTDIR)$(docdir) + install -d $(DESTDIR)$(docdir)/examples +- install -m 644 README COPYING CHANGES $(DESTDIR)$(docdir) ++ install -m 644 README CHANGES $(DESTDIR)$(docdir) + install -m 644 docs/*.html docs/*.css docs/*.png $(DESTDIR)$(docdir) + install -m 644 docs/examples/* $(DESTDIR)$(docdir)/examples + diff --git a/app-text/mupdf/files/mupdf-1.18.0-cross-fixes.patch b/app-text/mupdf/files/mupdf-1.18.0-cross-fixes.patch new file mode 100644 index 000000000000..0576033a03a2 --- /dev/null +++ b/app-text/mupdf/files/mupdf-1.18.0-cross-fixes.patch @@ -0,0 +1,128 @@ +Refreshed patches based on: +https://sources.debian.org/patches/mupdf/1.17.0+ds1-1/0004-MuPDF-crossbuild-use-target-arch-pkg-config.patch/ +https://sources.debian.org/patches/mupdf/1.17.0+ds1-1/0005-MuPDF-crossbuild-use-host-cc-for-utils.patch/ +--- a/Makefile ++++ b/Makefile +@@ -147,6 +147,9 @@ PKCS7_OBJ := $(PKCS7_SRC:%.c=$(OUT)/%.o) + + HEXDUMP_EXE := $(OUT)/scripts/hexdump.exe + ++$(HEXDUMP_EXE): scripts/hexdump.c ++ $(QUIET_CC) $(MKTGTDIR) ; $(CC_FOR_BUILD) $(CFLAGS) -o $@ $< ++ + FONT_BIN := $(sort $(wildcard resources/fonts/urw/*.cff)) + FONT_BIN += $(sort $(wildcard resources/fonts/han/*.ttc)) + FONT_BIN += $(sort $(wildcard resources/fonts/droid/*.ttf)) +--- a/Makerules ++++ b/Makerules +@@ -6,6 +6,9 @@ OS := $(OS:MSYS%=MINGW) + OS := $(OS:Windows_NT=MINGW) + OS := $(OS:Darwin=MACOS) + ++PKG_CONFIG ?= pkg-config ++CC_FOR_BUILD ?= $(CC) ++ + ifeq ($(findstring -fembed-bitcode,$(XCFLAGS)),) + # clang does not support these in combination with -fembed-bitcode + CFLAGS += -ffunction-sections -fdata-sections +@@ -128,51 +128,51 @@ else ifeq ($(OS),MACOS) + else ifeq ($(OS),Linux) + HAVE_OBJCOPY := yes + +- ifeq ($(shell pkg-config --exists freetype2 && echo yes),yes) +- SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2) +- SYS_FREETYPE_LIBS := $(shell pkg-config --libs freetype2) ++ ifeq ($(shell $(PKG_CONFIG) --exists freetype2 && echo yes),yes) ++ SYS_FREETYPE_CFLAGS := $(shell $(PKG_CONFIG) --cflags freetype2) ++ SYS_FREETYPE_LIBS := $(shell $(PKG_CONFIG) --libs freetype2) + endif +- ifeq ($(shell pkg-config --exists gumbo && echo yes),yes) +- SYS_GUMBO_CFLAGS := $(shell pkg-config --cflags gumbo) +- SYS_GUMBO_LIBS := $(shell pkg-config --libs gumbo) ++ ifeq ($(shell $(PKG_CONFIG) --exists gumbo && echo yes),yes) ++ SYS_GUMBO_CFLAGS := $(shell $(PKG_CONFIG) --cflags gumbo) ++ SYS_GUMBO_LIBS := $(shell $(PKG_CONFIG) --libs gumbo) + endif +- ifeq ($(shell pkg-config --exists harfbuzz && echo yes),yes) +- SYS_HARFBUZZ_CFLAGS := $(shell pkg-config --cflags harfbuzz) +- SYS_HARFBUZZ_LIBS := $(shell pkg-config --libs harfbuzz) ++ ifeq ($(shell $(PKG_CONFIG) --exists harfbuzz && echo yes),yes) ++ SYS_HARFBUZZ_CFLAGS := $(shell $(PKG_CONFIG) --cflags harfbuzz) ++ SYS_HARFBUZZ_LIBS := $(shell $(PKG_CONFIG) --libs harfbuzz) + endif +- ifeq ($(shell pkg-config --exists lcms2 && echo yes),yes) +- SYS_LCMS2_CFLAGS := $(shell pkg-config --cflags lcms2) +- SYS_LCMS2_LIBS := $(shell pkg-config --libs lcms2) ++ ifeq ($(shell $(PKG_CONFIG) --exists lcms2 && echo yes),yes) ++ SYS_LCMS2_CFLAGS := $(shell $(PKG_CONFIG) --cflags lcms2) ++ SYS_LCMS2_LIBS := $(shell $(PKG_CONFIG) --libs lcms2) + endif +- ifeq ($(shell pkg-config --exists libjpeg && echo yes),yes) +- SYS_LIBJPEG_CFLAGS := $(shell pkg-config --cflags libjpeg) +- SYS_LIBJPEG_LIBS := $(shell pkg-config --libs libjpeg) ++ ifeq ($(shell $(PKG_CONFIG) --exists libjpeg && echo yes),yes) ++ SYS_LIBJPEG_CFLAGS := $(shell $(PKG_CONFIG) --cflags libjpeg) ++ SYS_LIBJPEG_LIBS := $(shell $(PKG_CONFIG) --libs libjpeg) + endif +- ifeq ($(shell pkg-config --exists libopenjp2 && echo yes),yes) +- SYS_OPENJPEG_CFLAGS := $(shell pkg-config --cflags libopenjp2) +- SYS_OPENJPEG_LIBS := $(shell pkg-config --libs libopenjp2) ++ ifeq ($(shell $(PKG_CONFIG) --exists libopenjp2 && echo yes),yes) ++ SYS_OPENJPEG_CFLAGS := $(shell $(PKG_CONFIG) --cflags libopenjp2) ++ SYS_OPENJPEG_LIBS := $(shell $(PKG_CONFIG) --libs libopenjp2) + endif +- ifeq ($(shell pkg-config --exists zlib && echo yes),yes) +- SYS_ZLIB_CFLAGS := $(shell pkg-config --cflags zlib) +- SYS_ZLIB_LIBS := $(shell pkg-config --libs zlib) ++ ifeq ($(shell $(PKG_CONFIG) --exists zlib && echo yes),yes) ++ SYS_ZLIB_CFLAGS := $(shell $(PKG_CONFIG) --cflags zlib) ++ SYS_ZLIB_LIBS := $(shell $(PKG_CONFIG) --libs zlib) + endif + +- HAVE_LEPTONICA := $(shell pkg-config --exists 'lept >= 1.7.4' && echo yes) ++ HAVE_LEPTONICA := $(shell $(PKG_CONFIG) --exists 'lept >= 1.7.4' && echo yes) + ifeq ($(HAVE_LEPTONICA),yes) +- SYS_LEPTONICA_CFLAGS := $(shell pkg-config --cflags lept) +- SYS_LEPTONICA_LIBS := $(shell pkg-config --libs lept) ++ SYS_LEPTONICA_CFLAGS := $(shell $(PKG_CONFIG) --cflags lept) ++ SYS_LEPTONICA_LIBS := $(shell $(PKG_CONFIG) --libs lept) + endif + +- HAVE_TESSERACT := $(shell pkg-config --exists 'tesseract-ocr >= 4.0.0' && echo yes) ++ HAVE_TESSERACT := $(shell $(PKG_CONFIG) --exists 'tesseract-ocr >= 4.0.0' && echo yes) + ifeq ($(HAVE_TESSERACT),yes) +- SYS_TESSERACT_CFLAGS := $(shell pkg-config --cflags tesseract) +- SYS_TESSERACT_LIBS := $(shell pkg-config --libs tesseract) ++ SYS_TESSERACT_CFLAGS := $(shell $(PKG_CONFIG) --cflags tesseract) ++ SYS_TESSERACT_LIBS := $(shell $(PKG_CONFIG) --libs tesseract) + endif + +- HAVE_SYS_CURL := $(shell pkg-config --exists libcurl && echo yes) ++ HAVE_SYS_CURL := $(shell $(PKG_CONFIG) --exists libcurl && echo yes) + ifeq ($(HAVE_SYS_CURL),yes) +- SYS_CURL_CFLAGS := $(shell pkg-config --cflags libcurl) +- SYS_CURL_LIBS := $(shell pkg-config --libs libcurl) ++ SYS_CURL_CFLAGS := $(shell $(PKG_CONFIG) --cflags libcurl) ++ SYS_CURL_LIBS := $(shell $(PKG_CONFIG) --libs libcurl) + endif + + HAVE_GLUT := yes +@@ -183,14 +183,14 @@ else ifeq ($(OS),Linux) + + HAVE_X11 := not-unless-portage-tells-me + ifeq ($(HAVE_X11),yes) +- X11_CFLAGS := $(shell pkg-config --cflags x11 xext) +- X11_LIBS := $(shell pkg-config --libs x11 xext) ++ X11_CFLAGS := $(shell $(PKG_CONFIG) --cflags x11 xext) ++ X11_LIBS := $(shell $(PKG_CONFIG) --libs x11 xext) + endif + + HAVE_LIBCRYPTO := not-unless-portage-tells-me + ifeq ($(HAVE_LIBCRYPTO),yes) +- LIBCRYPTO_CFLAGS := $(shell pkg-config --cflags libcrypto) -DHAVE_LIBCRYPTO +- LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto) ++ LIBCRYPTO_CFLAGS := $(shell $(PKG_CONFIG) --cflags libcrypto) -DHAVE_LIBCRYPTO ++ LIBCRYPTO_LIBS := $(shell $(PKG_CONFIG) --libs libcrypto) + endif + + HAVE_PTHREAD := yes diff --git a/app-text/mupdf/files/mupdf-1.18.0-fix-oob-in-pdf-layer.c b/app-text/mupdf/files/mupdf-1.18.0-fix-oob-in-pdf-layer.c new file mode 100644 index 000000000000..dc4000b4cde6 --- /dev/null +++ b/app-text/mupdf/files/mupdf-1.18.0-fix-oob-in-pdf-layer.c @@ -0,0 +1,102 @@ +From b82e9b6d6b46877e5c3763cc3bc641c66fa7eb54 Mon Sep 17 00:00:00 2001 +From: Robin Watts <Robin.Watts@artifex.com> +Date: Thu, 8 Oct 2020 16:15:40 +0100 +Subject: [PATCH] Bug 701297: Harden populate_ui against unexpected repairs. + +We count the number of layers, and allocate space for them in +an array. We then walk the tree reading details of those layers +in. If we hit a problem that causes a repair while reading the +information, the number of layers can magically increase. In +the existing code we run off the end of the array. + +In the new code we watch for hitting the end of the array and +realloc as required. +--- + source/pdf/pdf-layer.c | 32 +++++++++++++++++++++++++------- + 1 file changed, 25 insertions(+), 7 deletions(-) + +diff --git a/source/pdf/pdf-layer.c b/source/pdf/pdf-layer.c +index 177f0c947..b8e9d7cad 100644 +--- a/source/pdf/pdf-layer.c ++++ b/source/pdf/pdf-layer.c +@@ -104,10 +104,27 @@ count_entries(fz_context *ctx, pdf_obj *obj) + } + + static pdf_ocg_ui * +-populate_ui(fz_context *ctx, pdf_ocg_descriptor *desc, pdf_ocg_ui *ui, pdf_obj *order, int depth, pdf_obj *rbgroups, pdf_obj *locked) ++get_ocg_ui(fz_context *ctx, pdf_ocg_descriptor *desc, int fill) ++{ ++ if (fill == desc->num_ui_entries) ++ { ++ /* Number of layers changed while parsing; ++ * probably due to a repair. */ ++ int newsize = desc->num_ui_entries * 2; ++ if (newsize == 0) ++ newsize = 4; /* Arbitrary non-zero */ ++ desc->ui = fz_realloc_array(ctx, desc->ui, newsize, pdf_ocg_ui); ++ desc->num_ui_entries = newsize; ++ } ++ return &desc->ui[fill]; ++} ++ ++static int ++populate_ui(fz_context *ctx, pdf_ocg_descriptor *desc, int fill, pdf_obj *order, int depth, pdf_obj *rbgroups, pdf_obj *locked) + { + int len = pdf_array_len(ctx, order); + int i, j; ++ pdf_ocg_ui *ui; + + for (i = 0; i < len; i++) + { +@@ -118,7 +135,7 @@ populate_ui(fz_context *ctx, pdf_ocg_descriptor *desc, pdf_ocg_ui *ui, pdf_obj * + continue; + + fz_try(ctx) +- ui = populate_ui(ctx, desc, ui, o, depth+1, rbgroups, locked); ++ fill = populate_ui(ctx, desc, fill, o, depth+1, rbgroups, locked); + fz_always(ctx) + pdf_unmark_obj(ctx, o); + fz_catch(ctx) +@@ -126,14 +143,14 @@ populate_ui(fz_context *ctx, pdf_ocg_descriptor *desc, pdf_ocg_ui *ui, pdf_obj * + + continue; + } +- ui->depth = depth; + if (pdf_is_string(ctx, o)) + { ++ ui = get_ocg_ui(ctx, desc, fill++); ++ ui->depth = depth; + ui->ocg = -1; + ui->name = pdf_to_str_buf(ctx, o); + ui->button_flags = PDF_LAYER_UI_LABEL; + ui->locked = 1; +- ui++; + continue; + } + +@@ -144,13 +161,14 @@ populate_ui(fz_context *ctx, pdf_ocg_descriptor *desc, pdf_ocg_ui *ui, pdf_obj * + } + if (j == desc->len) + continue; /* OCG not found in main list! Just ignore it */ ++ ui = get_ocg_ui(ctx, desc, fill++); ++ ui->depth = depth; + ui->ocg = j; + ui->name = pdf_dict_get_string(ctx, o, PDF_NAME(Name), NULL); + ui->button_flags = pdf_array_contains(ctx, o, rbgroups) ? PDF_LAYER_UI_RADIOBOX : PDF_LAYER_UI_CHECKBOX; + ui->locked = pdf_array_contains(ctx, o, locked); +- ui++; + } +- return ui; ++ return fill; + } + + static void +@@ -188,7 +206,7 @@ load_ui(fz_context *ctx, pdf_ocg_descriptor *desc, pdf_obj *ocprops, pdf_obj *oc + desc->ui = Memento_label(fz_calloc(ctx, count, sizeof(pdf_ocg_ui)), "pdf_ocg_ui"); + fz_try(ctx) + { +- (void)populate_ui(ctx, desc, desc->ui, order, 0, rbgroups, locked); ++ desc->num_ui_entries = populate_ui(ctx, desc, 0, order, 0, rbgroups, locked); + } + fz_catch(ctx) + { diff --git a/app-text/mupdf/files/mupdf-1.18.0-fix-oob-in-pixmap.c b/app-text/mupdf/files/mupdf-1.18.0-fix-oob-in-pixmap.c new file mode 100644 index 000000000000..d19f0593a119 --- /dev/null +++ b/app-text/mupdf/files/mupdf-1.18.0-fix-oob-in-pixmap.c @@ -0,0 +1,41 @@ +From 32e4e8b4bcbacbf92af7c88337efae21986d9603 Mon Sep 17 00:00:00 2001 +From: Robin Watts <Robin.Watts@artifex.com> +Date: Thu, 8 Oct 2020 18:10:28 +0100 +Subject: [PATCH] Bug 702958: Fix overflow in fz_clear_pixmap_with_value. + +--- + source/fitz/pixmap.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/source/fitz/pixmap.c b/source/fitz/pixmap.c +index 66873d214..80d8bb62f 100644 +--- a/source/fitz/pixmap.c ++++ b/source/fitz/pixmap.c +@@ -555,7 +555,8 @@ void + fz_clear_pixmap_with_value(fz_context *ctx, fz_pixmap *pix, int value) + { + unsigned char *s; +- int w, h, n, stride, len; ++ int w, h, n; ++ ptrdiff_t stride, len; + int alpha = pix->alpha; + + w = pix->w; +@@ -572,7 +573,7 @@ fz_clear_pixmap_with_value(fz_context *ctx, fz_pixmap *pix, int value) + + n = pix->n; + stride = pix->stride; +- len = w * n; ++ len = (ptrdiff_t)w * n; + + s = pix->samples; + if (value == 255 || !alpha) +@@ -584,7 +585,7 @@ fz_clear_pixmap_with_value(fz_context *ctx, fz_pixmap *pix, int value) + } + while (h--) + { +- memset(s, value, (unsigned int)len); ++ memset(s, value, len); + s += stride; + } + } diff --git a/app-text/mupdf/metadata.xml b/app-text/mupdf/metadata.xml index 15fd2f3a22be..82b29f9cae62 100644 --- a/app-text/mupdf/metadata.xml +++ b/app-text/mupdf/metadata.xml @@ -5,4 +5,8 @@ <email>johu@gentoo.org</email> <name>Johannes Huber</name> </maintainer> + <maintainer type="person"> + <email>sam@gentoo.org</email> + <name>Sam James</name> + </maintainer> </pkgmetadata> diff --git a/app-text/mupdf/mupdf-1.17.0.ebuild b/app-text/mupdf/mupdf-1.17.0.ebuild index 73a2ee992231..f195aa318853 100644 --- a/app-text/mupdf/mupdf-1.17.0.ebuild +++ b/app-text/mupdf/mupdf-1.17.0.ebuild @@ -5,7 +5,7 @@ EAPI=7 inherit desktop flag-o-matic toolchain-funcs xdg -DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C" +DESCRIPTION="A lightweight PDF viewer and toolkit written in portable C" HOMEPAGE="https://mupdf.com/" SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz" S="${WORKDIR}/${P}-source" diff --git a/app-text/mupdf/mupdf-1.16.1.ebuild b/app-text/mupdf/mupdf-1.18.0-r2.ebuild index d93fa2a0f2ed..dcce0f82d29a 100644 --- a/app-text/mupdf/mupdf-1.16.1.ebuild +++ b/app-text/mupdf/mupdf-1.18.0-r2.ebuild @@ -3,65 +3,66 @@ EAPI=7 -inherit flag-o-matic toolchain-funcs xdg desktop +inherit desktop flag-o-matic toolchain-funcs xdg -DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C" +DESCRIPTION="A lightweight PDF viewer and toolkit written in portable C" HOMEPAGE="https://mupdf.com/" SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz" +S="${WORKDIR}/${P}-source" LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="X +javascript libressl opengl ssl static-libs" +KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 x86" +IUSE="X +javascript libressl opengl ssl" +REQUIRED_USE="opengl? ( javascript )" # Although we use the bundled, patched version of freeglut in mupdf (because of # bug #653298), the best way to ensure that its dependencies are present is to # install system's freeglut. +BDEPEND="virtual/pkgconfig" RDEPEND=" - media-libs/freetype:2=[static-libs?] - media-libs/harfbuzz:=[static-libs?,truetype] - media-libs/jbig2dec:=[static-libs?] - media-libs/libpng:0=[static-libs?] - >=media-libs/openjpeg-2.1:2=[static-libs?] - virtual/jpeg[static-libs?] - opengl? ( >=media-libs/freeglut-3.0.0:= ) + dev-libs/gumbo + media-libs/freetype:2= + media-libs/harfbuzz:=[truetype] + media-libs/jbig2dec:= + media-libs/libpng:0= + >=media-libs/openjpeg-2.1:2= + virtual/jpeg + javascript? ( >=dev-lang/mujs-1.0.7:= ) + opengl? ( >=media-libs/freeglut-3.0.0 ) ssl? ( - libressl? ( >=dev-libs/libressl-2.8:0=[static-libs?] ) - !libressl? ( >=dev-libs/openssl-1.1:0=[static-libs?] ) + libressl? ( >=dev-libs/libressl-3.1.4:0= ) + !libressl? ( >=dev-libs/openssl-1.1:0= ) ) X? ( - x11-libs/libX11[static-libs?] - x11-libs/libXext[static-libs?] + x11-libs/libX11 + x11-libs/libXext )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -REQUIRED_USE="opengl? ( !static-libs )" - -S=${WORKDIR}/${P}-source +DEPEND="${RDEPEND}" PATCHES=( "${FILESDIR}"/${PN}-1.15-CFLAGS.patch - "${FILESDIR}"/${PN}-1.15-Makefile.patch + "${FILESDIR}"/${PN}-1.18-Makefile.patch "${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch # See bugs #662352 "${FILESDIR}"/${PN}-1.15-openssl-x11.patch - "${FILESDIR}"/${PN}-1.16.1-freeglut-fg_gl2-gcc-10.patch + # General cross fixes from Debian (refreshed) + "${FILESDIR}"/${PN}-1.18.0-cross-fixes.patch + # Additional security patches post-1.18.0 + "${FILESDIR}"/${P}-fix-oob-in-pdf-layer.c + "${FILESDIR}"/${P}-fix-oob-in-pixmap.c ) src_prepare() { xdg_src_prepare - use hppa && append-cflags -ffunction-sections - use javascript || \ - sed -e '/* #define FZ_ENABLE_JS/ a\#define FZ_ENABLE_JS 0' \ - -i include/mupdf/fitz/config.h + use hppa && append-cflags -ffunction-sections - # See bug #670832 - use ssl && use libressl && eapply "${FILESDIR}"/${PN}-1.14-libressl.patch + append-cflags "-DFZ_ENABLE_JS=$(usex javascript 1 0)" sed -e "1iOS = Linux" \ -e "1iCC = $(tc-getCC)" \ + -e "1iCXX = $(tc-getCXX)" \ -e "1iLD = $(tc-getLD)" \ -e "1iAR = $(tc-getAR)" \ -e "1iverbose = yes" \ @@ -74,20 +75,36 @@ src_prepare() { _emake() { # When HAVE_OBJCOPY is yes, we end up with a lot of QA warnings. - + # Bundled libs + # * General + # Note that USE_SYSTEM_LIBS=yes is a metaoption which will set to upstream's + # recommendations. It does not mean "always use system libs". + # See [0] below for what it means in a specific version. + # + # * freeglut # We don't use system's freeglut because upstream has a special modified # version of it that gives mupdf clipboard support. See bug #653298 - + # + # * mujs # As of v1.15.0, mupdf started using symbols in mujs that were not part - # of any release. We thus go back to using the bundled version of it. - # Bug #685244 + # of any release. We then went back to using the bundled version of it. + # But v1.17.0 looks ok, so we'll go unbundled again. Be aware of this risk + # when bumping and check! + # See bug #685244 + # + # * lmms2 + # mupdf uses a bundled version of lcms2 [0] because Artifex have forked it [1]. + # It is therefore not appropriate for us to unbundle it at this time. + # + # [0] https://git.ghostscript.com/?p=mupdf.git;a=blob;f=Makethird;h=c4c540fa4a075df0db85e6fdaab809099881f35a;hb=HEAD#l9 + # [1] https://www.ghostscript.com/doc/lcms2mt/doc/WhyThisFork.txt emake \ GENTOO_PV=${PV} \ HAVE_GLUT=$(usex opengl) \ HAVE_LIBCRYPTO=$(usex ssl) \ HAVE_X11=$(usex X) \ USE_SYSTEM_LIBS=yes \ - USE_SYSTEM_MUJS=no \ + USE_SYSTEM_MUJS=$(usex javascript) \ USE_SYSTEM_GLUT=no \ HAVE_OBJCOPY=no \ "$@" @@ -95,9 +112,6 @@ _emake() { src_compile() { _emake XCFLAGS="-fpic" - - use static-libs && \ - _emake build/debug/lib${PN}.a } src_install() { @@ -105,15 +119,13 @@ src_install() { domenu platform/debian/${PN}.desktop doicon platform/debian/${PN}.xpm else - rm docs/man/${PN}.1 + rm docs/man/${PN}.1 || die fi _emake install dosym libmupdf.so.${PV} /usr/$(get_libdir)/lib${PN}.so - use static-libs && \ - dolib.a build/debug/lib${PN}.a if use opengl ; then einfo "mupdf symlink points to mupdf-gl (bug 616654)" dosym ${PN}-gl /usr/bin/${PN} @@ -121,6 +133,10 @@ src_install() { einfo "mupdf symlink points to mupdf-x11 (bug 616654)" dosym ${PN}-x11 /usr/bin/${PN} fi + + # Respect libdir (bug #734898) + sed -i -e "s:/lib:/$(get_libdir):" platform/debian/${PN}.pc || die + insinto /usr/$(get_libdir)/pkgconfig doins platform/debian/${PN}.pc |