commit: d08384446c68c67ba03615b921f35b7d4929580d Author: Michael Weber <xmw <AT> gentoo <DOT> org> AuthorDate: Mon May 8 13:23:42 2017 +0000 Commit: Michael Weber <xmw <AT> gentoo <DOT> org> CommitDate: Mon May 8 13:23:42 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0838444
app-text/mupdf: Revbump for security patch (bug 614044). Package-Manager: Portage-2.3.5, Repoman-2.3.2 .../mupdf/files/mupdf-1.11-CVE-2017-6060.patch | 15 ++ app-text/mupdf/mupdf-1.11-r1.ebuild | 152 +++++++++++++++++++++ 2 files changed, 167 insertions(+) diff --git a/app-text/mupdf/files/mupdf-1.11-CVE-2017-6060.patch b/app-text/mupdf/files/mupdf-1.11-CVE-2017-6060.patch new file mode 100644 index 00000000000..a595253e864 --- /dev/null +++ b/app-text/mupdf/files/mupdf-1.11-CVE-2017-6060.patch @@ -0,0 +1,15 @@ +X-Git-Url: http://git.ghostscript.com/?p=user%2Fsebras%2Fmupdf.git;a=blobdiff_plain;f=platform%2Fx11%2Fjstest_main.c;h=f158d9628ed0c0a84e37fe128277679e8334422a;hp=13c3a0a3ba3ff4aae29f6882d23740833c1d842f;hb=06a012a42c9884e3cd653e7826cff1ddec04eb6e;hpb=34e18d127a02146e3415b33c4b67389ce1ddb614 + +diff --git a/platform/x11/jstest_main.c b/platform/x11/jstest_main.c +index 13c3a0a..f158d96 100644 +--- a/platform/x11/jstest_main.c ++++ b/platform/x11/jstest_main.c +@@ -346,7 +346,7 @@ main(int argc, char *argv[]) + } + else if (match(&line, "OPEN")) + { +- char path[1024]; ++ char path[LONGLINE]; + if (file_open) + pdfapp_close(&gapp); + if (prefix) diff --git a/app-text/mupdf/mupdf-1.11-r1.ebuild b/app-text/mupdf/mupdf-1.11-r1.ebuild new file mode 100644 index 00000000000..f2bd343e789 --- /dev/null +++ b/app-text/mupdf/mupdf-1.11-r1.ebuild @@ -0,0 +1,152 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C" +HOMEPAGE="http://mupdf.com/"; +SRC_URI="http://mupdf.com/downloads/${P}-source.tar.gz"; + +LICENSE="AGPL-3" +SLOT="0/${PV}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" +IUSE="X +curl javascript libressl opengl +openssl static static-libs vanilla" + +LIB_DEPEND=" + !libressl? ( dev-libs/openssl:0[static-libs?] ) + libressl? ( dev-libs/libressl[static-libs?] ) + javascript? ( >=dev-lang/mujs-0_p20160504 ) + media-libs/freetype:2[static-libs?] + media-libs/harfbuzz[static-libs?] + media-libs/jbig2dec[static-libs?] + media-libs/libpng:0[static-libs?] + >=media-libs/openjpeg-2.1:2[static-libs?] + net-misc/curl[static-libs?] + virtual/jpeg[static-libs?] + X? ( x11-libs/libX11[static-libs?] + x11-libs/libXext[static-libs?] ) + opengl? ( >=media-libs/glfw-3.2 )" +RDEPEND="${LIB_DEPEND}" +DEPEND="${RDEPEND} + virtual/pkgconfig + static-libs? ( ${LIB_DEPEND} ) + static? ( ${LIB_DEPEND//?} + app-arch/bzip2[static-libs] + x11-libs/libXau[static-libs] + x11-libs/libXdmcp[static-libs] + x11-libs/libxcb[static-libs] )" + +REQUIRED_USE="opengl? ( X !static !static-libs )" + +S=${WORKDIR}/${P}-source + +PATCHES=( + "${FILESDIR}"/${PN}-1.11-CFLAGS.patch + "${FILESDIR}"/${PN}-1.9a-debug-build.patch + "${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch + "${FILESDIR}"/${PN}-1.11-openssl-curl-x11.patch + "${FILESDIR}"/${PN}-1.11-system-glfw.patch + "${FILESDIR}"/${PN}-1.11-CVE-2017-6060.patch +) + +src_prepare() { + default + use hppa && append-cflags -ffunction-sections + + rm -rf thirdparty || die + + if has_version ">=media-libs/openjpeg-2.1:2" ; then + # Remove a switch, which prevents using shared libraries for openjpeg2. + # See http://www.linuxfromscratch.org/blfs/view/cvs/pst/mupdf.html + sed '/OPJ_STATIC$/d' -i source/fitz/load-jpx.c + fi + + use javascript || \ + sed -e '/* #define FZ_ENABLE_JS/ a\#define FZ_ENABLE_JS 0' \ + -i include/mupdf/fitz/config.h + + sed -e "/^libdir=/s:/lib:/$(get_libdir):" \ + -e "/^prefix=/s:=.*:=${EROOT}/usr:" \ + -i platform/debian/${PN}.pc || die + + use vanilla || eapply \ + "${FILESDIR}"/${PN}-1.3-zoom-2.patch + + sed -e "1iOS = Linux" \ + -e "1iCC = $(tc-getCC)" \ + -e "1iLD = $(tc-getCC)" \ + -e "1iAR = $(tc-getAR)" \ + -e "1iverbose = yes" \ + -e "1ibuild = debug" \ + -e "1iprefix = ${ED}usr" \ + -e "1ilibdir = ${ED}usr/$(get_libdir)" \ + -e "1idocdir = ${ED}usr/share/doc/${PF}" \ + -e "1iWANT_X11 = $(usex X)" \ + -e "1iWANT_OPENSSL = $(usex openssl)" \ + -e "1iWANT_CURL = $(usex curl)" \ + -e "1iHAVE_MUJS = $(usex javascript)" \ + -e "1iMUJS_LIBS = $(usex javascript -lmujs '')" \ + -e "1iMUJS_CFLAGS =" \ + -e "1iHAVE_GLFW = $(usex opengl yes no)" \ + -i Makerules || die + + if use static-libs || use static ; then + cp -a "${S}" "${S}"-static || die + #add missing Libs.private for xcb and freetype + sed -e 's:\(pkg-config --libs\):\1 --static:' \ + -e '/^SYS_X11_LIBS = /s:\(.*\):\1 -lpthread:' \ + -e '/^SYS_FREETYPE_LIBS = /s:\(.*\):\1 -lbz2:' \ + -i "${S}"-static/Makerules || die + fi + + my_soname=libmupdf.so.${PV} + my_soname_js_none=libmupdf-js-none.so.${PV} + sed -e "\$a\$(MUPDF_LIB): \$(MUPDF_JS_NONE_LIB)" \ + -e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname} -Wl,--no-undefined -o \$@ \$^ \$(MUPDF_JS_NONE_LIB) \$(LIBS)" \ + -e "/^MUPDF_LIB =/s:=.*:= \$(OUT)/${my_soname}:" \ + -e "\$a\$(MUPDF_JS_NONE_LIB):" \ + -e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname_js_none} -Wl,--no-undefined -o \$@ \$^ \$(LIBS)" \ + -e "/install/s: COPYING : :" \ + -i Makefile || die +} + +src_compile() { + emake XCFLAGS="-fpic" + use static-libs && \ + emake -C "${S}"-static build/debug/lib${PN}{,-js-none}.a + use static && \ + emake -C "${S}"-static XLIBS="-static" +} + +src_install() { + if use X ; then + domenu platform/debian/${PN}.desktop + doicon platform/debian/${PN}.xpm + else + rm docs/man/${PN}.1 + fi + + emake install + dosym ${my_soname} /usr/$(get_libdir)/lib${PN}.so + + use static-libs && \ + dolib.a "${S}"-static/build/debug/lib${PN}{,-js-none}.a + if use static ; then + dobin "${S}"-static/build/debug/mu{tool,draw} + use X && dobin "${S}"-static/build/debug/${PN}-x11 + fi + if use X ; then + if use opengl ; then + dosym ${PN}-gl /usr/bin/${PN} + einfo "mupdf symlink points to mupdf-gl (bug 616654)" + else + dosym ${PN}-x11 /usr/bin/${PN} + fi + fi + insinto /usr/$(get_libdir)/pkgconfig + doins platform/debian/${PN}.pc + + dodoc README docs/*.{txt,c} +}
