Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (9783f3360ee52e4a6b7fa38576142fbcde2e4cc9)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (9783f3360ee52e4a6b7fa38576142fbcde2e4cc9)
  • Date: Fri, 30 Sep 2016 16:55:36 +0000

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

doc/mupdf/BUILD | 3 ---
doc/mupdf/DETAILS | 1 +
doc/mupdf/HISTORY | 8 ++++++++
doc/mupdf/PRE_BUILD | 1 +
doc/mupdf/linebreak.patch | 10 ++++++++++
doc/zathura-pdf-mupdf/DEPENDS | 1 +
doc/zathura-pdf-mupdf/HISTORY | 3 +++
7 files changed, 24 insertions(+), 3 deletions(-)

New commits:
commit 9783f3360ee52e4a6b7fa38576142fbcde2e4cc9
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

zathura-pdf-mupdf: added missing openjpeg dependency

commit 3af4786c9e344ff073c5d6cea2e2db7a3b227d8a
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

mupdf: security update

diff --git a/doc/mupdf/BUILD b/doc/mupdf/BUILD
index 80705a7..f29510f 100755
--- a/doc/mupdf/BUILD
+++ b/doc/mupdf/BUILD
@@ -1,4 +1 @@
-CFLAGS="-fstack-protector-all ${CFLAGS}" &&
-CXXFLAGS="-fstack-protector-all ${CXXFLAGS}" &&
-
CFLAGS= LIBS= make XCFLAGS="$CFLAGS" XLIBS="$LDFLAGS" ${OPTS} build=release
verbose=yes
diff --git a/doc/mupdf/DETAILS b/doc/mupdf/DETAILS
index 2b68715..8be6003 100755
--- a/doc/mupdf/DETAILS
+++ b/doc/mupdf/DETAILS
@@ -1,5 +1,6 @@
SPELL=mupdf
VERSION=1.9a
+ SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION-source.tar.gz
SOURCE_URL[0]=http://mupdf.com/downloads/$SOURCE
SOURCE_URL[1]=http://mupdf.com/downloads/archive/$SOURCE
diff --git a/doc/mupdf/HISTORY b/doc/mupdf/HISTORY
index e594a87..b65c5d4 100644
--- a/doc/mupdf/HISTORY
+++ b/doc/mupdf/HISTORY
@@ -1,3 +1,11 @@
+2016-09-30 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: added forgotten SECURITY_PATCH
+ * BUILD: dropped not required '-fstack-protector-all', replaced by
+ linebreak.patch
+ * PRE_BUILD: apply the patch
+ * linebreak.patch: added my patch to prevent a DoS while opening a
+ malformed EPUB file
+
2016-09-29 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.9a; updated descriptions
* DEPENDS: added missing dependencies (harfbuzz, SSL, curl, glfw)
diff --git a/doc/mupdf/PRE_BUILD b/doc/mupdf/PRE_BUILD
index b2642d4..216359b 100755
--- a/doc/mupdf/PRE_BUILD
+++ b/doc/mupdf/PRE_BUILD
@@ -4,6 +4,7 @@ cd "${SOURCE_DIRECTORY}" &&
rm -rf thirdparty/{curl,freetype,harfbuzz,jbig2dec,jpeg,openjpeg,zlib} &&

patch -p1 < "${SPELL_DIRECTORY}/mupdf-1.9-upstream_fix-1.patch" &&
+patch -p0 < "${SPELL_DIRECTORY}/linebreak.patch" &&

if spell_ok openjpeg && is_version_less $(installed_version openjpeg) 2.0;
then
patch -p0 < "${SPELL_DIRECTORY}/openjpeg-1.5.patch" &&
diff --git a/doc/mupdf/linebreak.patch b/doc/mupdf/linebreak.patch
new file mode 100644
index 0000000..603c2ab
--- /dev/null
+++ b/doc/mupdf/linebreak.patch
@@ -0,0 +1,10 @@
+--- source/html/html-layout.c.orig 2016-04-21 07:14:32.000000000 -0400
++++ source/html/html-layout.c 2016-09-30 12:05:50.251503828 -0400
+@@ -2094,6 +2094,7 @@
+ g.base_uri = base_uri;
+ g.at_bol = 0;
+ g.emit_white = 0;
++ g.last_brk_cls = UCDN_LINEBREAK_CLASS_OP;
+
+ xml = fz_parse_xml(ctx, buf->data, buf->len, 1);
+
diff --git a/doc/zathura-pdf-mupdf/DEPENDS b/doc/zathura-pdf-mupdf/DEPENDS
index d2ac2a5..273c0e5 100755
--- a/doc/zathura-pdf-mupdf/DEPENDS
+++ b/doc/zathura-pdf-mupdf/DEPENDS
@@ -1,2 +1,3 @@
depends zathura &&
+depends openjpeg &&
depends mupdf
diff --git a/doc/zathura-pdf-mupdf/HISTORY b/doc/zathura-pdf-mupdf/HISTORY
index 3b61374..e398162 100644
--- a/doc/zathura-pdf-mupdf/HISTORY
+++ b/doc/zathura-pdf-mupdf/HISTORY
@@ -1,3 +1,6 @@
+2016-09-30 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: added missing openjpeg dependency
+
2016-09-29 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS, DEPENDS, {PRE_,}BUILD, INSTALL, CONFLICTS, mupdf-1.9.patch:
created spell, version 0.3.0



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (9783f3360ee52e4a6b7fa38576142fbcde2e4cc9), Vlad Glagolev, 09/30/2016

Archive powered by MHonArc 2.6.24.

Top of Page