Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

djvulibre.

Browse Source
This commit is contained in:
4fury-c3440d8
2022-11-11 13:51:57 +03:00
parent 74c5ae4756
commit 7d92297d06
12 changed files with 174 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
office/misc/djvu/actions.py
+11 -12
View File
@@ -2,24 +2,23 @@
# -*- coding: utf-8 -*-
#
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/licenses/gpl.txt
# See the file https://www.gnu.org/licenses/gpl-3.0.txt
from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
from pisi.actionsapi import get
from pisi.actionsapi import autotools, pisitools, get
WorkDir = "djvulibre-%s" % get.srcVERSION() if len(get.srcVERSION().split(".")) < 4 else "djvulibre-%s" % get.srcVERSION()[:get.srcVERSION().rfind(".")]
j = ''.join([
' --enable-xmltools',
' --disable-desktopfiles',
' --with-jpeg',
' --with-tiff '
])
def setup():
autotools.aclocal("-I config")
autotools.autoconf("-f")
autotools.configure("--enable-threads \
--disable-desktopfiles \
--enable-xmltools \
--enable-i18n \
--with-jpeg \
--with-tiff")
autotools.configure(j)
def build():
autotools.make()
@@ -31,4 +30,4 @@ def install():
for size in ["22", "32", "48", "64"]:
pisitools.insinto("/usr/share/icons/hicolor/%sx%s/mimetypes" %(size, size), "desktopfiles/prebuilt-hi%s-djvu.png" % size, "image-vnd.djvu.png")
pisitools.dodoc("COPY*", "README", "NEWS")
pisitools.dodoc("NEWS")
office/misc/djvu/comar/package.py
+7
View File
@@ -0,0 +1,7 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
import os
def postInstall(fromVersion, fromRelease, toVersion, toRelease):
os.system("/usr/bin/update-mime-database /usr/share/mime")
office/misc/djvu/comar/pakhandler.py
+8
View File
@@ -0,0 +1,8 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
import os
def updateData(filepath):
os.system("rm /usr/share/mime/version")
# os.system("update-mime-database /usr/share/mime")
office/misc/djvu/files/djvulibre-3.5.22-cdefs.patch
-12
View File
@@ -1,12 +0,0 @@
diff -up djvulibre-3.5.22/libdjvu/GSmartPointer.h.cdefs djvulibre-3.5.22/libdjvu/GSmartPointer.h
--- djvulibre-3.5.22/libdjvu/GSmartPointer.h.cdefs 2008-03-05 01:44:20.000000000 +0000
+++ djvulibre-3.5.22/libdjvu/GSmartPointer.h 2011-01-31 13:43:37.595917364 +0000
@@ -65,6 +65,8 @@
# pragma interface
#endif
+#include <cstddef>
+
/** @name GSmartPointer.h
Files #"GSmartPointer.h"# and #"GSmartPointer.cpp"# define a smart-pointer
office/misc/djvu/files/djvulibre-3.5.27-check-image-size.patch
+16
View File
@@ -0,0 +1,16 @@
diff --git a/libdjvu/IW44Image.cpp b/libdjvu/IW44Image.cpp
index e8d4b44..aa3d554 100644
--- a/libdjvu/IW44Image.cpp
+++ b/libdjvu/IW44Image.cpp
@@ -678,7 +678,11 @@ IW44Image::Map::image(signed char *img8, int rowsize, int pixsep, int fast)
size_t sz = bw * bh;
if (sz / (size_t)bw != (size_t)bh) // multiplication overflow
G_THROW("IW44Image: image size exceeds maximum (corrupted file?)");
+ if (sz == 0)
+ G_THROW("IW44Image: zero size image (corrupted file?)");
GPBuffer<short> gdata16(data16,sz);
+ if (data16 == NULL)
+ G_THROW("IW44Image: unable to allocate image data");
// Copy coefficients
int i;
short *p = data16;
office/misc/djvu/files/djvulibre-3.5.27-check-input-pool.patch
+13
View File
@@ -0,0 +1,13 @@
diff --git a/libdjvu/DataPool.cpp b/libdjvu/DataPool.cpp
index 5fcbedf..4c2eaf0 100644
--- a/libdjvu/DataPool.cpp
+++ b/libdjvu/DataPool.cpp
@@ -791,6 +791,8 @@ DataPool::create(const GP<DataPool> & pool, int start, int length)
DEBUG_MSG("DataPool::DataPool: pool=" << (void *)((DataPool *)pool) << " start=" << start << " length= " << length << "\n");
DEBUG_MAKE_INDENT(3);
+ if (!pool) G_THROW( ERR_MSG("DataPool.zero_DataPool") );
+
DataPool *xpool=new DataPool();
GP<DataPool> retval=xpool;
xpool->init();
office/misc/djvu/files/djvulibre-3.5.27-djvuport-stack-overflow.patch
+36
View File
@@ -0,0 +1,36 @@
diff --git a/libdjvu/DjVuPort.cpp b/libdjvu/DjVuPort.cpp
index 2b3e0d2..ede7f6b 100644
--- a/libdjvu/DjVuPort.cpp
+++ b/libdjvu/DjVuPort.cpp
@@ -507,10 +507,19 @@ GP<DjVuFile>
DjVuPortcaster::id_to_file(const DjVuPort * source, const GUTF8String &id)
{
GPList<DjVuPort> list;
+
+ if (!!opening_id && opening_id == id)
+ G_THROW("DjVuPortcaster: recursive opening of the same file (corrupted file?)");
+ else
+ opening_id = id;
+
compute_closure(source, list, true);
GP<DjVuFile> file;
for(GPosition pos=list;pos;++pos)
if ((file=list[pos]->id_to_file(source, id))) break;
+
+ opening_id = GUTF8String();
+
return file;
}
diff --git a/libdjvu/DjVuPort.h b/libdjvu/DjVuPort.h
index e2b3125..313dc2b 100644
--- a/libdjvu/DjVuPort.h
+++ b/libdjvu/DjVuPort.h
@@ -484,6 +484,7 @@ private:
const DjVuPort *dst, int distance);
void compute_closure(const DjVuPort *src, GPList<DjVuPort> &list,
bool sorted=false);
+ GUTF8String opening_id;
};
office/misc/djvu/files/djvulibre-3.5.27-integer-overflow.patch
+23
View File
@@ -0,0 +1,23 @@
diff --git a/tools/ddjvu.cpp b/tools/ddjvu.cpp
index 7109952..b41f7d2 100644
--- a/tools/ddjvu.cpp
+++ b/tools/ddjvu.cpp
@@ -70,6 +70,7 @@
#include <locale.h>
#include <fcntl.h>
#include <errno.h>
+#include <stdint.h>
#ifdef UNIX
# include <sys/time.h>
@@ -394,7 +395,9 @@ render(ddjvu_page_t *page, int pageno)
rowsize = rrect.w;
else
rowsize = rrect.w * 3;
- if (! (image = (char*)malloc(rowsize * rrect.h)))
+ if ((size_t)rowsize > SIZE_MAX / rrect.h)
+ die(i18n("Integer overflow when allocating image buffer for page %d"), pageno);
+ if (! (image = (char*)malloc((size_t)rowsize * rrect.h)))
die(i18n("Cannot allocate image buffer for page %d"), pageno);
/* Render */
office/misc/djvu/files/djvulibre-3.5.27-unsigned-short-overflow.patch
+21
View File
@@ -0,0 +1,21 @@
diff --git a/libdjvu/GBitmap.cpp b/libdjvu/GBitmap.cpp
index c2fdbe4..e271a1d 100644
--- a/libdjvu/GBitmap.cpp
+++ b/libdjvu/GBitmap.cpp
@@ -69,6 +69,7 @@
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
+#include <limits.h>
// - Author: Leon Bottou, 05/1997
@@ -1284,6 +1285,8 @@ GBitmap::decode(unsigned char *runs)
// initialize pixel array
if (nrows==0 || ncolumns==0)
G_THROW( ERR_MSG("GBitmap.not_init") );
+ if (ncolumns > USHRT_MAX - border)
+ G_THROW("GBitmap: row size exceeds maximum (corrupted file?)");
bytes_per_row = ncolumns + border;
if (runs==0)
G_THROW( ERR_MSG("GBitmap.null_arg") );
office/misc/djvu/files/no-pthread.diff → office/misc/djvu/files/no-pthread.patch
+2 -4
View File
@@ -1,7 +1,5 @@
Index: djvulibre-3.5.22/config/acinclude.m4
===================================================================
--- djvulibre-3.5.22.orig/config/acinclude.m4
+++ djvulibre-3.5.22/config/acinclude.m4
--- a/config/acinclude.m4
+++ b/config/acinclude.m4
@@ -408,7 +408,7 @@ case "${host_os}-${GCC}" in
# On Linux/GCC, libtool uses -nostdlib for linking, which cancel part
# of the -pthread flag effect (libpthread is not automatically linked).
office/misc/djvu/files/out_of_bounce_write_in_function.patch
+14
View File
@@ -0,0 +1,14 @@
--- a/libdjvu/DjVuText.cpp
+++ b/libdjvu/DjVuText.cpp
@@ -345,9 +345,9 @@
int textsize = bs.read24();
char *buffer = textUTF8.getbuf(textsize);
int readsize = bs.read(buffer,textsize);
+ if (readsize < textsize || textsize <= 0)
+ G_THROW( ERR_MSG("DjVuText.corrupt_chunk") );
buffer[readsize] = 0;
- if (readsize < textsize)
- G_THROW( ERR_MSG("DjVuText.corrupt_chunk") );
// Try reading zones
unsigned char version;
if ( bs.read( (void*) &version, 1 ) == 1)
office/misc/djvu/pspec.xml
+23 -7
View File
@@ -1,19 +1,19 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>djvu</Name>
<Homepage>http://djvu.sourceforge.net</Homepage>
<Homepage>https://djvu.sourceforge.net/</Homepage>
<Packager>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<License>GPLv2</License>
<License>GPL-2</License>
<IsA>app:gui</IsA>
<IsA>library</IsA>
<Summary>DjVu viewers, encoders and utilities</Summary>
<Summary>DjVu viewers, encoders and utilities.</Summary>
<Description>DjVu is a web-centric format and software platform to distribute documents and images.</Description>
<Archive sha1sum="99c4f2c621c063bf8c8a1626030539fe5a8675f9" type="targz">mirrors://sourceforge/djvu/djvulibre-3.5.27.tar.gz</Archive>
<Archive sha1sum="e74c23e5480535898a6549aec11e5cfa1228e1ea" type="targz">mirrors://sourceforge/djvu/djvulibre-3.5.28.tar.gz</Archive>
<BuildDependencies>
<Dependency>libjpeg-turbo-devel</Dependency>
<Dependency>tiff-devel</Dependency>
@@ -21,8 +21,13 @@
<Dependency>libXt-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">no-pthread.diff</Patch>
<Patch level="1">djvulibre-3.5.22-cdefs.patch</Patch>
<Patch level="1">no-pthread.patch</Patch>
<Patch level="1">out_of_bounce_write_in_function.patch</Patch>
<Patch level="1">djvulibre-3.5.27-check-image-size.patch</Patch>
<Patch level="1">djvulibre-3.5.27-check-input-pool.patch</Patch>
<Patch level="1">djvulibre-3.5.27-djvuport-stack-overflow.patch</Patch>
<Patch level="1">djvulibre-3.5.27-integer-overflow.patch</Patch>
<Patch level="1">djvulibre-3.5.27-unsigned-short-overflow.patch</Patch>
</Patches>
</Source>
@@ -32,6 +37,7 @@
<Dependency>shared-mime-info</Dependency>
<Dependency>libjpeg-turbo</Dependency>
<Dependency>tiff</Dependency>
<Dependency>libgcc</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin</Path>
@@ -44,6 +50,9 @@
<Path fileType="doc">/usr/share/doc</Path>
<Path fileType="man">/usr/share/man</Path>
</Files>
<Provides>
<COMAR script="package.py">System.Package</COMAR>
</Provides>
</Package>
<Package>
@@ -59,6 +68,13 @@
</Package>
<History>
<Update release="10">
<Date>2022-11-10</Date>
<Version>3.5.28</Version>
<Comment>Version bump.</Comment>
<Name>fury</Name>
<Email>uglyside@yandex.ru</Email>
</Update>
<Update release="9">
<Date>2018-08-08</Date>
<Version>3.5.27</Version>