Include buffer overflow fix (bug 498876, thanks Hank Leininger), include mupdf-select-file for .desktop file (bug 482920, thanks Andreas Proteus).

Package-Manager: portage-2.2.8/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

4 files changed, 144 insertions, 10 deletions

diff --git a/app-text/mupdf/ChangeLog b/app-text/mupdf/ChangeLog
index 373573fa6b3f..66b38111ba77 100644
--- a/app-text/mupdf/ChangeLog
+++ b/app-text/mupdf/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/mupdf
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.92 2014/01/19 08:52:09 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.93 2014/01/22 07:14:40 xmw Exp $
+
+*mupdf-1.3_p20140118 (22 Jan 2014)
+
+  22 Jan 2014; Michael Weber <xmw@gentoo.org> +mupdf-1.3_p20140118.ebuild,
+  mupdf-9999.ebuild:
+  Include buffer overflow fix (bug 498876, thanks  Hank Leininger), include
+  mupdf-select-file for .desktop file (bug 482920, thanks Andreas Proteus).
 
   19 Jan 2014; Pacho Ramos <pacho@gentoo.org> mupdf-1.2.ebuild:
   amd64 stable, bug #472532
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 043da81f1777..23b82480fc49 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -20,6 +20,7 @@ DIST mupdf-1.1_p20121127.tar.gz 6922632 SHA256 4594bc0473e61200e6d2aba06488ea312
 DIST mupdf-1.2-source.zip 13808821 SHA256 9bc9e31ec27c091dad37f70940bd799e46ab6da4299bc58e803bff3dbb07dc3b SHA512 49261c5356d4e5648f89bfb783a23a3c3a470e044fe3b234f0906b0f6b71efad557981682e41ce3d754a5a31f1e5518e5e5f5f8dc83d2ca53181dbd3f4726e02 WHIRLPOOL 86fb60a2ac94c8ca4495c0891dd2b43ea49c9e212e2961f02914a3aaa5685566201f561c196da7d4c568dcec938eea8676959bbec839e33a7bff4e6410cc1a25
 DIST mupdf-1.3-source.tar.gz 14594969 SHA256 aba8b31bee9cc0a16abedab5e31c81c65996cba5591e62a50a79bea2a63d4478 SHA512 c79ba5838ae97acbe81f2eca9433473eaa1618a5ae718bd007fcc0e51d234f99bfadc297e291c398f25a0037f3f2d4e2f0ed5e412f8dc26d5561c362276529b3 WHIRLPOOL 3644e80279749e6490cf1429bc0f4b3dbb055a4342642ba37f8ebf5a018dd86e3ebc7b74f6a6814cdc83e3783a6a7a67d78128ad510a3976911461f88c63e048
 DIST mupdf-1.3_p20130828.tar.gz 7376738 SHA256 4e64d8d0d9435188ad737953def4215884d539ac0773cc1b54ff86d59fbce511 SHA512 c6b231bd00fd6b1ea0c89002baae30f8004a7703adad77ac6d2980b0905e07b60d3f459b7c23289e681ae922f1cd7ea94bb522cb49719c47821de5ef85898e73 WHIRLPOOL 3e64d638a98324955748c51314351f950d8929af27edf5271308961bcc93076da0077bd13ab5d736989aeb16af89a09950bf194ce07f37b59fc43bb439988c57
+DIST mupdf-1.3_p20140118.tar.gz 7448663 SHA256 ed1791966a60be0d8556cf5e0def0e3093867223f0eb4f12fbffd22804520882 SHA512 c159f58539f1e944608ff7da8f41cef5e955de2f21ab1e37a6fad5577134094186a8b8b7ecdf47a427547e3fde7f04f2d484da6709adf3859c3754e2774b6a56 WHIRLPOOL b24bbbd49921edcea93a80a597bb0139937ac1ef365ae63f83cf7df878586ed2a9ecbef65645b9562627fa2bc2a662991a1af1ffd99e10f10a351bccb951eebe
 DIST mupdf-1.3_pre20130704.tar.gz 7347228 SHA256 6798378bd993bdd1fe50f423dc9c63e0620957abe63eb2fd0bfe6db8e8ded386 SHA512 38bf7f272249c93edb0b2e76b3f5219a76af6f304c7d0fdb9ed0c20bb06c12dc4dd4373f307278954b27b718293413973025564e492cd92cc99d93c2fd9b36e0 WHIRLPOOL cf2aeea351468b2cb7ccede5f356dec71d86165b14e4392517eb4c2033b197a567d6082189536952c63b589f5c4e292e1bb3a6cb282289c34726f8d2e67977fc
 EBUILD mupdf-1.0.ebuild 1530 SHA256 7d66f2590ba2cd7e91f29237467d654f2768130f9c8b2aeec0d9670a8b4ae98c SHA512 59f4f7cd267e1be73ef16617d9fa1b6609774e22da4cc5424a2906ac04135d24b0154ff860e3b684feaba5dba82f10c6bb4eded52d10336233fafe28db3bf8a9 WHIRLPOOL 4a37ffa9e9217968883af86c25bc3f39ec104e6bda7d7d4c77c474edd06709c00bce5e787396a2499551f02eff973c6bfc5429d5626beef81764d862ac54a35a
 EBUILD mupdf-1.1.ebuild 1568 SHA256 d4abfb60ee5a76f3a4f945f39ea2711a2db798e090aa4abbb7fb4e824e75243c SHA512 3606032a262c47af85ad11d9b3c456382b6c9076268bcf23d055be973d60eeeef0002b59b44c6ceb15e990c1dc26a5c01d87212fc6c4f33f9e0ea6b2f3d1020e WHIRLPOOL 442c049ccc06de1a6cd7f810b8433bc50678acaa8c3982e21fe615233aa8d1e983f3cee7ceb06fb439203c6b7ba16674593c7f7ed7932be6c9650ae5633bd267
@@ -27,14 +28,15 @@ EBUILD mupdf-1.1_p20121127.ebuild 1488 SHA256 4e11b767db4d78de3d5b7e83ca1ec97880
 EBUILD mupdf-1.2.ebuild 3262 SHA256 1ca63a5cb7ccc63c617a54039c5830d5eaf4c7456580a2849b10c6281431cb5a SHA512 d4572e064efb112388408cdf5cc49b88095ecaf12ef0526078fffbad7ace77ccea61944c580e825cde3b58f652616cc5df2badb5e1f6abe2ac739f85283be06d WHIRLPOOL ff92a6c508892d9ad2a08b8823d2abafcb92038a315e4d114789af2f54ac650f99ded126df9dcd00113db3865151eaaa4d8d4851f5790765b31a533d8e278272
 EBUILD mupdf-1.3.ebuild 3713 SHA256 fa51d5a54864dee29c42c1ef2721a25ffd54ac362626b89f9eeb2636c6d469d3 SHA512 9e5720e68b3ec785b9e0d9fadae412b385a1bda6438fdb76b7aff9d20725a46947d0f15deac3c3f7f3d0fd605097d03482e87e275db713e739784f7b3648b2d2 WHIRLPOOL 486daab943297f8c04ddfe73e694a6d94ac314e09521c1abc5bc29ff56cebb89a22b9cde92b3e03dce00265f309a4850991d8ad17a0327b780c0cf3fa757e06a
 EBUILD mupdf-1.3_p20130828.ebuild 3809 SHA256 5c05d706341b9c856e18ede48d4f7f6b283cce389e2d11f520fae99b9352f741 SHA512 cae025f1769d0226f096720138eb0ef64f532dc7f04af6f4cb1e11b7cf153047a848b06dfa7de77a804c3725518e7424eae3d5a2e2354ba749e2917f6100419e WHIRLPOOL 5b3b91aed8c41241a1e04f6db89d9f176b5e275911a67994b593094b8822b38ec3509d905e3f7ed2d656ef243520ae1be3e4bd02ee99e1a20778d0aedd95ff79
+EBUILD mupdf-1.3_p20140118.ebuild 3851 SHA256 e8bbe0df47eb9d3f9098575ecb2f992f8623d95cdc938776305326e5aab65212 SHA512 7e52dac7b75e725f93dfadffd67091d64b92432de59b9c3fa93caf5bd9adf4f7d7a7cee48a5972df3bb3cbe6ae7128f929005e8a56b91fc8c89419de346bfcea WHIRLPOOL c8dcbcd6575eac00012b4c29e37ce04f0bcb0f4a8d7d400e1969c8b17ad7f27f05a7038153860fe2d52fb660f519816d65907f8e74f066a7fbc36333cd35e0d7
 EBUILD mupdf-1.3_pre20130704.ebuild 3805 SHA256 4b9b24c64bc5d7f1c2504fa397552a9320c820937773c68727d9dd83b7042679 SHA512 1c344a9f21b7ffdc46d7abaa721b636c9c933230d3daef8b7b9754ed8f511751e1864200c8e93991431e20a398e4b2c0b6afad7454d98094d6d12525c9644b35 WHIRLPOOL 08d342ea9b76129e2480fe86fed58275c51f01aca7d339ae738544eab2862d2ac10446bc4554f77c5a83112a16d8b625dc65ea7157f61aca973bd796402a49ec
-EBUILD mupdf-9999.ebuild 3670 SHA256 7cecde9697cd7aff0676fe9aaf413e1bf0fdf4956503ac74fdc4a86fc669e751 SHA512 b50cdea1d55624eacfc9007584198e94050efcdeae13e6b47da74a5f2f247b3f5502cae1d326df6fb43380e7c242d70c03fd5c4c927a78888c97bc0ad2b32e00 WHIRLPOOL 47098e72054f8024cefd6f8c2a11c97ed5254348a163e9b38499a587abf9c58b7c9c8f66cc9143ef0493349c0d43a215f7c4d2829e0420c728c491563b5276a2
-MISC ChangeLog 14597 SHA256 2e9c77ba5d2a2e2334309d19a57694025b2d3e92d276cd6cba24eeb6f0c0684a SHA512 9ce706eadfeecb80aea0f834662681d8ad1a51d92686aa6015bb6b965cd87f62871a4bfad03b06726b47354507cfb872a30cd76dc6593225a7650902ab673d56 WHIRLPOOL 863e1c1cd32c0dc9378c93a532a63f9137d7eb9c65fc50a49f97915e3515e45af24791791a88f7632f887c0745b85c07d557ed816152ca343dfe1bf7fb29aa0a
+EBUILD mupdf-9999.ebuild 3712 SHA256 efa31c6d29c3fc952a65ff6a247e12aabc2c8f4fdcf0c12452b03d36056b1fdf SHA512 9b94172ab94501d7b5b3d7903e38df7e1bf4f6cdc9f09256c46ab40fb1d29dce02ec194f74c2a01c9cfd5a6bf2884343d429cb2689409dce38fe9322d53d6a1f WHIRLPOOL f573d5ec557eb0413d76b69753139526a1e51039280a8ce339faf7a2604d80fc45cc9dd7231038785b5d2626c8fc1fb88c890ec085f040e577c6e0f1152893fa
+MISC ChangeLog 14880 SHA256 0c9f513adb684164a77f83ae6576e0a33bf1d34b07293a17fab29bf6d13020d9 SHA512 1db44a3fec8545af5907f37d96a210e1cc2b58f48635df370265006d03d43d23ef50f3486089dabd343dd53e42a5bc51b9c9b245c3be13d3cd44817dc364653b WHIRLPOOL 8498640ae0373b27fa0e404d80c4c84c085f43047a54d78ced80eb83cb36f7b7ef0415c8bd127cb0ba7ce08ad1dbf6b7bdb4f4fda112782c8df7fb8bb1c004e1
 MISC metadata.xml 224 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7 SHA512 4f78d959809ec0db2f9be2a7747d572fa8ee03d177044dd46574881a6ee83736510b76062c12daecae609282d197ba466e8a3e3a654b1383e04c659acd41bef5 WHIRLPOOL 0300a228d371c918b051bc24859dfe4e5d0d2a71b80f697f202749c5aca69efcee4be6e69454c9abfa4ced28e19a9d1f71d6d7eaf54290b8d03b5c04fd209868
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlLbkjoACgkQCaWpQKGI+9QW9QCeN8w9XfyflcB2meA2+XLb2xY9
-OiAAn3Ft96xQvG8grsEiGLHthyvPAysb
-=34iV
+iF4EAREIAAYFAlLfb+gACgkQknrdDGLu8JBoSAEAj6vACNeL7/g+EcMBS1WG0kdd
+32WcL/GlqhFa9fIFKXEA/1P03pNLGjTibJkaMq/QdVE8cjgFKZI41Elw0Sls6vVV
+=XcqW
 -----END PGP SIGNATURE-----
diff --git a/app-text/mupdf/mupdf-1.3_p20140118.ebuild b/app-text/mupdf/mupdf-1.3_p20140118.ebuild
new file mode 100644
index 000000000000..3d2ccd0c1f15
--- /dev/null
+++ b/app-text/mupdf/mupdf-1.3_p20140118.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-1.3_p20140118.ebuild,v 1.1 2014/01/22 07:14:40 xmw Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib toolchain-funcs vcs-snapshot
+
+DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
+HOMEPAGE="http://mupdf.com/"
+SRC_URI="http://git.ghostscript.com/?p=mupdf.git;a=snapshot;h=01f0a0db15faf4bffaa2556ced74868572dac7f5;sf=tgz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0/1.3"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="X vanilla static static-libs"
+
+LIB_DEPEND="dev-libs/openssl[static-libs?]
+	media-libs/freetype:2[static-libs?]
+	media-libs/jbig2dec[static-libs?]
+	media-libs/openjpeg:2[static-libs?]
+	net-misc/curl[static-libs?]
+	virtual/jpeg[static-libs?]
+	X? ( x11-libs/libX11[static-libs?]
+		x11-libs/libXext[static-libs?] )"
+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] )"
+
+src_prepare() {
+	rm -rf thirdparty || die
+
+	epatch \
+		"${FILESDIR}"/${PN}-1.3-CFLAGS.patch \
+		"${FILESDIR}"/${PN}-1.3-openjpeg2.patch \
+		"${FILESDIR}"/${PN}-1.3-pkg-config.patch \
+		"${FILESDIR}"/${PN}-1.3-sys_curl.patch
+
+	sed -e "/^libdir=/s:/lib:/$(get_libdir):" \
+		-e "/^prefix=/s:=.*:=${EROOR}/usr:" \
+		-i platform/debian/${PN}.pc || die
+
+	use vanilla || epatch \
+		"${FILESDIR}"/${PN}-1.3-zoom-2.patch \
+		"${FILESDIR}"/${PN}-1.3-forward_back.patch
+
+	#http://bugs.ghostscript.com/show_bug.cgi?id=693467
+	sed -e '/^\(Actions\|MimeType\)=/s:\(.*\):\1;:' \
+		-i platform/debian/${PN}.desktop || die
+
+	sed -e "\$aOS = Linux" \
+		-e "\$aCC = $(tc-getCC)" \
+		-e "\$aLD = $(tc-getCC)" \
+		-e "\$aAR = $(tc-getAR)" \
+		-e "\$averbose = true" \
+		-e "\$abuild = debug" \
+		-e "\$aprefix = ${ED}usr" \
+		-e "\$alibdir = ${ED}usr/$(get_libdir)" \
+		-i Makerules || die
+
+	if ! use X ; then
+		sed -e "\$aNOX11 = yes" \
+			-i Makerules || die
+	fi
+
+	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.1.3
+	my_soname_js_none=libmupdf-js-none.so.1.3
+	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 "/^MUPDF_JS_NONE_LIB :=/s:=.*:= \$(OUT)/${my_soname_js_none}:" \
+		-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
+		dobin platform/debian/${PN}-select-file
+	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
+	use X && dosym ${PN}-x11 /usr/bin/${PN}
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins platform/debian/${PN}.pc
+
+	dodoc README docs/*.{txt,c}
+}
diff --git a/app-text/mupdf/mupdf-9999.ebuild b/app-text/mupdf/mupdf-9999.ebuild
index ecee3f0232d6..1388eaed21fc 100644
--- a/app-text/mupdf/mupdf-9999.ebuild
+++ b/app-text/mupdf/mupdf-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild,v 1.42 2013/08/28 22:26:18 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild,v 1.43 2014/01/22 07:14:40 xmw Exp $
 
 EAPI=5
 
@@ -79,8 +79,8 @@ src_prepare() {
 			-i "${S}"-static/Makerules || die
 	fi
 
-	my_soname=libmupdf.so.1.2
-	my_soname_js_none=libmupdf-js-none.so.1.2
+	my_soname=libmupdf.so.1.3
+	my_soname_js_none=libmupdf-js-none.so.1.3
 	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}:" \
@@ -102,6 +102,7 @@ src_install() {
 	if use X ; then
 		domenu platform/debian/${PN}.desktop
 		doicon platform/debian/${PN}.xpm
+		dobin platform/debian/${PN}-select-file
 	else
 		rm docs/man/${PN}.1
 	fi