summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Weber <xmw@gentoo.org>2015-08-11 00:52:28 +0200
committerMichael Weber <xmw@gentoo.org>2015-08-11 00:52:45 +0200
commit1dc8dafb477cabeecc8d46bf6a65bec6e289e4b0 (patch)
tree971701308a48604f1058da084b3849567e2b18b7 /app-text
parentLinux patch 4.1.5. Remove old. (diff)
downloadgentoo-1dc8dafb477cabeecc8d46bf6a65bec6e289e4b0.tar.gz
gentoo-1dc8dafb477cabeecc8d46bf6a65bec6e289e4b0.tar.bz2
gentoo-1dc8dafb477cabeecc8d46bf6a65bec6e289e4b0.zip
app-text/mupdf: fix format-security (bug 556830).
Package-Manager: portage-2.2.20
Diffstat (limited to 'app-text')
-rw-r--r--app-text/mupdf/files/mupdf-1.5-format-security-error.patch22
-rw-r--r--app-text/mupdf/mupdf-1.5-r1.ebuild3
2 files changed, 24 insertions, 1 deletions
diff --git a/app-text/mupdf/files/mupdf-1.5-format-security-error.patch b/app-text/mupdf/files/mupdf-1.5-format-security-error.patch
new file mode 100644
index 00000000000..d0dce97f5ce
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.5-format-security-error.patch
@@ -0,0 +1,22 @@
+From: =?utf-8?q?=22Kan-Ru_Chen_=28=E9=99=B3=E4=BE=83=E5=A6=82=29=22?=
+ <koster@debian.org>
+Date: Sat, 20 Sep 2014 13:12:16 +0800
+Subject: Fix -Werror=format-security error
+
+---
+ source/pdf/pdf-op-run.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/source/pdf/pdf-op-run.c b/source/pdf/pdf-op-run.c
+index 2bea94b..da881b2 100644
+--- a/source/pdf/pdf-op-run.c
++++ b/source/pdf/pdf-op-run.c
+@@ -1729,7 +1729,7 @@ run_xobject(pdf_csi *csi, void *state, pdf_obj *resources, pdf_xobject *xobj, co
+
+ /* Rethrow postponed errors */
+ if (errmess[0])
+- fz_throw(ctx, FZ_ERROR_GENERIC, errmess);
++ fz_throw(ctx, FZ_ERROR_GENERIC, "%s", errmess);
+ }
+
+ static void pdf_run_BDC(pdf_csi *csi, void *state)
diff --git a/app-text/mupdf/mupdf-1.5-r1.ebuild b/app-text/mupdf/mupdf-1.5-r1.ebuild
index 791a17d9d5f..b066b49e284 100644
--- a/app-text/mupdf/mupdf-1.5-r1.ebuild
+++ b/app-text/mupdf/mupdf-1.5-r1.ebuild
@@ -41,7 +41,8 @@ src_prepare() {
"${FILESDIR}"/${PN}-1.3-CFLAGS.patch \
"${FILESDIR}"/${PN}-1.5-old-debian-files.patch \
"${FILESDIR}"/${PN}-1.3-pkg-config.patch \
- "${FILESDIR}"/${PN}-1.5-Makerules-openssl-curl.patch
+ "${FILESDIR}"/${PN}-1.5-Makerules-openssl-curl.patch \
+ "${FILESDIR}"/${PN}-1.5-format-security-error.patch
if has_version ">=media-libs/openjpeg-2.1:2" ; then
epatch \