parent
dafe930683
commit
19a0e6160b
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1 +1 @@
|
|||||||
DIST ipkg-utils-050831.tar.gz 29175 SHA256 1dde1111fbca85977855db9acb557097a32a5133d8764a05ea36a89a1205394b SHA512 7375c4815225eb755699954d3005dfa88bc0f0e6c2678b7bad565f63204a32735d483dbef23e7b9b75c5f0428ff04c13744b8a10e68bb69fedb96a59c069e1aa WHIRLPOOL 7bd8b42aad219862c0211006954e027dd5b933fe13953932fa767f9fb35745d715c982f93c7ea636be23c5a27d7a460c2fc636963724e06547a4f093594355c1
|
DIST ipkg-utils-050831.tar.gz 29175 BLAKE2B 4f1d4b5efb7f808e6987a7b62f830463e28fca998c49b4d6683a58c2d2225e24820e6f2b47642e5cceafa34e0ab3ff8172267ef734bbbf1c8f94b8777172efc8 SHA512 7375c4815225eb755699954d3005dfa88bc0f0e6c2678b7bad565f63204a32735d483dbef23e7b9b75c5f0428ff04c13744b8a10e68bb69fedb96a59c069e1aa
|
||||||
|
@ -0,0 +1,25 @@
|
|||||||
|
diff --git i/ipkg.py w/ipkg.py
|
||||||
|
index 02aab22..145686c 100644
|
||||||
|
--- i/ipkg.py
|
||||||
|
+++ w/ipkg.py
|
||||||
|
@@ -36,10 +36,10 @@ import tempfile
|
||||||
|
import os
|
||||||
|
import sys
|
||||||
|
import glob
|
||||||
|
-import md5
|
||||||
|
import re
|
||||||
|
import string
|
||||||
|
import commands
|
||||||
|
+from hashlib import md5
|
||||||
|
from stat import ST_SIZE
|
||||||
|
|
||||||
|
class Version:
|
||||||
|
@@ -136,7 +136,7 @@ class Package:
|
||||||
|
|
||||||
|
# compute the MD5.
|
||||||
|
f = open(fn, "r")
|
||||||
|
- sum = md5.new()
|
||||||
|
+ sum = md5()
|
||||||
|
while 1:
|
||||||
|
data = f.read(1024)
|
||||||
|
if not data: break
|
@ -0,0 +1,66 @@
|
|||||||
|
# Copyright 1999-2017 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
|
EAPI=6
|
||||||
|
|
||||||
|
PYTHON_COMPAT=( python2_7 )
|
||||||
|
|
||||||
|
inherit distutils-r1 eutils toolchain-funcs versionator
|
||||||
|
|
||||||
|
MY_P="${PN}-$(get_version_component_range 3)"
|
||||||
|
|
||||||
|
DESCRIPTION="Tools for working with the ipkg binary package format"
|
||||||
|
HOMEPAGE="http://www.openembedded.org/"
|
||||||
|
SRC_URI="http://handhelds.org/download/packages/ipkg-utils/${MY_P}.tar.gz"
|
||||||
|
|
||||||
|
LICENSE="GPL-2"
|
||||||
|
SLOT="0"
|
||||||
|
KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~x86"
|
||||||
|
IUSE="minimal"
|
||||||
|
|
||||||
|
DEPEND="
|
||||||
|
!minimal? (
|
||||||
|
app-crypt/gnupg
|
||||||
|
net-misc/curl
|
||||||
|
)"
|
||||||
|
RDEPEND="${DEPEND}"
|
||||||
|
|
||||||
|
S="${WORKDIR}/${MY_P}"
|
||||||
|
|
||||||
|
PATCHES=("${FILESDIR}/${P}-hashlib-r2.patch")
|
||||||
|
|
||||||
|
src_prepare() {
|
||||||
|
default
|
||||||
|
|
||||||
|
sed '/python setup.py build/d' -i Makefile
|
||||||
|
|
||||||
|
if use minimal; then
|
||||||
|
elog "ipkg-upload is not installed when the \`minimal' USE flag is set. If you"
|
||||||
|
elog "need ipkg-upload then rebuild this package without the \`minimal' USE flag."
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
src_compile() {
|
||||||
|
distutils-r1_src_compile
|
||||||
|
emake CC="$(tc-getCC)"
|
||||||
|
}
|
||||||
|
|
||||||
|
python_install() {
|
||||||
|
distutils-r1_python_install
|
||||||
|
|
||||||
|
if use minimal; then
|
||||||
|
rm "${ED}usr/bin/ipkg-upload" \
|
||||||
|
"${D}$(python_get_scriptdir)/ipkg-upload" || die
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
src_install() {
|
||||||
|
distutils-r1_src_install
|
||||||
|
|
||||||
|
dobin ipkg-compare-versions
|
||||||
|
}
|
||||||
|
|
||||||
|
pkg_postinst() {
|
||||||
|
elog "Consider installing sys-apps/fakeroot for use with the ipkg-build "
|
||||||
|
elog "command, that makes it possible to build packages as a normal user."
|
||||||
|
}
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,2 +1 @@
|
|||||||
DIST yubikey-manager-qt-0.3.1.tar.gz 175215 SHA256 e41bcda5aae5e0f92158f591e8e584d25c9b4872475f8e4253c7a7671e94c859 SHA512 d47a6b75b50c2dca073ab74ea2d7c7c46ff86ec338f52d49afd39796cc1f3de7ddd74664b5f60f9013393b9ca24621da63d218eb3c2cb3017fefed2370b269d1 WHIRLPOOL 1d6de66f0450d72e29b9e9a2a959f4ca8ed7c8614b976115ecfb433e8b5f1795d12e6d907f73152b6bef3de6510cbcf236b2386b18a3cba2094269f78522196a
|
|
||||||
DIST yubikey-manager-qt-0.3.2.tar.gz 175662 SHA256 5dd780c75e17a141ab882c8c10b04dcfcc61dae7e574c1404a606b05b047cae1 SHA512 5ae0b802f041a37a67bef6f7c8b5224fe47d145bcb3bef8c42e300048e849bbcf333de6d15a9a671ced21741d412af9419c08fd3b018276ce997b3cdd5ba55f5 WHIRLPOOL 5284a3e2f1e64d3b793b82d1064feab7325de12c0b8b6b5328f66440668d7b2628a5dc0df2d0b3b5e3a72a6f4aca511777cd6e2ae9fb3f337cc908cb1a2f1586
|
DIST yubikey-manager-qt-0.3.2.tar.gz 175662 SHA256 5dd780c75e17a141ab882c8c10b04dcfcc61dae7e574c1404a606b05b047cae1 SHA512 5ae0b802f041a37a67bef6f7c8b5224fe47d145bcb3bef8c42e300048e849bbcf333de6d15a9a671ced21741d412af9419c08fd3b018276ce997b3cdd5ba55f5 WHIRLPOOL 5284a3e2f1e64d3b793b82d1064feab7325de12c0b8b6b5328f66440668d7b2628a5dc0df2d0b3b5e3a72a6f4aca511777cd6e2ae9fb3f337cc908cb1a2f1586
|
||||||
|
@ -1,39 +0,0 @@
|
|||||||
# Copyright 1999-2017 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI=6
|
|
||||||
|
|
||||||
PYTHON_COMPAT=( python3_{4,5,6} )
|
|
||||||
|
|
||||||
inherit qmake-utils python-single-r1 vcs-snapshot
|
|
||||||
|
|
||||||
DESCRIPTION="Cross-platform application for configuring any YubiKey over all USB transports"
|
|
||||||
HOMEPAGE="https://developers.yubico.com/yubikey-manager-qt https://github.com/Yubico/yubikey-manager-qt"
|
|
||||||
SRC_URI="https://github.com/Yubico/yubikey-manager-qt/archive/${P}.tar.gz"
|
|
||||||
|
|
||||||
LICENSE="BSD-2"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="~amd64"
|
|
||||||
IUSE=""
|
|
||||||
|
|
||||||
DEPEND="app-crypt/yubikey-manager[${PYTHON_USEDEP}]
|
|
||||||
dev-python/pyotherside[${PYTHON_USEDEP}]
|
|
||||||
dev-qt/qtsingleapplication[qt5]
|
|
||||||
dev-qt/qtdeclarative:5
|
|
||||||
dev-qt/qtwidgets:5"
|
|
||||||
RDEPEND="${DEPEND}"
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
default
|
|
||||||
rm -rf vendor ykman-gui/vendor || die
|
|
||||||
sed -i -e "s/ykman-cli//" ${PN}.pro || die
|
|
||||||
sed -i -e "/qtsingleapplication.pri/d" -e "/CONFIG += c++11/a CONFIG += qtsingleapplication" -i ykman-gui/ykman-gui.pro || die
|
|
||||||
}
|
|
||||||
|
|
||||||
src_configure() {
|
|
||||||
eqmake5
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
emake install INSTALL_ROOT="${D}"
|
|
||||||
}
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,2 +1 @@
|
|||||||
DIST thefuck-3.23.tar.gz 1353847 SHA256 36b0af52219a56dc34bb085e75afa822c479c5c05b9393598effc2c1b3c5eb32 SHA512 893700fcec88d7c0070bdc1ea90309cb77ebd7e21895cc633e2d5d2f99a83117e182b8dd386abee97b96affce3126a745613612522b5c731c2e7ab7a162b3814 WHIRLPOOL 88c0d7ffcb4d9a902cba8a54bfbf5939daa2c9d573bc6b7b3c326504dd57345041987b4ee0da2b0f3aaa97f687e9ff143d8e3fffddb68b69e9f8768078bbc2e0
|
|
||||||
DIST thefuck-3.24.tar.gz 1360450 SHA256 686867f264ee34d9287814dde0e9ca5debb322deeaf0ac6773ec06f823d7c0b4 SHA512 d4949ea723cf3b080f2fbe269d0cafe3d0266089fa8cc515b3b9376b2004c045be82716cd219741a60a0e99c20575adb92339a879467f709f7ca03dcc71a5c2d WHIRLPOOL 395eb03bf8ec1504909631a7e88e2761d7778742fb52d6fd567ee4c3c1ec9186726550dde23b2234a93064d6317065852236fb83fd4bfcdb733a4d2aa7cee2e8
|
DIST thefuck-3.24.tar.gz 1360450 SHA256 686867f264ee34d9287814dde0e9ca5debb322deeaf0ac6773ec06f823d7c0b4 SHA512 d4949ea723cf3b080f2fbe269d0cafe3d0266089fa8cc515b3b9376b2004c045be82716cd219741a60a0e99c20575adb92339a879467f709f7ca03dcc71a5c2d WHIRLPOOL 395eb03bf8ec1504909631a7e88e2761d7778742fb52d6fd567ee4c3c1ec9186726550dde23b2234a93064d6317065852236fb83fd4bfcdb733a4d2aa7cee2e8
|
||||||
|
@ -1,35 +0,0 @@
|
|||||||
# Copyright 1999-2017 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI=6
|
|
||||||
PYTHON_COMPAT=(python{3_4,3_5,3_6})
|
|
||||||
|
|
||||||
inherit distutils-r1
|
|
||||||
|
|
||||||
DESCRIPTION="Magnificent app which corrects your previous console command"
|
|
||||||
HOMEPAGE="https://github.com/nvbn/thefuck"
|
|
||||||
SRC_URI="https://github.com/nvbn/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
|
||||||
KEYWORDS="~amd64 ~x86"
|
|
||||||
|
|
||||||
LICENSE="MIT"
|
|
||||||
SLOT="0"
|
|
||||||
IUSE="test"
|
|
||||||
|
|
||||||
RDEPEND="dev-python/psutil[${PYTHON_USEDEP}]
|
|
||||||
dev-python/six[${PYTHON_USEDEP}]
|
|
||||||
dev-python/decorator[${PYTHON_USEDEP}]
|
|
||||||
dev-python/colorama[${PYTHON_USEDEP}]
|
|
||||||
dev-python/pyte[${PYTHON_USEDEP}]"
|
|
||||||
DEPEND="test? ( ${RDEPEND}
|
|
||||||
dev-python/pytest[${PYTHON_USEDEP}]
|
|
||||||
dev-python/pytest-mock[${PYTHON_USEDEP}] )
|
|
||||||
dev-python/setuptools[${PYTHON_USEDEP}]"
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
sed -i -e "/import pip/s/^/#/" -e "/pip.__version__/,+3 s/^/#/" setup.py || die
|
|
||||||
distutils-r1_src_prepare
|
|
||||||
}
|
|
||||||
|
|
||||||
python_test() {
|
|
||||||
py.test || die
|
|
||||||
}
|
|
Binary file not shown.
@ -0,0 +1,27 @@
|
|||||||
|
From b524efeffa8d192c2597f4612ca961adc30286f6 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Albert Astals Cid <aacid@kde.org>
|
||||||
|
Date: Wed, 13 Sep 2017 22:58:14 +0200
|
||||||
|
Subject: [PATCH 1/4] XRef::parseEntry: Fix crash in broken file
|
||||||
|
|
||||||
|
Bug #102687
|
||||||
|
---
|
||||||
|
poppler/XRef.cc | 3 +++
|
||||||
|
1 file changed, 3 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/poppler/XRef.cc b/poppler/XRef.cc
|
||||||
|
index 6ea0fbb6..c74f2f60 100644
|
||||||
|
--- a/poppler/XRef.cc
|
||||||
|
+++ b/poppler/XRef.cc
|
||||||
|
@@ -1603,6 +1603,9 @@ GBool XRef::parseEntry(Goffset offset, XRefEntry *entry)
|
||||||
|
{
|
||||||
|
GBool r;
|
||||||
|
|
||||||
|
+ if (unlikely(entry == nullptr))
|
||||||
|
+ return gFalse;
|
||||||
|
+
|
||||||
|
Object obj;
|
||||||
|
obj.initNull();
|
||||||
|
Parser parser = Parser(NULL, new Lexer(NULL,
|
||||||
|
--
|
||||||
|
2.14.1
|
||||||
|
|
@ -0,0 +1,27 @@
|
|||||||
|
From 6ba3bba6447897260bf4117e191e09d89d91ff62 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Albert Astals Cid <aacid@kde.org>
|
||||||
|
Date: Wed, 13 Sep 2017 23:09:45 +0200
|
||||||
|
Subject: [PATCH 2/4] isImageInterpolationRequired: Fix divide by 0 on broken
|
||||||
|
documents
|
||||||
|
|
||||||
|
Bug #102688
|
||||||
|
---
|
||||||
|
splash/Splash.cc | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/splash/Splash.cc b/splash/Splash.cc
|
||||||
|
index 46b8ce29..39fc7d64 100644
|
||||||
|
--- a/splash/Splash.cc
|
||||||
|
+++ b/splash/Splash.cc
|
||||||
|
@@ -4134,7 +4134,7 @@ SplashError Splash::arbitraryTransformImage(SplashImageSource src, SplashICCTran
|
||||||
|
static GBool isImageInterpolationRequired(int srcWidth, int srcHeight,
|
||||||
|
int scaledWidth, int scaledHeight,
|
||||||
|
GBool interpolate) {
|
||||||
|
- if (interpolate)
|
||||||
|
+ if (interpolate || srcWidth == 0 || srcHeight == 0)
|
||||||
|
return gTrue;
|
||||||
|
|
||||||
|
/* When scale factor is >= 400% we don't interpolate. See bugs #25268, #9860 */
|
||||||
|
--
|
||||||
|
2.14.1
|
||||||
|
|
@ -0,0 +1,100 @@
|
|||||||
|
From 778180c0c09002f6adfc272eba6b0d0e4401c4cc Mon Sep 17 00:00:00 2001
|
||||||
|
From: Albert Astals Cid <aacid@kde.org>
|
||||||
|
Date: Wed, 13 Sep 2017 23:01:03 +0200
|
||||||
|
Subject: [PATCH 3/4] Gfx::doShowText: Fix infinite recursion on broken files
|
||||||
|
|
||||||
|
Bug #102701
|
||||||
|
---
|
||||||
|
poppler/Gfx.cc | 25 +++++++++++++++++++++++--
|
||||||
|
poppler/Gfx.h | 1 +
|
||||||
|
poppler/GfxFont.cc | 9 +++++++++
|
||||||
|
poppler/GfxFont.h | 1 +
|
||||||
|
4 files changed, 34 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/poppler/Gfx.cc b/poppler/Gfx.cc
|
||||||
|
index 37220280..9feac54c 100644
|
||||||
|
--- a/poppler/Gfx.cc
|
||||||
|
+++ b/poppler/Gfx.cc
|
||||||
|
@@ -4031,12 +4031,33 @@ void Gfx::doShowText(GooString *s) {
|
||||||
|
state->transformDelta(dx, dy, &ddx, &ddy);
|
||||||
|
if (!out->beginType3Char(state, curX + riseX, curY + riseY, ddx, ddy,
|
||||||
|
code, u, uLen)) {
|
||||||
|
- ((Gfx8BitFont *)font)->getCharProc(code, &charProc);
|
||||||
|
+ ((Gfx8BitFont *)font)->getCharProcNF(code, &charProc);
|
||||||
|
+ int refNum = -1;
|
||||||
|
+ if (charProc.isRef()) {
|
||||||
|
+ refNum = charProc.getRef().num;
|
||||||
|
+ charProc.fetch(((Gfx8BitFont *)font)->getCharProcs()->getXRef(), &charProc);
|
||||||
|
+ }
|
||||||
|
if ((resDict = ((Gfx8BitFont *)font)->getResources())) {
|
||||||
|
pushResources(resDict);
|
||||||
|
}
|
||||||
|
if (charProc.isStream()) {
|
||||||
|
- display(&charProc, gFalse);
|
||||||
|
+ std::set<int>::iterator charProcDrawingIt;
|
||||||
|
+ bool displayCharProc = true;
|
||||||
|
+ if (refNum != -1) {
|
||||||
|
+ if (charProcDrawing.find(refNum) == charProcDrawing.end()) {
|
||||||
|
+ charProcDrawingIt = charProcDrawing.insert(refNum).first;
|
||||||
|
+ } else {
|
||||||
|
+ displayCharProc = false;
|
||||||
|
+ error(errSyntaxError, -1, "CharProc wants to draw a CharProc that is already beign drawn");
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ if (displayCharProc) {
|
||||||
|
+ display(&charProc, gFalse);
|
||||||
|
+
|
||||||
|
+ if (refNum != -1) {
|
||||||
|
+ charProcDrawing.erase(charProcDrawingIt);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
} else {
|
||||||
|
error(errSyntaxError, getPos(), "Missing or bad Type3 CharProc entry");
|
||||||
|
}
|
||||||
|
diff --git a/poppler/Gfx.h b/poppler/Gfx.h
|
||||||
|
index a82f9f4a..44adaed5 100644
|
||||||
|
--- a/poppler/Gfx.h
|
||||||
|
+++ b/poppler/Gfx.h
|
||||||
|
@@ -228,6 +228,7 @@ private:
|
||||||
|
Parser *parser; // parser for page content stream(s)
|
||||||
|
|
||||||
|
std::set<int> formsDrawing; // the forms that are being drawn
|
||||||
|
+ std::set<int> charProcDrawing; // the charProc that are being drawn
|
||||||
|
|
||||||
|
GBool // callback to check for an abort
|
||||||
|
(*abortCheckCbk)(void *data);
|
||||||
|
diff --git a/poppler/GfxFont.cc b/poppler/GfxFont.cc
|
||||||
|
index b59ec06c..bb87c5a0 100644
|
||||||
|
--- a/poppler/GfxFont.cc
|
||||||
|
+++ b/poppler/GfxFont.cc
|
||||||
|
@@ -1818,6 +1818,15 @@ Object *Gfx8BitFont::getCharProc(int code, Object *proc) {
|
||||||
|
return proc;
|
||||||
|
}
|
||||||
|
|
||||||
|
+Object *Gfx8BitFont::getCharProcNF(int code, Object *proc) {
|
||||||
|
+ if (enc[code] && charProcs.isDict()) {
|
||||||
|
+ charProcs.dictLookupNF(enc[code], proc);
|
||||||
|
+ } else {
|
||||||
|
+ proc->initNull();
|
||||||
|
+ }
|
||||||
|
+ return proc;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
Dict *Gfx8BitFont::getResources() {
|
||||||
|
return resources.isDict() ? resources.getDict() : (Dict *)NULL;
|
||||||
|
}
|
||||||
|
diff --git a/poppler/GfxFont.h b/poppler/GfxFont.h
|
||||||
|
index de7a7464..89a0ca0d 100644
|
||||||
|
--- a/poppler/GfxFont.h
|
||||||
|
+++ b/poppler/GfxFont.h
|
||||||
|
@@ -353,6 +353,7 @@ public:
|
||||||
|
|
||||||
|
// Return the Type 3 CharProc for the character associated with <code>.
|
||||||
|
Object *getCharProc(int code, Object *proc);
|
||||||
|
+ Object *getCharProcNF(int code, Object *proc);
|
||||||
|
|
||||||
|
// Return the Type 3 Resources dictionary, or NULL if none.
|
||||||
|
Dict *getResources();
|
||||||
|
--
|
||||||
|
2.14.1
|
||||||
|
|
@ -0,0 +1,24 @@
|
|||||||
|
From 504b3590182175390f474657a372e78fb1508262 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Albert Astals Cid <aacid@kde.org>
|
||||||
|
Date: Thu, 14 Sep 2017 19:14:23 +0200
|
||||||
|
Subject: Splash::scaleImage: Do not try to scale if srcHeight or srcWidth are
|
||||||
|
< 1
|
||||||
|
|
||||||
|
Bug #102719
|
||||||
|
|
||||||
|
diff --git a/splash/Splash.cc b/splash/Splash.cc
|
||||||
|
index 39fc7d6..aba7814 100644
|
||||||
|
--- a/splash/Splash.cc
|
||||||
|
+++ b/splash/Splash.cc
|
||||||
|
@@ -4152,7 +4152,7 @@ SplashBitmap *Splash::scaleImage(SplashImageSource src, void *srcData,
|
||||||
|
SplashBitmap *dest;
|
||||||
|
|
||||||
|
dest = new SplashBitmap(scaledWidth, scaledHeight, 1, srcMode, srcAlpha, gTrue, bitmap->getSeparationList());
|
||||||
|
- if (dest->getDataPtr() != NULL) {
|
||||||
|
+ if (dest->getDataPtr() != NULL && srcHeight > 0 && srcWidth > 0) {
|
||||||
|
if (scaledHeight < srcHeight) {
|
||||||
|
if (scaledWidth < srcWidth) {
|
||||||
|
scaleImageYdXd(src, srcData, srcMode, nComps, srcAlpha,
|
||||||
|
--
|
||||||
|
cgit v0.10.2
|
||||||
|
|
@ -0,0 +1,31 @@
|
|||||||
|
From 939465c40902d72e0c05d4f3a27ee67e4a007ed7 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Albert Astals Cid <aacid@kde.org>
|
||||||
|
Date: Tue, 19 Sep 2017 21:19:03 +0200
|
||||||
|
Subject: [PATCH] Fix crash in broken files
|
||||||
|
|
||||||
|
Bug #102854
|
||||||
|
---
|
||||||
|
poppler/Stream.cc | 5 ++---
|
||||||
|
1 file changed, 2 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/poppler/Stream.cc b/poppler/Stream.cc
|
||||||
|
index f4eda85b..0ad602c7 100644
|
||||||
|
--- a/poppler/Stream.cc
|
||||||
|
+++ b/poppler/Stream.cc
|
||||||
|
@@ -454,11 +454,10 @@ ImageStream::ImageStream(Stream *strA, int widthA, int nCompsA, int nBitsA) {
|
||||||
|
} else {
|
||||||
|
imgLineSize = nVals;
|
||||||
|
}
|
||||||
|
- if (width > INT_MAX / nComps) {
|
||||||
|
- // force a call to gmallocn(-1,...), which will throw an exception
|
||||||
|
+ if (nComps <= 0 || width > INT_MAX / nComps) {
|
||||||
|
imgLineSize = -1;
|
||||||
|
}
|
||||||
|
- imgLine = (Guchar *)gmallocn(imgLineSize, sizeof(Guchar));
|
||||||
|
+ imgLine = (Guchar *)gmallocn_checkoverflow(imgLineSize, sizeof(Guchar));
|
||||||
|
}
|
||||||
|
imgIdx = nVals;
|
||||||
|
}
|
||||||
|
--
|
||||||
|
2.14.1
|
||||||
|
|
@ -0,0 +1,36 @@
|
|||||||
|
From 170fe21144d469d3f865eda6e298df440b784499 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Albert Astals Cid <aacid@kde.org>
|
||||||
|
Date: Fri, 8 Sep 2017 18:28:15 +0200
|
||||||
|
Subject: [PATCH 2/3] Annot: Fix crash on broken files
|
||||||
|
|
||||||
|
Bug #102601
|
||||||
|
|
||||||
|
(cherry picked from commit 2532df6060092e9fab7f041ae9598aff9cdd94bb)
|
||||||
|
---
|
||||||
|
poppler/Annot.cc | 6 +++---
|
||||||
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/poppler/Annot.cc b/poppler/Annot.cc
|
||||||
|
index 27b698db..643ff12c 100644
|
||||||
|
--- a/poppler/Annot.cc
|
||||||
|
+++ b/poppler/Annot.cc
|
||||||
|
@@ -6865,13 +6865,13 @@ AnnotRichMedia::Content::Content(Dict *dict) {
|
||||||
|
assets = (Asset **)gmallocn(nAssets, sizeof(Asset *));
|
||||||
|
|
||||||
|
int counter = 0;
|
||||||
|
- for (int i = 0; i < obj2.arrayGetLength(); i += 2) {
|
||||||
|
+ for (int i = 0; i < nAssets; ++i) {
|
||||||
|
Object objKey;
|
||||||
|
|
||||||
|
assets[counter] = new AnnotRichMedia::Asset;
|
||||||
|
|
||||||
|
- obj2.arrayGet(i, &objKey);
|
||||||
|
- obj2.arrayGet(i + 1, &assets[counter]->fileSpec);
|
||||||
|
+ obj2.arrayGet(i * 2, &objKey);
|
||||||
|
+ obj2.arrayGet(i * 2 + 1, &assets[counter]->fileSpec);
|
||||||
|
|
||||||
|
assets[counter]->name = new GooString( objKey.getString() );
|
||||||
|
++counter;
|
||||||
|
--
|
||||||
|
2.14.1
|
||||||
|
|
@ -0,0 +1,32 @@
|
|||||||
|
From 876e7f76159e2b12ee7d2d396f327dd2cc90bcb0 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Albert Astals Cid <aacid@kde.org>
|
||||||
|
Date: Fri, 8 Sep 2017 18:26:05 +0200
|
||||||
|
Subject: [PATCH 3/3] SplashOutputDev: Fix crash on broken files
|
||||||
|
|
||||||
|
Bug #102604
|
||||||
|
|
||||||
|
(cherry picked from commit 6472d8493f7e82cc78b41da20a2bf19fcb4e0a7d)
|
||||||
|
---
|
||||||
|
poppler/SplashOutputDev.cc | 6 +++++-
|
||||||
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/poppler/SplashOutputDev.cc b/poppler/SplashOutputDev.cc
|
||||||
|
index 5502be64..46b55a42 100644
|
||||||
|
--- a/poppler/SplashOutputDev.cc
|
||||||
|
+++ b/poppler/SplashOutputDev.cc
|
||||||
|
@@ -2714,7 +2714,11 @@ void SplashOutputDev::endType3Char(GfxState *state) {
|
||||||
|
}
|
||||||
|
|
||||||
|
void SplashOutputDev::type3D0(GfxState *state, double wx, double wy) {
|
||||||
|
- t3GlyphStack->haveDx = gTrue;
|
||||||
|
+ if (likely(t3GlyphStack != nullptr)) {
|
||||||
|
+ t3GlyphStack->haveDx = gTrue;
|
||||||
|
+ } else {
|
||||||
|
+ error(errSyntaxWarning, -1, "t3GlyphStack was null in SplashOutputDev::type3D0");
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
|
||||||
|
void SplashOutputDev::type3D1(GfxState *state, double wx, double wy,
|
||||||
|
--
|
||||||
|
2.14.1
|
||||||
|
|
@ -0,0 +1,69 @@
|
|||||||
|
From 6bf7212c44d0131c8f8227a4a4dadc52a3afebd9 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Albert Astals Cid <aacid@kde.org>
|
||||||
|
Date: Fri, 8 Sep 2017 18:29:42 +0200
|
||||||
|
Subject: [PATCH 1/3] Annot: Fix crash on broken files
|
||||||
|
|
||||||
|
Bug #102607
|
||||||
|
|
||||||
|
(cherry picked from commit 1316c7a41f4dd7276f404f775ebb5fef2d24ab1c)
|
||||||
|
---
|
||||||
|
poppler/Annot.cc | 42 +++++++++++++++++++++++-------------------
|
||||||
|
1 file changed, 23 insertions(+), 19 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/poppler/Annot.cc b/poppler/Annot.cc
|
||||||
|
index 974b098b..27b698db 100644
|
||||||
|
--- a/poppler/Annot.cc
|
||||||
|
+++ b/poppler/Annot.cc
|
||||||
|
@@ -6982,26 +6982,30 @@ AnnotRichMedia::Configuration::Configuration(Dict *dict)
|
||||||
|
} else if (!strcmp(name, "Video")) {
|
||||||
|
type = typeVideo;
|
||||||
|
} else {
|
||||||
|
- // determine from first instance
|
||||||
|
+ // determine from first non null instance
|
||||||
|
+ type = typeFlash; // default in case all instances are null
|
||||||
|
if (instances && nInstances > 0) {
|
||||||
|
- AnnotRichMedia::Instance *instance = instances[0];
|
||||||
|
- switch (instance->getType()) {
|
||||||
|
- case AnnotRichMedia::Instance::type3D:
|
||||||
|
- type = type3D;
|
||||||
|
- break;
|
||||||
|
- case AnnotRichMedia::Instance::typeFlash:
|
||||||
|
- type = typeFlash;
|
||||||
|
- break;
|
||||||
|
- case AnnotRichMedia::Instance::typeSound:
|
||||||
|
- type = typeSound;
|
||||||
|
- break;
|
||||||
|
- case AnnotRichMedia::Instance::typeVideo:
|
||||||
|
- type = typeVideo;
|
||||||
|
- break;
|
||||||
|
- default:
|
||||||
|
- type = typeFlash;
|
||||||
|
- break;
|
||||||
|
- }
|
||||||
|
+ for (int i = 0; i < nInstances; ++i) {
|
||||||
|
+ AnnotRichMedia::Instance *instance = instances[i];
|
||||||
|
+ if (instance) {
|
||||||
|
+ switch (instance->getType()) {
|
||||||
|
+ case AnnotRichMedia::Instance::type3D:
|
||||||
|
+ type = type3D;
|
||||||
|
+ break;
|
||||||
|
+ case AnnotRichMedia::Instance::typeFlash:
|
||||||
|
+ type = typeFlash;
|
||||||
|
+ break;
|
||||||
|
+ case AnnotRichMedia::Instance::typeSound:
|
||||||
|
+ type = typeSound;
|
||||||
|
+ break;
|
||||||
|
+ case AnnotRichMedia::Instance::typeVideo:
|
||||||
|
+ type = typeVideo;
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
+ // break the loop since we found the first non null instance
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
--
|
||||||
|
2.14.1
|
||||||
|
|
@ -0,0 +1,252 @@
|
|||||||
|
From accdc5be215c7ee3223e3ad21dee7708d910ef23 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Albert Astals Cid <aacid@kde.org>
|
||||||
|
Date: Mon, 25 Sep 2017 19:33:44 +0200
|
||||||
|
Subject: [PATCH 4/4] Fix infinite recursion on broken files
|
||||||
|
|
||||||
|
Bug #102969
|
||||||
|
---
|
||||||
|
poppler/Gfx.cc | 46 ++++++++++++++++++++++++++++++++++------------
|
||||||
|
poppler/GfxState.cc | 33 ++++++++++++++++++---------------
|
||||||
|
poppler/GfxState.h | 15 +++++++++------
|
||||||
|
3 files changed, 61 insertions(+), 33 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/poppler/Gfx.cc b/poppler/Gfx.cc
|
||||||
|
index 9feac54c..66d0a24c 100644
|
||||||
|
--- a/poppler/Gfx.cc
|
||||||
|
+++ b/poppler/Gfx.cc
|
||||||
|
@@ -468,8 +468,14 @@ GfxPattern *GfxResources::lookupPattern(char *name, OutputDev *out, GfxState *st
|
||||||
|
|
||||||
|
for (resPtr = this; resPtr; resPtr = resPtr->next) {
|
||||||
|
if (resPtr->patternDict.isDict()) {
|
||||||
|
- if (!resPtr->patternDict.dictLookup(name, &obj)->isNull()) {
|
||||||
|
- pattern = GfxPattern::parse(resPtr, &obj, out, state);
|
||||||
|
+ if (!resPtr->patternDict.dictLookupNF(name, &obj)->isNull()) {
|
||||||
|
+ Ref patternRef = { -1, -1 };
|
||||||
|
+ if (obj.isRef()) {
|
||||||
|
+ patternRef = obj.getRef();
|
||||||
|
+ obj.fetch(resPtr->patternDict.getDict()->getXRef(), &obj);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ pattern = GfxPattern::parse(resPtr, &obj, out, state, patternRef.num);
|
||||||
|
obj.free();
|
||||||
|
return pattern;
|
||||||
|
}
|
||||||
|
@@ -2298,18 +2304,34 @@ void Gfx::doTilingPatternFill(GfxTilingPattern *tPat,
|
||||||
|
xi0, yi0, xi1, yi1, xstep, ystep)) {
|
||||||
|
goto restore;
|
||||||
|
} else {
|
||||||
|
- out->updatePatternOpacity(state);
|
||||||
|
- for (yi = yi0; yi < yi1; ++yi) {
|
||||||
|
- for (xi = xi0; xi < xi1; ++xi) {
|
||||||
|
- x = xi * xstep;
|
||||||
|
- y = yi * ystep;
|
||||||
|
- m1[4] = x * m[0] + y * m[2] + m[4];
|
||||||
|
- m1[5] = x * m[1] + y * m[3] + m[5];
|
||||||
|
- drawForm(tPat->getContentStream(), tPat->getResDict(),
|
||||||
|
- m1, tPat->getBBox());
|
||||||
|
+ bool shouldDrawForm = gTrue;
|
||||||
|
+ std::set<int>::iterator patternRefIt;
|
||||||
|
+ const int patternRefNum = tPat->getPatternRefNum();
|
||||||
|
+ if (patternRefNum != -1) {
|
||||||
|
+ if (formsDrawing.find(patternRefNum) == formsDrawing.end()) {
|
||||||
|
+ patternRefIt = formsDrawing.insert(patternRefNum).first;
|
||||||
|
+ } else {
|
||||||
|
+ shouldDrawForm = gFalse;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (shouldDrawForm) {
|
||||||
|
+ out->updatePatternOpacity(state);
|
||||||
|
+ for (yi = yi0; yi < yi1; ++yi) {
|
||||||
|
+ for (xi = xi0; xi < xi1; ++xi) {
|
||||||
|
+ x = xi * xstep;
|
||||||
|
+ y = yi * ystep;
|
||||||
|
+ m1[4] = x * m[0] + y * m[2] + m[4];
|
||||||
|
+ m1[5] = x * m[1] + y * m[3] + m[5];
|
||||||
|
+ drawForm(tPat->getContentStream(), tPat->getResDict(),
|
||||||
|
+ m1, tPat->getBBox());
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ out->clearPatternOpacity(state);
|
||||||
|
+ if (patternRefNum != -1) {
|
||||||
|
+ formsDrawing.erase(patternRefIt);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
- out->clearPatternOpacity(state);
|
||||||
|
}
|
||||||
|
|
||||||
|
// restore graphics state
|
||||||
|
diff --git a/poppler/GfxState.cc b/poppler/GfxState.cc
|
||||||
|
index f61f8124..90030b10 100644
|
||||||
|
--- a/poppler/GfxState.cc
|
||||||
|
+++ b/poppler/GfxState.cc
|
||||||
|
@@ -3446,14 +3446,17 @@ void GfxPatternColorSpace::getDefaultColor(GfxColor *color) {
|
||||||
|
// Pattern
|
||||||
|
//------------------------------------------------------------------------
|
||||||
|
|
||||||
|
-GfxPattern::GfxPattern(int typeA) {
|
||||||
|
- type = typeA;
|
||||||
|
+GfxPattern::GfxPattern(int typeA, int patternRefNumA)
|
||||||
|
+ : type(typeA)
|
||||||
|
+ , patternRefNum(patternRefNumA)
|
||||||
|
+{
|
||||||
|
+
|
||||||
|
}
|
||||||
|
|
||||||
|
GfxPattern::~GfxPattern() {
|
||||||
|
}
|
||||||
|
|
||||||
|
-GfxPattern *GfxPattern::parse(GfxResources *res, Object *obj, OutputDev *out, GfxState *state) {
|
||||||
|
+GfxPattern *GfxPattern::parse(GfxResources *res, Object *obj, OutputDev *out, GfxState *state, int patternRefNum) {
|
||||||
|
GfxPattern *pattern;
|
||||||
|
Object obj1;
|
||||||
|
|
||||||
|
@@ -3466,9 +3469,9 @@ GfxPattern *GfxPattern::parse(GfxResources *res, Object *obj, OutputDev *out, Gf
|
||||||
|
}
|
||||||
|
pattern = NULL;
|
||||||
|
if (obj1.isInt() && obj1.getInt() == 1) {
|
||||||
|
- pattern = GfxTilingPattern::parse(obj);
|
||||||
|
+ pattern = GfxTilingPattern::parse(obj, patternRefNum);
|
||||||
|
} else if (obj1.isInt() && obj1.getInt() == 2) {
|
||||||
|
- pattern = GfxShadingPattern::parse(res, obj, out, state);
|
||||||
|
+ pattern = GfxShadingPattern::parse(res, obj, out, state, patternRefNum);
|
||||||
|
}
|
||||||
|
obj1.free();
|
||||||
|
return pattern;
|
||||||
|
@@ -3478,7 +3481,7 @@ GfxPattern *GfxPattern::parse(GfxResources *res, Object *obj, OutputDev *out, Gf
|
||||||
|
// GfxTilingPattern
|
||||||
|
//------------------------------------------------------------------------
|
||||||
|
|
||||||
|
-GfxTilingPattern *GfxTilingPattern::parse(Object *patObj) {
|
||||||
|
+GfxTilingPattern *GfxTilingPattern::parse(Object *patObj, int patternRefNum) {
|
||||||
|
GfxTilingPattern *pat;
|
||||||
|
Dict *dict;
|
||||||
|
int paintTypeA, tilingTypeA;
|
||||||
|
@@ -3555,7 +3558,7 @@ GfxTilingPattern *GfxTilingPattern::parse(Object *patObj) {
|
||||||
|
obj1.free();
|
||||||
|
|
||||||
|
pat = new GfxTilingPattern(paintTypeA, tilingTypeA, bboxA, xStepA, yStepA,
|
||||||
|
- &resDictA, matrixA, patObj);
|
||||||
|
+ &resDictA, matrixA, patObj, patternRefNum);
|
||||||
|
resDictA.free();
|
||||||
|
return pat;
|
||||||
|
}
|
||||||
|
@@ -3563,8 +3566,8 @@ GfxTilingPattern *GfxTilingPattern::parse(Object *patObj) {
|
||||||
|
GfxTilingPattern::GfxTilingPattern(int paintTypeA, int tilingTypeA,
|
||||||
|
double *bboxA, double xStepA, double yStepA,
|
||||||
|
Object *resDictA, double *matrixA,
|
||||||
|
- Object *contentStreamA):
|
||||||
|
- GfxPattern(1)
|
||||||
|
+ Object *contentStreamA, int patternRefNumA) :
|
||||||
|
+ GfxPattern(1, patternRefNumA)
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
|
||||||
|
@@ -3589,14 +3592,14 @@ GfxTilingPattern::~GfxTilingPattern() {
|
||||||
|
|
||||||
|
GfxPattern *GfxTilingPattern::copy() {
|
||||||
|
return new GfxTilingPattern(paintType, tilingType, bbox, xStep, yStep,
|
||||||
|
- &resDict, matrix, &contentStream);
|
||||||
|
+ &resDict, matrix, &contentStream, getPatternRefNum());
|
||||||
|
}
|
||||||
|
|
||||||
|
//------------------------------------------------------------------------
|
||||||
|
// GfxShadingPattern
|
||||||
|
//------------------------------------------------------------------------
|
||||||
|
|
||||||
|
-GfxShadingPattern *GfxShadingPattern::parse(GfxResources *res, Object *patObj, OutputDev *out, GfxState *state) {
|
||||||
|
+GfxShadingPattern *GfxShadingPattern::parse(GfxResources *res, Object *patObj, OutputDev *out, GfxState *state, int patternRefNum) {
|
||||||
|
Dict *dict;
|
||||||
|
GfxShading *shadingA;
|
||||||
|
double matrixA[6];
|
||||||
|
@@ -3629,11 +3632,11 @@ GfxShadingPattern *GfxShadingPattern::parse(GfxResources *res, Object *patObj, O
|
||||||
|
}
|
||||||
|
obj1.free();
|
||||||
|
|
||||||
|
- return new GfxShadingPattern(shadingA, matrixA);
|
||||||
|
+ return new GfxShadingPattern(shadingA, matrixA, patternRefNum);
|
||||||
|
}
|
||||||
|
|
||||||
|
-GfxShadingPattern::GfxShadingPattern(GfxShading *shadingA, double *matrixA):
|
||||||
|
- GfxPattern(2)
|
||||||
|
+GfxShadingPattern::GfxShadingPattern(GfxShading *shadingA, double *matrixA, int patternRefNumA):
|
||||||
|
+ GfxPattern(2, patternRefNumA)
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
|
||||||
|
@@ -3648,7 +3651,7 @@ GfxShadingPattern::~GfxShadingPattern() {
|
||||||
|
}
|
||||||
|
|
||||||
|
GfxPattern *GfxShadingPattern::copy() {
|
||||||
|
- return new GfxShadingPattern(shading->copy(), matrix);
|
||||||
|
+ return new GfxShadingPattern(shading->copy(), matrix, getPatternRefNum());
|
||||||
|
}
|
||||||
|
|
||||||
|
//------------------------------------------------------------------------
|
||||||
|
diff --git a/poppler/GfxState.h b/poppler/GfxState.h
|
||||||
|
index 7bcedf2a..4b13fb2a 100644
|
||||||
|
--- a/poppler/GfxState.h
|
||||||
|
+++ b/poppler/GfxState.h
|
||||||
|
@@ -762,18 +762,21 @@ private:
|
||||||
|
class GfxPattern {
|
||||||
|
public:
|
||||||
|
|
||||||
|
- GfxPattern(int typeA);
|
||||||
|
+ GfxPattern(int typeA, int patternRefNumA);
|
||||||
|
virtual ~GfxPattern();
|
||||||
|
|
||||||
|
- static GfxPattern *parse(GfxResources *res, Object *obj, OutputDev *out, GfxState *state);
|
||||||
|
+ static GfxPattern *parse(GfxResources *res, Object *obj, OutputDev *out, GfxState *state, int patternRefNum);
|
||||||
|
|
||||||
|
virtual GfxPattern *copy() = 0;
|
||||||
|
|
||||||
|
int getType() { return type; }
|
||||||
|
|
||||||
|
+ int getPatternRefNum() const { return patternRefNum; }
|
||||||
|
+
|
||||||
|
private:
|
||||||
|
|
||||||
|
int type;
|
||||||
|
+ int patternRefNum;
|
||||||
|
};
|
||||||
|
|
||||||
|
//------------------------------------------------------------------------
|
||||||
|
@@ -783,7 +786,7 @@ private:
|
||||||
|
class GfxTilingPattern: public GfxPattern {
|
||||||
|
public:
|
||||||
|
|
||||||
|
- static GfxTilingPattern *parse(Object *patObj);
|
||||||
|
+ static GfxTilingPattern *parse(Object *patObj, int patternRefNum);
|
||||||
|
~GfxTilingPattern();
|
||||||
|
|
||||||
|
GfxPattern *copy() override;
|
||||||
|
@@ -803,7 +806,7 @@ private:
|
||||||
|
GfxTilingPattern(int paintTypeA, int tilingTypeA,
|
||||||
|
double *bboxA, double xStepA, double yStepA,
|
||||||
|
Object *resDictA, double *matrixA,
|
||||||
|
- Object *contentStreamA);
|
||||||
|
+ Object *contentStreamA, int patternRefNumA);
|
||||||
|
|
||||||
|
int paintType;
|
||||||
|
int tilingType;
|
||||||
|
@@ -821,7 +824,7 @@ private:
|
||||||
|
class GfxShadingPattern: public GfxPattern {
|
||||||
|
public:
|
||||||
|
|
||||||
|
- static GfxShadingPattern *parse(GfxResources *res, Object *patObj, OutputDev *out, GfxState *state);
|
||||||
|
+ static GfxShadingPattern *parse(GfxResources *res, Object *patObj, OutputDev *out, GfxState *state, int patternRefNum);
|
||||||
|
~GfxShadingPattern();
|
||||||
|
|
||||||
|
GfxPattern *copy() override;
|
||||||
|
@@ -831,7 +834,7 @@ public:
|
||||||
|
|
||||||
|
private:
|
||||||
|
|
||||||
|
- GfxShadingPattern(GfxShading *shadingA, double *matrixA);
|
||||||
|
+ GfxShadingPattern(GfxShading *shadingA, double *matrixA, int patternRefNumA);
|
||||||
|
|
||||||
|
GfxShading *shading;
|
||||||
|
double matrix[6];
|
||||||
|
--
|
||||||
|
2.14.1
|
||||||
|
|
@ -0,0 +1,28 @@
|
|||||||
|
From 19ebd40547186a8ea6da08c8d8e2a6d6b7e84f5d Mon Sep 17 00:00:00 2001
|
||||||
|
From: Albert Astals Cid <aacid@kde.org>
|
||||||
|
Date: Fri, 13 Oct 2017 00:55:49 +0200
|
||||||
|
Subject: [PATCH] CairoOutputDev: Fix crash in broken files
|
||||||
|
|
||||||
|
Bug #103016
|
||||||
|
---
|
||||||
|
poppler/CairoOutputDev.cc | 4 +++-
|
||||||
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/poppler/CairoOutputDev.cc b/poppler/CairoOutputDev.cc
|
||||||
|
index ffd39ef7..80f7a99e 100644
|
||||||
|
--- a/poppler/CairoOutputDev.cc
|
||||||
|
+++ b/poppler/CairoOutputDev.cc
|
||||||
|
@@ -2714,7 +2714,9 @@ void CairoOutputDev::drawSoftMaskedImage(GfxState *state, Object *ref, Stream *s
|
||||||
|
for (y = 0; y < maskHeight; y++) {
|
||||||
|
maskDest = (unsigned char *) (maskBuffer + y * row_stride);
|
||||||
|
pix = maskImgStr->getLine();
|
||||||
|
- maskColorMap->getGrayLine (pix, maskDest, maskWidth);
|
||||||
|
+ if (likely(pix != nullptr)) {
|
||||||
|
+ maskColorMap->getGrayLine (pix, maskDest, maskWidth);
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
|
||||||
|
maskImgStr->close();
|
||||||
|
--
|
||||||
|
2.14.1
|
||||||
|
|
@ -0,0 +1,25 @@
|
|||||||
|
Fix security issue [internal unmaintained JPX decoder] that is caused
|
||||||
|
by building without system-jpeg libs. Fedora does not care because they
|
||||||
|
always build with system-jpeg, however in Gentoo we allow the user to
|
||||||
|
disable both options and poppler's buildsystem is making us believe
|
||||||
|
there would be no JPX decoder built in that case, when in reality
|
||||||
|
JPXStream.cc is built (even if it may not be used by the code).
|
||||||
|
|
||||||
|
|
||||||
|
--- a/CMakeLists.txt 2017-11-24 23:12:41.953450442 +0100
|
||||||
|
+++ b/CMakeLists.txt 2017-11-24 23:16:09.441030669 +0100
|
||||||
|
@@ -506,9 +508,11 @@
|
||||||
|
add_definitions(-DUSE_OPENJPEG2)
|
||||||
|
set(poppler_LIBS ${poppler_LIBS} ${LIBOPENJPEG2_LIBRARIES})
|
||||||
|
else ()
|
||||||
|
- set(poppler_SRCS ${poppler_SRCS}
|
||||||
|
- poppler/JPXStream.cc
|
||||||
|
- )
|
||||||
|
+ if(NOT WITH_OPENJPEG AND HAVE_JPX_DECODER)
|
||||||
|
+ set(poppler_SRCS ${poppler_SRCS}
|
||||||
|
+ poppler/JPXStream.cc
|
||||||
|
+ )
|
||||||
|
+ endif()
|
||||||
|
endif()
|
||||||
|
if(USE_CMS)
|
||||||
|
if(LCMS_FOUND)
|
@ -0,0 +1,158 @@
|
|||||||
|
# Copyright 1999-2017 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
|
EAPI=6
|
||||||
|
|
||||||
|
inherit cmake-utils toolchain-funcs xdg-utils
|
||||||
|
|
||||||
|
if [[ "${PV}" == "9999" ]] ; then
|
||||||
|
inherit git-r3
|
||||||
|
EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}"
|
||||||
|
SLOT="0/9999"
|
||||||
|
else
|
||||||
|
SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
|
||||||
|
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||||
|
SLOT="0/68" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
|
||||||
|
fi
|
||||||
|
|
||||||
|
DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
|
||||||
|
HOMEPAGE="https://poppler.freedesktop.org/"
|
||||||
|
|
||||||
|
LICENSE="GPL-2"
|
||||||
|
IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt4 qt5 tiff +utils"
|
||||||
|
|
||||||
|
# No test data provided
|
||||||
|
RESTRICT="test"
|
||||||
|
|
||||||
|
COMMON_DEPEND="
|
||||||
|
>=media-libs/fontconfig-2.6.0
|
||||||
|
>=media-libs/freetype-2.3.9
|
||||||
|
sys-libs/zlib
|
||||||
|
cairo? (
|
||||||
|
dev-libs/glib:2
|
||||||
|
>=x11-libs/cairo-1.10.0
|
||||||
|
introspection? ( >=dev-libs/gobject-introspection-1.32.1:= )
|
||||||
|
)
|
||||||
|
curl? ( net-misc/curl )
|
||||||
|
jpeg? ( virtual/jpeg:0 )
|
||||||
|
jpeg2k? ( media-libs/openjpeg:2= )
|
||||||
|
lcms? ( media-libs/lcms:2 )
|
||||||
|
nss? ( >=dev-libs/nss-3.19:0 )
|
||||||
|
png? ( media-libs/libpng:0= )
|
||||||
|
qt4? (
|
||||||
|
dev-qt/qtcore:4
|
||||||
|
dev-qt/qtgui:4
|
||||||
|
)
|
||||||
|
qt5? (
|
||||||
|
dev-qt/qtcore:5
|
||||||
|
dev-qt/qtgui:5
|
||||||
|
dev-qt/qtxml:5
|
||||||
|
)
|
||||||
|
tiff? ( media-libs/tiff:0 )
|
||||||
|
"
|
||||||
|
DEPEND="${COMMON_DEPEND}
|
||||||
|
virtual/pkgconfig
|
||||||
|
"
|
||||||
|
RDEPEND="${COMMON_DEPEND}
|
||||||
|
cjk? ( >=app-text/poppler-data-0.4.7 )
|
||||||
|
"
|
||||||
|
|
||||||
|
DOCS=(AUTHORS NEWS README README-XPDF TODO)
|
||||||
|
|
||||||
|
PATCHES=(
|
||||||
|
"${FILESDIR}/${PN}-0.26.0-qt5-dependencies.patch"
|
||||||
|
"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
|
||||||
|
"${FILESDIR}/${PN}-0.53.0-respect-cflags.patch"
|
||||||
|
"${FILESDIR}/${PN}-0.33.0-openjpeg2.patch"
|
||||||
|
"${FILESDIR}/${PN}-0.40-FindQt4.patch"
|
||||||
|
"${FILESDIR}/${P}-disable-internal-jpx.patch"
|
||||||
|
# Fedora backports from upstream
|
||||||
|
"${FILESDIR}/${P}-CVE-2017-14517.patch"
|
||||||
|
"${FILESDIR}/${P}-CVE-2017-14518.patch"
|
||||||
|
"${FILESDIR}/${P}-CVE-2017-14519.patch"
|
||||||
|
"${FILESDIR}/${P}-CVE-2017-14520.patch"
|
||||||
|
"${FILESDIR}/${P}-CVE-2017-14617.patch"
|
||||||
|
"${FILESDIR}/${P}-CVE-2017-14926.patch"
|
||||||
|
"${FILESDIR}/${P}-CVE-2017-14927.patch"
|
||||||
|
"${FILESDIR}/${P}-CVE-2017-14928.patch"
|
||||||
|
"${FILESDIR}/${P}-CVE-2017-14929.patch"
|
||||||
|
"${FILESDIR}/${P}-CVE-2017-15565.patch"
|
||||||
|
)
|
||||||
|
|
||||||
|
src_prepare() {
|
||||||
|
cmake-utils_src_prepare
|
||||||
|
|
||||||
|
# Clang doesn't grok this flag, the configure nicely tests that, but
|
||||||
|
# cmake just uses it, so remove it if we use clang
|
||||||
|
if [[ ${CC} == clang ]] ; then
|
||||||
|
sed -i -e 's/-fno-check-new//' cmake/modules/PopplerMacros.cmake || die
|
||||||
|
fi
|
||||||
|
|
||||||
|
if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
|
||||||
|
sed '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
|
||||||
|
-i CMakeLists.txt || die
|
||||||
|
else
|
||||||
|
einfo "policy(SET CMP0002 OLD) - workaround can be removed"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if tc-is-clang && [[ ${CHOST} == *-darwin* ]] ; then
|
||||||
|
# we need to up the C++ version, bug #622526
|
||||||
|
export CXX="$(tc-getCXX) -std=c++11"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
src_configure() {
|
||||||
|
xdg_environment_reset
|
||||||
|
local mycmakeargs=(
|
||||||
|
-DBUILD_GTK_TESTS=OFF
|
||||||
|
-DBUILD_QT4_TESTS=OFF
|
||||||
|
-DBUILD_QT5_TESTS=OFF
|
||||||
|
-DBUILD_CPP_TESTS=OFF
|
||||||
|
-DENABLE_SPLASH=ON
|
||||||
|
-DENABLE_ZLIB=ON
|
||||||
|
-DENABLE_ZLIB_UNCOMPRESS=OFF
|
||||||
|
-DENABLE_XPDF_HEADERS=ON
|
||||||
|
-DENABLE_LIBCURL="$(usex curl)"
|
||||||
|
-DENABLE_CPP="$(usex cxx)"
|
||||||
|
-DENABLE_UTILS="$(usex utils)"
|
||||||
|
-DSPLASH_CMYK=OFF
|
||||||
|
-DUSE_FIXEDPOINT=OFF
|
||||||
|
-DUSE_FLOAT=OFF
|
||||||
|
-DWITH_Cairo="$(usex cairo)"
|
||||||
|
-DWITH_GObjectIntrospection="$(usex introspection)"
|
||||||
|
-DWITH_JPEG="$(usex jpeg)"
|
||||||
|
-DWITH_NSS3="$(usex nss)"
|
||||||
|
-DWITH_PNG="$(usex png)"
|
||||||
|
-DWITH_Qt4="$(usex qt4)"
|
||||||
|
$(cmake-utils_use_find_package qt5 Qt5Core)
|
||||||
|
-DWITH_TIFF="$(usex tiff)"
|
||||||
|
)
|
||||||
|
if use jpeg; then
|
||||||
|
mycmakeargs+=(-DENABLE_DCTDECODER=libjpeg)
|
||||||
|
else
|
||||||
|
mycmakeargs+=(-DENABLE_DCTDECODER=none)
|
||||||
|
fi
|
||||||
|
if use jpeg2k; then
|
||||||
|
mycmakeargs+=(-DENABLE_LIBOPENJPEG=openjpeg2)
|
||||||
|
else
|
||||||
|
mycmakeargs+=(-DENABLE_LIBOPENJPEG=none)
|
||||||
|
fi
|
||||||
|
if use lcms; then
|
||||||
|
mycmakeargs+=(-DENABLE_CMS=lcms2)
|
||||||
|
else
|
||||||
|
mycmakeargs+=(-DENABLE_CMS=)
|
||||||
|
fi
|
||||||
|
|
||||||
|
cmake-utils_src_configure
|
||||||
|
}
|
||||||
|
|
||||||
|
src_install() {
|
||||||
|
cmake-utils_src_install
|
||||||
|
|
||||||
|
# live version doesn't provide html documentation
|
||||||
|
if use cairo && use doc && [[ ${PV} != 9999 ]]; then
|
||||||
|
# For now install gtk-doc there
|
||||||
|
insinto /usr/share/gtk-doc/html/poppler
|
||||||
|
doins -r "${S}"/glib/reference/html/*
|
||||||
|
fi
|
||||||
|
}
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,2 +1 @@
|
|||||||
DIST esptool-2.0.1.tar.gz 67905 SHA256 413bc0a47088cb10770a20a472eb297d92a7ba933539fff981ceea95d17d45bd SHA512 13bc1594fc5546c3a461929f9413eab47cd9173c4fa89572801e1be5f1956f0e71589005ab5d547919eec94064d64307349a8f79b3833a90d9e79ead8bd694c4 WHIRLPOOL b727d105a43d7da04f41264ced26e2e598edca1b88bdaf97e9edc4418b5afd00a16c13fb0c1c2b54658541bd6b4b8186585985f383eb3d5e3a74c40abea6c0c7
|
|
||||||
DIST esptool-2.1.tar.gz 68974 SHA256 d709dbf89ee36ec7db3bbc35e574232acc6e32bea4e8257f8f56411cdd48e321 SHA512 be657df04a345d2c91bbe3a9cbb93cd7bb0bc68e61388ff4d134c88d514c74fe3f2c5e7c64f4100264bc5973b1d3e66251cdb16a77894fb9e116d9c6a54a8dc3 WHIRLPOOL b932f945b62cf2cb446ad22db0b93071a6757fb1d72e2ca9da2d0ea960565baa9776ba400006dea3160569ef80aa145281fff98a1094e6705cb63d6219abf887
|
DIST esptool-2.1.tar.gz 68974 SHA256 d709dbf89ee36ec7db3bbc35e574232acc6e32bea4e8257f8f56411cdd48e321 SHA512 be657df04a345d2c91bbe3a9cbb93cd7bb0bc68e61388ff4d134c88d514c74fe3f2c5e7c64f4100264bc5973b1d3e66251cdb16a77894fb9e116d9c6a54a8dc3 WHIRLPOOL b932f945b62cf2cb446ad22db0b93071a6757fb1d72e2ca9da2d0ea960565baa9776ba400006dea3160569ef80aa145281fff98a1094e6705cb63d6219abf887
|
||||||
|
@ -1,29 +0,0 @@
|
|||||||
# Copyright 1999-2017 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI=6
|
|
||||||
|
|
||||||
PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
|
|
||||||
|
|
||||||
inherit distutils-r1
|
|
||||||
|
|
||||||
DESCRIPTION="Utility to communicate with the ROM bootloader in Espressif ESP8266 and ESP32"
|
|
||||||
HOMEPAGE="https://github.com/espressif/esptool"
|
|
||||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
|
||||||
|
|
||||||
LICENSE="GPL-2+"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="~amd64"
|
|
||||||
IUSE=""
|
|
||||||
|
|
||||||
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
|
|
||||||
RDEPEND="${DEPEND}
|
|
||||||
dev-python/ecdsa[${PYTHON_USEDEP}]
|
|
||||||
dev-python/pyaes[${PYTHON_USEDEP}]
|
|
||||||
>=dev-python/pyserial-2.5[${PYTHON_USEDEP}]"
|
|
||||||
|
|
||||||
RESTRICT="test" # Uses a device connected to the serial port
|
|
||||||
|
|
||||||
python_test() {
|
|
||||||
${EPYTHON} test/test_esptool.py || die
|
|
||||||
}
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -0,0 +1,16 @@
|
|||||||
|
--- libcdio-1.0.0/configure.ac
|
||||||
|
+++ libcdio-1.0.0/configure.ac
|
||||||
|
@@ -32,7 +32,12 @@
|
||||||
|
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])],
|
||||||
|
[AC_SUBST([AM_DEFAULT_VERBOSITY], [1])])
|
||||||
|
|
||||||
|
-LIBCDIO_VERSION_NUM=`echo RELEASE_NUM | cut -d . -f 1 | tr -d a-z`
|
||||||
|
+# Broken by design. See also
|
||||||
|
+# https://savannah.gnu.org/bugs/?52491
|
||||||
|
+# and
|
||||||
|
+# http://git.savannah.gnu.org/cgit/libcdio.git/patch/?id=2d22ae18571caf29460a456340ff0603f04af6b4
|
||||||
|
+#LIBCDIO_VERSION_NUM=`echo RELEASE_NUM | cut -d . -f 1 | tr -d a-z`
|
||||||
|
+LIBCDIO_VERSION_NUM=10000
|
||||||
|
AC_SUBST(LIBCDIO_VERSION_NUM)
|
||||||
|
|
||||||
|
AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir)
|
@ -1 +1,2 @@
|
|||||||
DIST libconfig-1.5.tar.gz 644432 SHA256 e31daa390d8e4461c8830512fe2e13ba1a3d6a02a2305a02429eec61e68703f6 SHA512 16bead52ee8c880b25fd1ee6fa83c115dc51830f2f7954389bd8b72cc0e6fc05fc63fe415bd929851894a9f3a1127d51cfc4223149514246e9566305556b7bcd WHIRLPOOL ef3718b1ec4485202d1fd03db035419b6c0179e4c4eb47e74ff93b467677c4f53cf9d70d5eb7aa6230dab7a4115e5fae0fc4ed191f1bfc6d0c3c252ee5d90944
|
DIST libconfig-1.5.tar.gz 644432 BLAKE2B 9eaec8aca0692f30d6b51221a5d1bc624540da74f599292b1a161054dec8188b2ad2ee100a97c1e19f7b4763614206a5bf6ad03f6f7bbd33b40d57c51646e520 SHA512 16bead52ee8c880b25fd1ee6fa83c115dc51830f2f7954389bd8b72cc0e6fc05fc63fe415bd929851894a9f3a1127d51cfc4223149514246e9566305556b7bcd
|
||||||
|
DIST libconfig-1.7.1.tar.gz 2290501 BLAKE2B 6c55e0d41c1475434bcc61203bda40c478d0802ccb544866df4b7d9b69538ca1e2eab8642867b0ee7c56e26027d8fb326e470a5c9bdcbc37534fe23092be15e0 SHA512 b58b468e9e2d5175fbde1ad9765c6604dc9b3f3944613a88404a45d0d232e7d79a47321bf3c06b97cb46a2104b4313fad5c7f8944149f550b7af51ad523e775e
|
||||||
|
@ -0,0 +1,50 @@
|
|||||||
|
# Copyright 1999-2017 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
|
EAPI=6
|
||||||
|
inherit autotools eutils multilib-minimal
|
||||||
|
|
||||||
|
DESCRIPTION="Libconfig is a simple library for manipulating structured configuration files"
|
||||||
|
HOMEPAGE="
|
||||||
|
http://www.hyperrealm.com/libconfig/libconfig.html
|
||||||
|
https://github.com/hyperrealm/libconfig
|
||||||
|
"
|
||||||
|
SRC_URI="https://github.com/hyperrealm/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||||
|
|
||||||
|
LICENSE="LGPL-2.1"
|
||||||
|
SLOT="0/11"
|
||||||
|
KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
|
||||||
|
IUSE="+cxx static-libs"
|
||||||
|
|
||||||
|
DEPEND="
|
||||||
|
sys-devel/libtool
|
||||||
|
sys-devel/bison
|
||||||
|
"
|
||||||
|
|
||||||
|
src_prepare() {
|
||||||
|
default
|
||||||
|
sed -i \
|
||||||
|
-e '/sleep 3/d' \
|
||||||
|
-e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \
|
||||||
|
configure.ac || die
|
||||||
|
eautoreconf
|
||||||
|
multilib_copy_sources
|
||||||
|
}
|
||||||
|
|
||||||
|
multilib_src_configure() {
|
||||||
|
econf \
|
||||||
|
$(use_enable cxx) \
|
||||||
|
$(use_enable static-libs static) \
|
||||||
|
--disable-examples
|
||||||
|
}
|
||||||
|
|
||||||
|
multilib_src_test() {
|
||||||
|
# It responds to check but that does not work as intended
|
||||||
|
emake test
|
||||||
|
}
|
||||||
|
|
||||||
|
multilib_src_install() {
|
||||||
|
default
|
||||||
|
|
||||||
|
prune_libtool_files
|
||||||
|
}
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -0,0 +1,63 @@
|
|||||||
|
# Copyright 1999-2017 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
|
EAPI=6
|
||||||
|
|
||||||
|
DIST_AUTHOR=ECOCODE
|
||||||
|
DIST_VERSION=1.47
|
||||||
|
DIST_EXAMPLES=( "Examples/*" )
|
||||||
|
inherit perl-module
|
||||||
|
|
||||||
|
DESCRIPTION="Get stock and mutual fund quotes from various exchanges"
|
||||||
|
|
||||||
|
LICENSE="GPL-2"
|
||||||
|
SLOT="0"
|
||||||
|
KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
|
||||||
|
IUSE="test"
|
||||||
|
|
||||||
|
# virtual/perl-Data-Dumper currently commented out in the code
|
||||||
|
|
||||||
|
RDEPEND="
|
||||||
|
dev-perl/CGI
|
||||||
|
virtual/perl-Carp
|
||||||
|
dev-perl/DateTime
|
||||||
|
virtual/perl-Encode
|
||||||
|
virtual/perl-Exporter
|
||||||
|
dev-perl/HTML-Parser
|
||||||
|
dev-perl/HTML-TableExtract
|
||||||
|
dev-perl/HTML-Tree
|
||||||
|
dev-perl/HTTP-Cookies
|
||||||
|
dev-perl/HTTP-Message
|
||||||
|
dev-perl/JSON
|
||||||
|
dev-perl/LWP-Protocol-https
|
||||||
|
dev-perl/libwww-perl
|
||||||
|
dev-perl/Mozilla-CA
|
||||||
|
virtual/perl-Time-Piece
|
||||||
|
dev-perl/URI
|
||||||
|
"
|
||||||
|
DEPEND="${RDEPEND}
|
||||||
|
virtual/perl-ExtUtils-MakeMaker
|
||||||
|
test? (
|
||||||
|
virtual/perl-Data-Dumper
|
||||||
|
virtual/perl-File-Spec
|
||||||
|
virtual/perl-Test-Simple
|
||||||
|
)
|
||||||
|
"
|
||||||
|
|
||||||
|
src_test() {
|
||||||
|
perl_rm_files t/01-pod.t t/02-pod-coverage.t t/03-kwalitee.t \
|
||||||
|
t/04-critic.t t/author-pod-syntax.t
|
||||||
|
if ! has network ${DIST_TEST_OVERRIDE:-${DIST_TEST:-do parallel}}; then
|
||||||
|
einfo "Disabling network tests without DIST_TEST_OVERRIDE=~network"
|
||||||
|
else
|
||||||
|
export ONLINE_TEST=1
|
||||||
|
fi
|
||||||
|
perl-module_src_test
|
||||||
|
}
|
||||||
|
|
||||||
|
mydoc=("Documentation/*")
|
||||||
|
|
||||||
|
src_install() {
|
||||||
|
dodoc -r htdocs
|
||||||
|
perl-module_src_install
|
||||||
|
}
|
@ -1,2 +1,3 @@
|
|||||||
DIST Finance-Quote-1.37.tar.gz 251374 SHA256 6e1147e2e13ee27b223dffecf2f3bda5f85e10e8900247942ecb99e30e5cd7ac SHA512 ed58d27d1c14f7818871af4906c1b6109b3d353586bc348140120597199ed72d57b8939cebc95fa534e86ad7b9f9bf69bc4315db1d1cc1da5796aa9771697c51 WHIRLPOOL ee676ffcdceec66e2f5a12ddae7c9ed48426141313eba2a419ef884a1bd8ca326ba2a89e2db86cea9b82e7956b73fd314f2c52003428cabfb27a0b3af76d8801
|
DIST Finance-Quote-1.37.tar.gz 251374 BLAKE2B b961789ee2e628eb1ef4860269a441302bcd732e844262459ef9eadb27cb68f0528a07b074bf911f64dbd8895efa71ddae0c954e052b673783127b74f69237b3 SHA512 ed58d27d1c14f7818871af4906c1b6109b3d353586bc348140120597199ed72d57b8939cebc95fa534e86ad7b9f9bf69bc4315db1d1cc1da5796aa9771697c51
|
||||||
DIST Finance-Quote-1.38.tar.gz 327822 SHA256 a95427729e069095aab4cb7bcfa4072739417faa7c0a6d0eb1bd6de28f58187e SHA512 b55382d56ecf89eaf662f49ec6fd803e9e5e0163b63d3020ca3c875d4dff7607f502fa7600997c5db8d62fa671ea82e81597300443fc4b24bb3f94c80bd32439 WHIRLPOOL ef84399bf34541efebb74917f4e41db457e5949dfae71d27c55b8922b676dbbf5b3b8c53645e884f6d2b007ed75b1ca9e466f9b8c7e93d1478a9a707308dfd66
|
DIST Finance-Quote-1.38.tar.gz 327822 BLAKE2B b8efe6c11d51d54a70b1830610ec5e0f9a1f18d8f0fc88c1d8bbbdf0f5d66d75d82b5aab1be5df7acaf4a2e93e0af89ac16d6ef4935342fabdc3db3a65c2a727 SHA512 b55382d56ecf89eaf662f49ec6fd803e9e5e0163b63d3020ca3c875d4dff7607f502fa7600997c5db8d62fa671ea82e81597300443fc4b24bb3f94c80bd32439
|
||||||
|
DIST Finance-Quote-1.47.tar.gz 270335 BLAKE2B 585ab3736b7ea448b083f4dbbed460ac442fb30285041b7b0bf2a52d6b2d533a8d1eb1d9bfa72cc1cd7a3d4664d2cb5104eb539ecd6b1042083548b8ef605333 SHA512 a900ed3e305edb8c713dc4a885b912ad9a9f873cb501d66d393a39aacd8a980af1bd4fb0fdf5bce8e2b2aeec744e811b861a2803a6fb0d5c71ab6b8d1c3a57f7
|
||||||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,3 +1,3 @@
|
|||||||
DIST PyQt5_gpl-5.7.1.tar.gz 3733746 SHA256 be849f212a074049b9ebc10b6c07dddefb86e6d30e8df8a5c715cbb2cf7fad14 SHA512 7498713f73807522e58ae38ff58548cf80c2f2c418d6c55e20ce613cdc997e4ee7139076f1f152c7c3edb970bde14febc3496009f934e31ff71f01a1605f558f WHIRLPOOL 9322ccaaebf78a9e177703bae26f002cdfe9ad3ba45a9c7b9ccdd3b73cca96550e479b243b302d59eefdc1520a6e5b5f18ac5fabc1f8eff36f7f76d71b7dea11
|
DIST PyQt5_gpl-5.7.1.tar.gz 3733746 SHA256 be849f212a074049b9ebc10b6c07dddefb86e6d30e8df8a5c715cbb2cf7fad14 SHA512 7498713f73807522e58ae38ff58548cf80c2f2c418d6c55e20ce613cdc997e4ee7139076f1f152c7c3edb970bde14febc3496009f934e31ff71f01a1605f558f WHIRLPOOL 9322ccaaebf78a9e177703bae26f002cdfe9ad3ba45a9c7b9ccdd3b73cca96550e479b243b302d59eefdc1520a6e5b5f18ac5fabc1f8eff36f7f76d71b7dea11
|
||||||
DIST PyQt5_gpl-5.9.1.tar.gz 3101819 SHA256 5fc009448ea78c8fd48eb7083a7b93734dbd61290a9a21dab674096a7762b4ca SHA512 1c7d00dac5329296dd205eddeeecfd29495c4746791730056d143438871eb64a5d9827dcb1e28a78e8746218908e0e72374bd686a21b631b9aa1aa1c67e61eac WHIRLPOOL ab538dbe7eafb07db918c4aed6a701a6c791487181088fa6bd91daa8d90708921a9b1fbc85c80c97e7d65ff6e2b6c15e22f662f4dcb78ee091d487964bc7ef48
|
DIST PyQt5_gpl-5.9.1.tar.gz 3101819 BLAKE2B b457a101ad285e65cd246a7f77cc2d8a53b4b948d1b22405abf7f3a4ea7a0ab10335b310f1731c6660937fa18647fc00858b781f32d44dd85d1452d2eca821cf SHA512 1c7d00dac5329296dd205eddeeecfd29495c4746791730056d143438871eb64a5d9827dcb1e28a78e8746218908e0e72374bd686a21b631b9aa1aa1c67e61eac
|
||||||
DIST PyQt5_gpl-5.9.tar.gz 3097557 SHA256 ab0e7999cf202cc72962c78aefe461d16497b3c1a8282ab966ad90b6cb271096 SHA512 6e925dee751d6b2ab97b3614b0150f305798b89920e11db7a2cbef579e4c21839a38f4ad7eee5828a0c28942999955715a265e043004ee7838d376025d32e4aa WHIRLPOOL b92833ecc97638c8dac5e35de155ddb9d5783925aa8ab50bdd823b793675354b37edc29e17396241de87b25ae142c37a9cd1c215ad57c25b928ec0af3deac8aa
|
DIST PyQt5_gpl-5.9.2.tar.gz 3102848 BLAKE2B b87f25693aa2b20211119f89cf13665bf88f14de8827d43ba757344ab9bdef0b0c197abb8386308c72925da263cabb6efd3f104db8a350c51fca3fba8c7c06b6 SHA512 5af2e65addaed7dd02d8dbf7a7c63767e565fc8edeb7b51e5991a00cda29f75b666529097646e821aaff556f350a929fd451f548bba76e97355b7fe10bd913bc
|
||||||
|
@ -1 +1 @@
|
|||||||
DIST collectd-rabbitmq-1.19.0.tar.gz 24966 SHA256 0ca0c0bdc4228619e910dc24494c54ec6a3d13b0b228edcac57a242ce888fc18 SHA512 bc5f1b9ca9fd8c79ff290bd3583fdac57e72940f10b453e54721dfb51627a4c78400cb60cd953530b4d11abbcff78717d9c04ad235e55d78e390ef1accc3e4cc WHIRLPOOL cbe9e5e4cec1c5b54472c408de80494865230a0dcda993ec3d9f63bca42553657eca21018d69918c080d66a855636b8393fa05b4dee9a0f69549a88ea57815ec
|
DIST collectd-rabbitmq-1.19.0.tar.gz 24966 BLAKE2B cdbfc8849a5060a01779493aa7a7347a70b0cd763dafc89e267d5bcf1e58a85b9da49031df56c738169063594937d87505684237f35b92175f7a8b0f4d0e3a9a SHA512 bc5f1b9ca9fd8c79ff290bd3583fdac57e72940f10b453e54721dfb51627a4c78400cb60cd953530b4d11abbcff78717d9c04ad235e55d78e390ef1accc3e4cc
|
||||||
|
@ -1,2 +1,3 @@
|
|||||||
DIST pyblake2-0.9.3.tar.gz 130641 SHA256 626448e1fe1cc01d2197118954bec9f158378577e12686d5b01979f7f0fa2212 SHA512 6336a7f7e79bd3e6ff7f8ff4d279ae170e86f1464b9fa9e7ea7f0dbbac6fcc044caf225111e065f9cd9cdeea0f81fae8d373e1f65be3e418929f53fad063205e WHIRLPOOL 0d8f2aaf35a5eb0ebdedd9219a0ee8b126c93b11ae3e406ef637d8930a34783886b212ce50a33d677b0a19289cd32f40dc3da22a9a9fec108b481268f153d45b
|
DIST pyblake2-0.9.3.tar.gz 130641 SHA256 626448e1fe1cc01d2197118954bec9f158378577e12686d5b01979f7f0fa2212 SHA512 6336a7f7e79bd3e6ff7f8ff4d279ae170e86f1464b9fa9e7ea7f0dbbac6fcc044caf225111e065f9cd9cdeea0f81fae8d373e1f65be3e418929f53fad063205e WHIRLPOOL 0d8f2aaf35a5eb0ebdedd9219a0ee8b126c93b11ae3e406ef637d8930a34783886b212ce50a33d677b0a19289cd32f40dc3da22a9a9fec108b481268f153d45b
|
||||||
DIST pyblake2-1.0.1.tar.gz 128037 SHA256 c969e13d0a96c6fe843bc0b94302f7a90d66c4a5df09d7f3593edb0a9c23749d SHA512 66311aa1cd60942d395c1cd8b996f66f1cb2380f36be471244152a885cee115a8e341a34309520d8b1254eb30d5e1b39b83f89d7eace9353c8ee9e919f4a3881 WHIRLPOOL 613e2706701085e2a7895a02d08235ceecb8313f719ac88ed3beb12a59ad7483061ccb9bdba3ce8b270f973dbac9302def423037608312648fe2b3fb6d672667
|
DIST pyblake2-1.0.1.tar.gz 128037 SHA256 c969e13d0a96c6fe843bc0b94302f7a90d66c4a5df09d7f3593edb0a9c23749d SHA512 66311aa1cd60942d395c1cd8b996f66f1cb2380f36be471244152a885cee115a8e341a34309520d8b1254eb30d5e1b39b83f89d7eace9353c8ee9e919f4a3881 WHIRLPOOL 613e2706701085e2a7895a02d08235ceecb8313f719ac88ed3beb12a59ad7483061ccb9bdba3ce8b270f973dbac9302def423037608312648fe2b3fb6d672667
|
||||||
|
DIST pyblake2-1.1.0.tar.gz 125855 SHA256 3a850036bf42053c74bfc52c063323ca78e40ba1f326b01777da5750a143631a SHA512 e13c7e4f3a35155cbf531e337895349ec01f0ac36908a4e746cecec063601adfc8a73a7961a9c310d01d3231f44f08d2cc92e891e9cb87659bc7170b9fee6102 WHIRLPOOL 48e030a35024f4dd478607d2301d53ec2e3635fe0f5e0899270ea41dc01b3f85afc4bf01ab4d2bf44c7ba1e35c88ec94f7e975d27c37e42527320fa09d5a761f
|
||||||
|
@ -0,0 +1,20 @@
|
|||||||
|
# Copyright 1999-2017 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
|
EAPI=6
|
||||||
|
|
||||||
|
PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
|
||||||
|
inherit distutils-r1
|
||||||
|
|
||||||
|
DESCRIPTION="BLAKE2 hash function extension module"
|
||||||
|
HOMEPAGE="https://github.com/dchest/pyblake2 https://pypi.python.org/pypi/pyblake2"
|
||||||
|
SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
|
||||||
|
|
||||||
|
# pyblake2 itself allows more licenses but blake2 allows the following three
|
||||||
|
LICENSE="|| ( CC0-1.0 openssl Apache-2.0 )"
|
||||||
|
SLOT="0"
|
||||||
|
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||||
|
|
||||||
|
python_test() {
|
||||||
|
"${EPYTHON}" test/test.py || die "Tests fail with ${EPYTHON}"
|
||||||
|
}
|
@ -1,2 +1 @@
|
|||||||
DIST pyotherside-1.5.1.tar.gz 181457 SHA256 cb29853d66d2e33f68e28c62c28d054512ab82a763fed8b7b7df9dae722c5de2 SHA512 6f916ce44615c98aa7dffaee073fcb6d7f117996c008c0e3c0e7a8aaedd03f9ba853cc66850112dfc9529d698bd2faeb498a87a0d47c3776ab52b90f83b7067a WHIRLPOOL ad6693efa3aa3a15924010144bb46632fd512fb1af360e56972ddfd28631ff381c06c505acd40b57becb5010c324f4ccc509b3d49ed3716f87b4252027a94405
|
|
||||||
DIST pyotherside-1.5.3.tar.gz 181811 SHA256 00049d5f42cac448368bc2a521edb8de36bb6d2a624e195b7f1004236758b805 SHA512 ff6aa43e72f5492b18403559514e6fdf0d2cee0965556fcafe5fe394b654a7dd2fc3a7d64d4b8f9c0ebf95485821b77022407772b2414539f2ab287e1fb01e93 WHIRLPOOL 1b515d4d64e47c015979a70214a99151d8449fc9991bccdc524ee64c2d2e36159c61c0b8191054e2062ffe4f86b33b6d370ba8932960a8b0ef0889f76961b999
|
DIST pyotherside-1.5.3.tar.gz 181811 SHA256 00049d5f42cac448368bc2a521edb8de36bb6d2a624e195b7f1004236758b805 SHA512 ff6aa43e72f5492b18403559514e6fdf0d2cee0965556fcafe5fe394b654a7dd2fc3a7d64d4b8f9c0ebf95485821b77022407772b2414539f2ab287e1fb01e93 WHIRLPOOL 1b515d4d64e47c015979a70214a99151d8449fc9991bccdc524ee64c2d2e36159c61c0b8191054e2062ffe4f86b33b6d370ba8932960a8b0ef0889f76961b999
|
||||||
|
@ -1,40 +0,0 @@
|
|||||||
# Copyright 1999-2017 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI=5
|
|
||||||
|
|
||||||
PYTHON_COMPAT=( python3_{4,5,6} )
|
|
||||||
|
|
||||||
inherit qmake-utils python-single-r1
|
|
||||||
|
|
||||||
DESCRIPTION="Asynchronous Python 3 Bindings for Qt 5"
|
|
||||||
HOMEPAGE="http://github.com/thp/pyotherside http://thp.io/2011/pyotherside"
|
|
||||||
SRC_URI="https://github.com/thp/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
|
||||||
|
|
||||||
LICENSE="ISC"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="~amd64"
|
|
||||||
|
|
||||||
IUSE=""
|
|
||||||
|
|
||||||
RDEPEND="${PYTHON_DEPS}
|
|
||||||
dev-qt/qtcore:5
|
|
||||||
dev-qt/qtdeclarative:5
|
|
||||||
dev-qt/qtgui:5
|
|
||||||
dev-qt/qtsvg:5
|
|
||||||
"
|
|
||||||
DEPEND="${RDEPEND}"
|
|
||||||
|
|
||||||
RESTRICT="test"
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
sed -i -e "s/qtquicktests//" pyotherside.pro || die
|
|
||||||
}
|
|
||||||
|
|
||||||
src_configure() {
|
|
||||||
eqmake5
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
emake install INSTALL_ROOT="${D}"
|
|
||||||
}
|
|
@ -1,6 +1,3 @@
|
|||||||
DIST pytest-2.7.2.tar.gz 532836 SHA256 b30457f735420d0000d10a44bbd478cf03f8bf20e25bd77248f9bab40f4fd6a4 SHA512 5474a4fe58437a4971fb21b1b37dad3c08e18e5d154931ff23e597f881100a3515bf0cf71d06b143465594ad2a91a96f84f4836d84c39691143c8d88ca7a4360 WHIRLPOOL 6ab7371f952109ac476774222883e1381fe5ee6a54d967f2d90765f6c59c90634a16c42e8e2e1661169db6a9cb1327242ff2281cf1caeabd86a4dacd24f4bb06
|
DIST pytest-2.7.2.tar.gz 532836 BLAKE2B abdb179ca82078ecf081055484d7fc1f1d63f7f3ce58b19ed27e10da25e163a24ad89e4afe8b7e5af0d5fa14ace6eb18c6dbe302845fb6bbf0a545a443fc7847 SHA512 5474a4fe58437a4971fb21b1b37dad3c08e18e5d154931ff23e597f881100a3515bf0cf71d06b143465594ad2a91a96f84f4836d84c39691143c8d88ca7a4360
|
||||||
DIST pytest-3.0.3.tar.gz 731934 SHA256 f213500a356800a483e8a146ff971ae14a8df3f2c0ae4145181aad96996abee7 SHA512 ec0b4a5f0d6673a339c5a70b402c004c23db7001005454329eeaea15d890f53b8f2740f6c6254499d0f915b9058bfdfa535d9f22847bb382a060d65204fce4af WHIRLPOOL 1883909fa23832e674cf912b1d88957dd435143dc124df5454c08ad02c8077473168f749ea94539c2c4b5cf08648a0bce7e90937bbdacd4bb69a4ccf15ecff23
|
DIST pytest-3.0.3.tar.gz 731934 BLAKE2B 7fb57d75bd54eb8a31d9701fdf739119715c475eaaacae3cd038057c1d2bf43fa86ccdc45b3c84962708ef606976ab39ad41e0c3690c8b5f4c04d870579a384e SHA512 ec0b4a5f0d6673a339c5a70b402c004c23db7001005454329eeaea15d890f53b8f2740f6c6254499d0f915b9058bfdfa535d9f22847bb382a060d65204fce4af
|
||||||
DIST pytest-3.0.6.tar.gz 748748 SHA256 643434a9f1a188271da35e20064cb8b6c5440976c5bb541dc7b5b0e3cf75d940 SHA512 0e983f1f52c18327537d20be30425f4c74037d1fbf6b4aedf2646cf21d450fa9b2b20625f26f5db759b4fe1fd28c6640cb1df88e667efaeea6642e7f02f01e06 WHIRLPOOL 708e5041135883ba31d9712880672f64bf05c0bf40a544061cb42fed4d2aec111bfdf82b63f10e8a87c2b76870e3ea364b396258f0674d2199e43fe93cf2922e
|
DIST pytest-3.2.2.tar.gz 786396 BLAKE2B e669da930890e902b0323ec3a6685080ddd889e74655f7b4cb08ec421651f987597021a31471aab5a32d637b99620ce7792cbdf8f85561db3bb10ff06a446ba1 SHA512 6df3a50e7d1efeaf7a283920b16d1daf800798f422bc851b0aacd2bbd5cb0a88c95f9057fae49943b9dfe6527ed552cdf8d983b944ab91d0af252ee4f6eb82db
|
||||||
DIST pytest-3.0.7.tar.gz 743866 SHA256 b70696ebd1a5e6b627e7e3ac1365a4bc60aaf3495e843c1e70448966c5224cab SHA512 f458929614fca5bc9542b9adfe2fa5d2c5b97ec13e331d3a9caf256d2d005b3dad9c11d01b2eb62332648f90608ba297a1edc2c20b7630ec4f69114299720a2a WHIRLPOOL 2febc111fed67573296f8c4a758ea36c2a2e81bd425442beace139f7e1bd3eaab7aa2fdcf8e0280871b0692e19d70efe18d780e4dd7336c9dd5d6fb0db2df6c5
|
|
||||||
DIST pytest-3.1.2.tar.gz 766406 SHA256 795ec29fbba70b22a593691ce8bcd4bdde2dc96e8099731f73c7d8bb3ce879bf SHA512 6b8bf6280481295585169798351105749301a2b088fa89a48c463578a25edcb1fe7ea4100668bc3013a0a6dfd0ceab31c683e9280ece4f79575ca37909502d5c WHIRLPOOL 5c685f928080a5d6d1a979a0dbda1bc851eff855c76bb471ebf131047506c934e68a2e4733c4b265d291558ec1084d0276e77e469bd3d5ec0d91daa97c5eb989
|
|
||||||
DIST pytest-3.2.2.tar.gz 786396 SHA256 f46e49e0340a532764991c498244a60e3a37d7424a532b3ff1a6a7653f1a403a SHA512 6df3a50e7d1efeaf7a283920b16d1daf800798f422bc851b0aacd2bbd5cb0a88c95f9057fae49943b9dfe6527ed552cdf8d983b944ab91d0af252ee4f6eb82db WHIRLPOOL 6d41e74696ed879d78f8a50dabb7775fa7631bfd5a6a1dd9df89269d6d3174683776982451f83b32c197cd801796e671e7431b542376a7d343b00e9fc21616b3
|
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue