Termux
/
termux-packages
mirror of https://github.com/termux/termux-packages
1
0
Fork 0
Code Issues Releases Wiki Activity

poppler{,-qt}: Bump to 22.11.0

This commit is contained in:
Tee KOBAYASHI 2022-11-01 18:50:58 +09:00 committed by xtkoba
parent c531d6d3f0
commit 2deeeecd05
5 changed files with 25 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
packages/poppler/CVE-2022-38784.patch
View File

@ -1,34 +0,0 @@
https://gitlab.freedesktop.org/poppler/poppler/-/commit/27354e9d9696ee2bc063910a6c9a6b27c5184a52
From 27354e9d9696ee2bc063910a6c9a6b27c5184a52 Mon Sep 17 00:00:00 2001
From: Albert Astals Cid <aacid@kde.org>
Date: Thu, 25 Aug 2022 00:14:22 +0200
Subject: [PATCH] JBIG2Stream: Fix crash on broken file
https://github.com/jeffssh/CVE-2021-30860
Thanks to David Warren for the heads up
---
poppler/JBIG2Stream.cc | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/poppler/JBIG2Stream.cc b/poppler/JBIG2Stream.cc
index 662276e54..9f70431de 100644
--- a/poppler/JBIG2Stream.cc
+++ b/poppler/JBIG2Stream.cc
@@ -1976,7 +1976,11 @@ void JBIG2Stream::readTextRegionSeg(unsigned int segNum, bool imm, bool lossless
for (i = 0; i < nRefSegs; ++i) {
if ((seg = findSegment(refSegs[i]))) {
if (seg->getType() == jbig2SegSymbolDict) {
- numSyms += ((JBIG2SymbolDict *)seg)->getSize();
+ const unsigned int segSize = ((JBIG2SymbolDict *)seg)->getSize();
+ if (unlikely(checkedAdd(numSyms, segSize, &numSyms))) {
+ error(errSyntaxError, getPos(), "Too many symbols in JBIG2 text region");
+ return;
+ }
} else if (seg->getType() == jbig2SegCodeTable) {
codeTables.push_back(seg);
}
--
GitLab

9
packages/poppler/build.sh
View File

@ -3,16 +3,15 @@ TERMUX_PKG_DESCRIPTION="PDF rendering library"
TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_MAINTAINER="@termux"
# Please align the version with `poppler-qt` package.
TERMUX_PKG_VERSION=22.04.0
TERMUX_PKG_REVISION=3
TERMUX_PKG_VERSION=22.11.0
# Do not forget to bump revision of reverse dependencies and rebuild them
# when SOVERSION is changed.
_POPPLER_SOVERSION=120
_POPPLER_SOVERSION=125
TERMUX_PKG_SRCURL=https://poppler.freedesktop.org/poppler-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_SHA256=813fb4b90e7bda63df53205c548602bae728887a60f4048aae4dbd9b1927deff
TERMUX_PKG_SHA256=093ba9844ed774285517361c15e21a31ba4df278a499263d4403cca74f2da828
TERMUX_PKG_DEPENDS="fontconfig, freetype, glib, libc++, libcairo, libcurl, libiconv, libjpeg-turbo, libpng, libtiff, littlecms, openjpeg, zlib"
TERMUX_PKG_BUILD_DEPENDS="boost, boost-headers, g-ir-scanner, openjpeg-tools"
TERMUX_PKG_BREAKS="poppler-dev, poppler-qt (<< 22.04.0-3), poppler-qt (<< ${TERMUX_PKG_VERSION})"
TERMUX_PKG_BREAKS="poppler-dev, poppler-qt (<< ${TERMUX_PKG_VERSION})"
TERMUX_PKG_REPLACES="poppler-dev, poppler-qt (<< 22.04.0-3)"
TERMUX_PKG_DISABLE_GIR=false
#texlive needs the xpdf headers

18
packages/poppler/gir/22.04.0/Poppler-0.18.xml → packages/poppler/gir/22.11.0/Poppler-0.18.xml vendored
View File

@ -145,6 +145,22 @@
<member name="POPPLER_ANNOT_FREE_TEXT_QUADDING_LEFT_JUSTIFIED" nick="left-justified" value="0"/>
<member name="POPPLER_ANNOT_FREE_TEXT_QUADDING_CENTERED" nick="centered" value="1"/>
<member name="POPPLER_ANNOT_FREE_TEXT_QUADDING_RIGHT_JUSTIFIED" nick="right-justified" value="2"/>
</enum> <enum name="PopplerAnnotStampIcon" get-type="poppler_annot_stamp_icon_get_type">
<member name="POPPLER_ANNOT_STAMP_ICON_UNKNOWN" nick="unknown" value="0"/>
<member name="POPPLER_ANNOT_STAMP_ICON_APPROVED" nick="approved" value="1"/>
<member name="POPPLER_ANNOT_STAMP_ICON_AS_IS" nick="as-is" value="2"/>
<member name="POPPLER_ANNOT_STAMP_ICON_CONFIDENTIAL" nick="confidential" value="3"/>
<member name="POPPLER_ANNOT_STAMP_ICON_FINAL" nick="final" value="4"/>
<member name="POPPLER_ANNOT_STAMP_ICON_EXPERIMENTAL" nick="experimental" value="5"/>
<member name="POPPLER_ANNOT_STAMP_ICON_EXPIRED" nick="expired" value="6"/>
<member name="POPPLER_ANNOT_STAMP_ICON_NOT_APPROVED" nick="not-approved" value="7"/>
<member name="POPPLER_ANNOT_STAMP_ICON_NOT_FOR_PUBLIC_RELEASE" nick="not-for-public-release" value="8"/>
<member name="POPPLER_ANNOT_STAMP_ICON_SOLD" nick="sold" value="9"/>
<member name="POPPLER_ANNOT_STAMP_ICON_DEPARTMENTAL" nick="departmental" value="10"/>
<member name="POPPLER_ANNOT_STAMP_ICON_FOR_COMMENT" nick="for-comment" value="11"/>
<member name="POPPLER_ANNOT_STAMP_ICON_FOR_PUBLIC_RELEASE" nick="for-public-release" value="12"/>
<member name="POPPLER_ANNOT_STAMP_ICON_TOP_SECRET" nick="top-secret" value="13"/>
<member name="POPPLER_ANNOT_STAMP_ICON_NONE" nick="none" value="14"/>
</enum> <enum name="PopplerPageLayout" get-type="poppler_page_layout_get_type">
<member name="POPPLER_PAGE_LAYOUT_UNSET" nick="unset" value="0"/>
<member name="POPPLER_PAGE_LAYOUT_SINGLE_PAGE" nick="single-page" value="1"/>
@ -488,6 +504,8 @@
</class>
<class name="PopplerAnnotSquare" get-type="poppler_annot_square_get_type" parents="PopplerAnnotMarkup,PopplerAnnot,GObject">
</class>
<class name="PopplerAnnotStamp" get-type="poppler_annot_stamp_get_type" parents="PopplerAnnot,GObject">
</class>
<class name="PopplerMovie" get-type="poppler_movie_get_type" parents="GObject">
</class>
<class name="PopplerMedia" get-type="poppler_media_get_type" parents="GObject">

34
x11-packages/poppler-qt/CVE-2022-38784.patch
View File

@ -1,34 +0,0 @@
https://gitlab.freedesktop.org/poppler/poppler/-/commit/27354e9d9696ee2bc063910a6c9a6b27c5184a52
From 27354e9d9696ee2bc063910a6c9a6b27c5184a52 Mon Sep 17 00:00:00 2001
From: Albert Astals Cid <aacid@kde.org>
Date: Thu, 25 Aug 2022 00:14:22 +0200
Subject: [PATCH] JBIG2Stream: Fix crash on broken file
https://github.com/jeffssh/CVE-2021-30860
Thanks to David Warren for the heads up
---
poppler/JBIG2Stream.cc | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/poppler/JBIG2Stream.cc b/poppler/JBIG2Stream.cc
index 662276e54..9f70431de 100644
--- a/poppler/JBIG2Stream.cc
+++ b/poppler/JBIG2Stream.cc
@@ -1976,7 +1976,11 @@ void JBIG2Stream::readTextRegionSeg(unsigned int segNum, bool imm, bool lossless
for (i = 0; i < nRefSegs; ++i) {
if ((seg = findSegment(refSegs[i]))) {
if (seg->getType() == jbig2SegSymbolDict) {
- numSyms += ((JBIG2SymbolDict *)seg)->getSize();
+ const unsigned int segSize = ((JBIG2SymbolDict *)seg)->getSize();
+ if (unlikely(checkedAdd(numSyms, segSize, &numSyms))) {
+ error(errSyntaxError, getPos(), "Too many symbols in JBIG2 text region");
+ return;
+ }
} else if (seg->getType() == jbig2SegCodeTable) {
codeTables.push_back(seg);
}
--
GitLab

7
x11-packages/poppler-qt/build.sh
View File

@ -3,13 +3,12 @@ TERMUX_PKG_DESCRIPTION="Poppler Qt wrapper"
TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_MAINTAINER="@termux"
# Please align the version with `poppler` package.
TERMUX_PKG_VERSION=22.04.0
TERMUX_PKG_REVISION=3
TERMUX_PKG_VERSION=22.11.0
# Do not forget to bump revision of reverse dependencies and rebuild them
# when SOVERSION is changed.
_POPPLER_SOVERSION=120
_POPPLER_SOVERSION=125
TERMUX_PKG_SRCURL=https://poppler.freedesktop.org/poppler-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_SHA256=813fb4b90e7bda63df53205c548602bae728887a60f4048aae4dbd9b1927deff
TERMUX_PKG_SHA256=093ba9844ed774285517361c15e21a31ba4df278a499263d4403cca74f2da828
TERMUX_PKG_DEPENDS="poppler (>= ${TERMUX_PKG_VERSION}), qt5-qtbase"
TERMUX_PKG_BUILD_DEPENDS="boost, boost-headers, qt5-qtbase-cross-tools"
#texlive needs the xpdf headers