summaryrefslogtreecommitdiff
path: root/app-text/djvu
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-07-04 14:05:23 +0100
committerV3n3RiX <venerix@redcorelinux.org>2020-07-04 14:05:23 +0100
commit05b8b0e0af1d72e51a3ee61522941bf7605cd01c (patch)
tree43b0410e62aba677b4b256bc3ffe3fd333d28dbe /app-text/djvu
parent90c88731bd036e5698b281fbc0a5f3aa4c9983ac (diff)
gentoo resync : 04.07.2020
Diffstat (limited to 'app-text/djvu')
-rw-r--r--app-text/djvu/Manifest1
-rw-r--r--app-text/djvu/files/fix-CVE-2019-18804.patch39
2 files changed, 0 insertions, 40 deletions
diff --git a/app-text/djvu/Manifest b/app-text/djvu/Manifest
index 9d249528470d..fbb4946d2771 100644
--- a/app-text/djvu/Manifest
+++ b/app-text/djvu/Manifest
@@ -1,4 +1,3 @@
-AUX fix-CVE-2019-18804.patch 1130 BLAKE2B d83e7f74fca659d58731cb051aface930f1f3d0ffc737056e59323d436bfbad9b43aba5fb2c353b368a4fdbe9c257ca34ba53769e8aa2f0a42ebbd0a8d48181f SHA512 587aa61a9f9f7f845f1f0a23f59503efa7247862074096c707368316ad91aee40025d48c76a7351dc09ec1687c3902198fdbd6aa8623c4f1d8654d0c549ec4e7
DIST djvu-3.5.27.zip 3567522 BLAKE2B c074468a2fedf097b9b8fea4c449f26b61bffb31d10114081554e59256a23315ecffc203b5223468ca0c3338118b53aba65eee4cb5e7ad5c8d55470e90f43843 SHA512 dc1cd1bce2fb6245946f9409b3a3826ef2dc77a20be079c929b17508c3d967a0b5d8acd61bad00357e46a845f7f97717a043db9ffd1fe23e9a09441b7d21cbd6
EBUILD djvu-3.5.27-r2.ebuild 1656 BLAKE2B 1543bc005f55a9ecf74f95295a29aed25100f056da963b5ed75fcde148928ef10e4fa05830b6ad8c17d2e8bc07a0daef3baa1fddc4bc085fb343b667a8edb33a SHA512 30dbaf5409bdf414fcc53246882f6dda413dc25d1689bd489e383a05a39699b2efcaa5eb3d24ec3fc8949a169f51a3642a8552911579e34c8f4970b12c56d945
MISC metadata.xml 948 BLAKE2B 1d15a217967f10397d747f2cc0844ea76d4f876ed0ee8cb56733b74a3b92f023e3eeff11bfcb4265766c14dad4b1e35a18f7d2fdd7442068bf82c4a8302690db SHA512 e5cfa3a2b2077a3f0dbfcc99165fb678e8c8759724790d520f1bed670fed5e753a47207bbbcd7d2ff2d55def5b34bf32201771918c9e7a16583d91553ac75e42
diff --git a/app-text/djvu/files/fix-CVE-2019-18804.patch b/app-text/djvu/files/fix-CVE-2019-18804.patch
deleted file mode 100644
index b5d790ba1b1c..000000000000
--- a/app-text/djvu/files/fix-CVE-2019-18804.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From c8bec6549c10ffaa2f2fbad8bbc629efdf0dd125 Mon Sep 17 00:00:00 2001
-From: Leon Bottou <leon@bottou.org>
-Date: Thu, 17 Oct 2019 22:20:31 -0400
-Subject: [PATCH] Fixed bug 309
-
----
- libdjvu/IW44EncodeCodec.cpp | 2 +-
- tools/ddjvu.cpp | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libdjvu/IW44EncodeCodec.cpp b/libdjvu/IW44EncodeCodec.cpp
-index 00752a0..f81eaeb 100644
---- a/libdjvu/IW44EncodeCodec.cpp
-+++ b/libdjvu/IW44EncodeCodec.cpp
-@@ -405,7 +405,7 @@ filter_fv(short *p, int w, int h, int rowsize, int scale)
- int y = 0;
- int s = scale*rowsize;
- int s3 = s+s+s;
-- h = ((h-1)/scale)+1;
-+ h = (h>0) ? ((h-1)/scale)+1 : 0;
- y += 1;
- p += s;
- while (y-3 < h)
-diff --git a/tools/ddjvu.cpp b/tools/ddjvu.cpp
-index 6d0df3b..7109952 100644
---- a/tools/ddjvu.cpp
-+++ b/tools/ddjvu.cpp
-@@ -279,7 +279,7 @@ render(ddjvu_page_t *page, int pageno)
- prect.h = (ih * 100) / dpi;
- }
- /* Process aspect ratio */
-- if (flag_aspect <= 0)
-+ if (flag_aspect <= 0 && iw>0 && ih>0)
- {
- double dw = (double)iw / prect.w;
- double dh = (double)ih / prect.h;
---
-2.23.0
-