summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2007-02-10 20:22:27 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2007-02-10 20:22:27 +0000
commit664744d016e912b68225f0f045d00b2d6f3b4e44 (patch)
tree99872332570624994c30708c91d515d30f7fd514 /app-office/koffice/files
parentRemove old version. (diff)
downloadgentoo-2-664744d016e912b68225f0f045d00b2d6f3b4e44.tar.gz
gentoo-2-664744d016e912b68225f0f045d00b2d6f3b4e44.tar.bz2
gentoo-2-664744d016e912b68225f0f045d00b2d6f3b4e44.zip
Remove old version.
(Portage version: 2.1.2-r9)
Diffstat (limited to 'app-office/koffice/files')
-rw-r--r--app-office/koffice/files/digest-koffice-1.6.0-r33
-rw-r--r--app-office/koffice/files/digest-koffice-1.6.13
-rw-r--r--app-office/koffice/files/koffice-ole-filter.patch87
-rw-r--r--app-office/koffice/files/koffice-xpdf-CVE-2007-0104.diff74
4 files changed, 0 insertions, 167 deletions
diff --git a/app-office/koffice/files/digest-koffice-1.6.0-r3 b/app-office/koffice/files/digest-koffice-1.6.0-r3
deleted file mode 100644
index 2e01d4cedd36..000000000000
--- a/app-office/koffice/files/digest-koffice-1.6.0-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e669cf19b2e1c7db7029c0772c527c0d koffice-1.6.0.tar.bz2 56718478
-RMD160 be09c18005eb33f6dc35ab0359cc97a8a658ce7c koffice-1.6.0.tar.bz2 56718478
-SHA256 9eddaae640ada9bd184f001e2489854daf7094b73e5f15b0b8deffb4cc654ae2 koffice-1.6.0.tar.bz2 56718478
diff --git a/app-office/koffice/files/digest-koffice-1.6.1 b/app-office/koffice/files/digest-koffice-1.6.1
deleted file mode 100644
index 8296a0484c60..000000000000
--- a/app-office/koffice/files/digest-koffice-1.6.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f7b90b46b79019edc60761a6bff2d387 koffice-1.6.1.tar.bz2 56999028
-RMD160 ee4fa84a53f92035c0ab9427e0acb18feca701db koffice-1.6.1.tar.bz2 56999028
-SHA256 5505a6c54009dd0cb75a3770c3daa476154958f92692ca0748b1842d9cd6e728 koffice-1.6.1.tar.bz2 56999028
diff --git a/app-office/koffice/files/koffice-ole-filter.patch b/app-office/koffice/files/koffice-ole-filter.patch
deleted file mode 100644
index ca8b9d0c9185..000000000000
--- a/app-office/koffice/files/koffice-ole-filter.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-diff -uNrp koffice-1.4.1/filters/olefilters/lib/klaola.cc koffice-1.4.1-kees/filters/olefilters/lib/klaola.cc
---- koffice-1.4.1/filters/olefilters/lib/klaola.cc 2005-07-19 07:09:30.000000000 -0700
-+++ koffice-1.4.1-kees/filters/olefilters/lib/klaola.cc 2006-11-21 16:02:08.000000000 -0800
-@@ -197,11 +197,21 @@ bool KLaola::parseHeader() {
- num_of_bbd_blocks=read32(0x2c);
- root_startblock=read32(0x30);
- sbd_startblock=read32(0x3c);
-+
-+ if (num_of_bbd_blocks >= 0x800000) {
-+ kdError(s_area) << "KLaola::parseHeader(): Too many bbd blocks found in header!" << endl;
-+ return false;
-+ }
- bbd_list=new unsigned int[num_of_bbd_blocks];
-
- unsigned int i, j;
-- for(i=0, j=0; i<num_of_bbd_blocks; ++i, j=j+4)
-+ for(i=0, j=0; i<num_of_bbd_blocks; ++i, j=j+4) {
- bbd_list[i]=read32(0x4c+j);
-+ if (bbd_list[i] >= (0x800000 - 1)) {
-+ kdError(s_area) << "KLaola::parseHeader(): bbd " << i << " offset (" << bbd_list[i] << ") too large" << endl;
-+ return false;
-+ }
-+ }
- return true;
- }
-
-@@ -283,7 +293,8 @@ const unsigned char *KLaola::readBBStrea
- unsigned char *p=0;
-
- tmp=start;
-- while(tmp!=-2 && tmp>=0 && tmp<=static_cast<int>(maxblock)) {
-+ /* 0x10000 chosen as arbitrary "too many blocks" limit to not loop forver */
-+ while(tmp!=-2 && tmp>=0 && i<0x10000 && tmp<=static_cast<int>(maxblock)) {
- ++i;
- tmp=nextBigBlock(tmp);
- }
-@@ -293,7 +304,7 @@ const unsigned char *KLaola::readBBStrea
- maxSblock=i*8-1;
- i=0;
- tmp=start;
-- while(tmp!=-2 && tmp>=0 && tmp<=static_cast<int>(maxblock)) {
-+ while(tmp!=-2 && tmp>=0 && i<0x10000 && tmp<=static_cast<int>(maxblock)) {
- memcpy(&p[i*0x200], &m_file.data[(tmp+1)*0x200], 0x200);
- tmp=nextBigBlock(tmp);
- ++i;
-@@ -308,7 +319,8 @@ const unsigned char *KLaola::readSBStrea
- unsigned char *p=0;
-
- tmp=start;
-- while(tmp!=-2 && tmp>=0 && tmp<=static_cast<int>(maxSblock)) {
-+ /* 0x10000 chosen as arbitrary "too many blocks" limit to not loop forver */
-+ while(tmp!=-2 && tmp>=0 && i<0x10000 && tmp<=static_cast<int>(maxSblock)) {
- ++i;
- tmp=nextSmallBlock(tmp);
- }
-@@ -316,7 +328,7 @@ const unsigned char *KLaola::readSBStrea
- p=new unsigned char[i*0x40];
- i=0;
- tmp=start;
-- while(tmp!=-2 && tmp>=0 && tmp<=static_cast<int>(maxSblock)) {
-+ while(tmp!=-2 && tmp>=0 && i<0x10000 && tmp<=static_cast<int>(maxSblock)) {
- memcpy(&p[i*0x40], &smallBlockFile[tmp*0x40], 0x40);
- tmp=nextSmallBlock(tmp);
- ++i;
-@@ -326,10 +338,20 @@ const unsigned char *KLaola::readSBStrea
- }
-
- void KLaola::readBigBlockDepot() {
-+ if (num_of_bbd_blocks >= 0x800000)
-+ return;
-
- bigBlockDepot=new unsigned char[0x200*num_of_bbd_blocks];
-- for(unsigned int i=0; i<num_of_bbd_blocks; ++i)
-- memcpy(&bigBlockDepot[i*0x200], &m_file.data[(bbd_list[i]+1)*0x200], 0x200);
-+ for(unsigned int i=0; i<num_of_bbd_blocks; ++i) {
-+ unsigned int offset = (bbd_list[i]+1)*0x200;
-+ if (offset > m_file.length - 0x200) {
-+ /* attempting to read past end of file */
-+ memset(&bigBlockDepot[i*0x200], 0, 0x200);
-+ }
-+ else {
-+ memcpy(&bigBlockDepot[i*0x200], &m_file.data[offset], 0x200);
-+ }
-+ }
- }
-
- void KLaola::readSmallBlockDepot() {
diff --git a/app-office/koffice/files/koffice-xpdf-CVE-2007-0104.diff b/app-office/koffice/files/koffice-xpdf-CVE-2007-0104.diff
deleted file mode 100644
index f5e51a1c706e..000000000000
--- a/app-office/koffice/files/koffice-xpdf-CVE-2007-0104.diff
+++ /dev/null
@@ -1,74 +0,0 @@
-------------------------------------------------------------------------
-r622463 | aacid | 2007-01-11 23:05:54 +0100 (Thu, 11 Jan 2007) | 2 lines
-Changed paths:
- M /branches/koffice/1.6/koffice/filters/kword/pdf/xpdf/xpdf/Catalog.cc
- M /branches/koffice/1.6/koffice/filters/kword/pdf/xpdf/xpdf/Catalog.h
-
-Commiting the patch agreed between kpdf and poppler developers to fix MOAB-06-01-2007 issue.
-
-------------------------------------------------------------------------
-Index: filters/kword/pdf/xpdf/xpdf/Catalog.cc
-===================================================================
---- filters/kword/pdf/xpdf/xpdf/Catalog.cc (revision 622462)
-+++ filters/kword/pdf/xpdf/xpdf/Catalog.cc (revision 622463)
-@@ -24,6 +24,12 @@
- #include "Link.h"
- #include "Catalog.h"
-
-+// This define is used to limit the depth of recursive readPageTree calls
-+// This is needed because the page tree nodes can reference their parents
-+// leaving us in an infinite loop
-+// Most sane pdf documents don't have a call depth higher than 10
-+#define MAX_CALL_DEPTH 1000
-+
- //------------------------------------------------------------------------
- // Catalog
- //------------------------------------------------------------------------
-@@ -77,7 +83,7 @@ Catalog::Catalog(XRef *xrefA) {
- pageRefs[i].num = -1;
- pageRefs[i].gen = -1;
- }
-- numPages = readPageTree(pagesDict.getDict(), NULL, 0);
-+ numPages = readPageTree(pagesDict.getDict(), NULL, 0, 0);
- if (numPages != numPages0) {
- error(-1, "Page count in top-level pages object is incorrect");
- }
-@@ -171,7 +177,7 @@ GString *Catalog::readMetadata() {
- return s;
- }
-
--int Catalog::readPageTree(Dict *pagesDict, PageAttrs *attrs, int start) {
-+int Catalog::readPageTree(Dict *pagesDict, PageAttrs *attrs, int start, int callDepth) {
- Object kids;
- Object kid;
- Object kidRef;
-@@ -221,9 +227,13 @@ int Catalog::readPageTree(Dict *pagesDic
- // This should really be isDict("Pages"), but I've seen at least one
- // PDF file where the /Type entry is missing.
- } else if (kid.isDict()) {
-- if ((start = readPageTree(kid.getDict(), attrs1, start))
-- < 0)
-- goto err2;
-+ if (callDepth > MAX_CALL_DEPTH) {
-+ error(-1, "Limit of %d recursive calls reached while reading the page tree. If your document is correct and not a test to try to force a crash, please report a bug.", MAX_CALL_DEPTH);
-+ } else {
-+ if ((start = readPageTree(kid.getDict(), attrs1, start, callDepth + 1))
-+ < 0)
-+ goto err2;
-+ }
- } else {
- error(-1, "Kid object (page %d) is wrong type (%s)",
- start+1, kid.getTypeName());
-Index: filters/kword/pdf/xpdf/xpdf/Catalog.h
-===================================================================
---- filters/kword/pdf/xpdf/xpdf/Catalog.h (revision 622462)
-+++ filters/kword/pdf/xpdf/xpdf/Catalog.h (revision 622463)
-@@ -82,7 +82,7 @@ private:
- Object outline; // outline dictionary
- GBool ok; // true if catalog is valid
-
-- int readPageTree(Dict *pages, PageAttrs *attrs, int start);
-+ int readPageTree(Dict *pages, PageAttrs *attrs, int start, int callDepth);
- Object *findDestInTree(Object *tree, GString *name, Object *obj);
- };
-