rpms/xpdf/FC-4 xpdf-3.00-64bit.patch, NONE, 1.1 xpdf-3.00-gcc4.patch, NONE, 1.1 xpdf-3.01-CVE-2005-3191.patch, NONE, 1.1 xpdf-3.01-crash.patch, NONE, 1.1 xpdf-3.01-resize.patch, NONE, 1.1 xpdf-3.01pl1.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 sources, 1.12, 1.13 xpdf.spec, 1.53, 1.54
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Dec 14 21:13:43 UTC 2005
Author: krh
Update of /cvs/dist/rpms/xpdf/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv27999
Modified Files:
.cvsignore sources xpdf.spec
Added Files:
xpdf-3.00-64bit.patch xpdf-3.00-gcc4.patch
xpdf-3.01-CVE-2005-3191.patch xpdf-3.01-crash.patch
xpdf-3.01-resize.patch xpdf-3.01pl1.patch
Log Message:
Merge back embargo branch.
xpdf-3.00-64bit.patch:
gmem.c | 10 +++++-----
gmem.h | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
--- NEW FILE xpdf-3.00-64bit.patch ---
--- xpdf-3.00/goo/gmem.h.me 2005-07-25 10:47:46.000000000 +0200
+++ xpdf-3.00/goo/gmem.h 2005-07-25 10:49:55.000000000 +0200
@@ -19,13 +19,13 @@
* Same as malloc, but prints error message and exits if malloc()
* returns NULL.
*/
-extern void *gmalloc(int size);
+extern void *gmalloc(size_t size);
/*
* Same as realloc, but prints error message and exits if realloc()
* returns NULL. If <p> is NULL, calls malloc instead of realloc().
*/
-extern void *grealloc(void *p, int size);
+extern void *grealloc(void *p, size_t size);
/*
* Same as free, but checks for and ignores NULL pointers.
--- xpdf-3.00/goo/gmem.c.me 2005-07-25 10:47:51.000000000 +0200
+++ xpdf-3.00/goo/gmem.c 2005-07-25 10:49:30.000000000 +0200
@@ -53,9 +53,9 @@
#endif /* DEBUG_MEM */
-void *gmalloc(int size) {
+void *gmalloc(size_t size) {
#ifdef DEBUG_MEM
- int size1;
+ size_t size1;
char *mem;
GMemHdr *hdr;
void *data;
@@ -94,11 +94,11 @@
#endif
}
-void *grealloc(void *p, int size) {
+void *grealloc(void *p, size_t size) {
#ifdef DEBUG_MEM
GMemHdr *hdr;
void *q;
- int oldSize;
+ size_t oldSize;
if (size == 0) {
if (p)
@@ -137,7 +137,7 @@
void gfree(void *p) {
#ifdef DEBUG_MEM
- int size;
+ size_t size;
GMemHdr *hdr;
GMemHdr *prevHdr, *q;
int lst;
xpdf-3.00-gcc4.patch:
TextOutputDev.h | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
--- NEW FILE xpdf-3.00-gcc4.patch ---
--- xpdf-3.00/xpdf/TextOutputDev.h.orig 2005-06-13 10:11:17.000000000 +0200
+++ xpdf-3.00/xpdf/TextOutputDev.h 2005-06-13 10:27:18.000000000 +0200
@@ -169,7 +169,7 @@
class TextLine {
public:
- TextLine(TextBlock *blkA, int rotA, double baseA);
+ TextLine(class TextBlock *blkA, int rotA, double baseA);
~TextLine();
void addWord(TextWord *word);
@@ -226,7 +226,7 @@
class TextBlock {
public:
- TextBlock(TextPage *pageA, int rotA);
+ TextBlock(class TextPage *pageA, int rotA);
~TextBlock();
void addWord(TextWord *word);
@@ -416,7 +416,7 @@
private:
void clear();
- void assignColumns(TextLineFrag *frags, int nFrags, int rot);
+ void assignColumns(class TextLineFrag *frags, int nFrags, int rot);
int dumpFragment(Unicode *text, int len, UnicodeMap *uMap, GString *s);
GBool rawOrder; // keep text in content stream order
xpdf-3.01-CVE-2005-3191.patch:
JPXStream.cc | 14 ++++++++---
Stream.cc | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
Stream.h | 3 ++
3 files changed, 82 insertions(+), 10 deletions(-)
--- NEW FILE xpdf-3.01-CVE-2005-3191.patch ---
--- xpdf-3.00.orig/xpdf/JPXStream.cc
+++ xpdf-3.00/xpdf/JPXStream.cc
@@ -7,6 +7,7 @@
//========================================================================
#include <aconf.h>
+#include <limits.h>
#ifdef USE_GCC_PRAGMAS
#pragma implementation
@@ -666,7 +667,7 @@
int segType;
GBool haveSIZ, haveCOD, haveQCD, haveSOT;
Guint precinctSize, style;
- Guint segLen, capabilities, comp, i, j, r;
+ Guint segLen, capabilities, nTiles, comp, i, j, r;
//----- main header
haveSIZ = haveCOD = haveQCD = haveSOT = gFalse;
@@ -701,8 +702,15 @@
/ img.xTileSize;
img.nYTiles = (img.ySize - img.yTileOffset + img.yTileSize - 1)
/ img.yTileSize;
- img.tiles = (JPXTile *)gmallocn(img.nXTiles * img.nYTiles,
- sizeof(JPXTile));
+ // check for overflow before allocating memory
+ if (img.nXTiles <= 0 || img.nYTiles <= 0 ||
+ img.nXTiles >= INT_MAX/img.nYTiles) {
+ error(getPos(), "Bad tile count in JPX SIZ marker segment");
+ return gFalse;
+ }
+ nTiles = img.nXTiles * img.nYTiles;
+ img.tiles = (JPXTile *)gmallocn(nTiles, sizeof(JPXTile));
+
for (i = 0; i < img.nXTiles * img.nYTiles; ++i) {
img.tiles[i].tileComps = (JPXTileComp *)gmalloc(img.nComps *
sizeof(JPXTileComp));
only in patch2:
unchanged:
--- xpdf-3.00.orig/xpdf/Stream.h
+++ xpdf-3.00/xpdf/Stream.h
@@ -233,6 +233,8 @@
~StreamPredictor();
+ GBool isOk() { return ok; }
+
int lookChar();
int getChar();
@@ -250,6 +252,7 @@
int rowBytes; // bytes per line
Guchar *predLine; // line buffer
int predIdx; // current index in predLine
+ GBool ok;
};
//------------------------------------------------------------------------
only in patch2:
unchanged:
--- xpdf-3.00.orig/xpdf/Stream.cc
+++ xpdf-3.00/xpdf/Stream.cc
@@ -15,6 +15,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <stddef.h>
+#include <limits.h>
#ifndef WIN32
#include <unistd.h>
#endif
@@ -412,13 +413,28 @@
width = widthA;
nComps = nCompsA;
nBits = nBitsA;
+ predLine = NULL;
+ ok = gFalse;
+ if (width <= 0 || nComps <= 0 || nBits <= 0 ||
+ nComps >= INT_MAX/nBits ||
+ width >= INT_MAX/nComps/nBits) {
+ return;
+ }
nVals = width * nComps;
+ if (nVals * nBits + 7 <= 0) {
+ return;
+ }
pixBytes = (nComps * nBits + 7) >> 3;
rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes;
+ if (rowBytes < 0) {
+ return;
+ }
predLine = (Guchar *)gmalloc(rowBytes);
memset(predLine, 0, rowBytes);
predIdx = rowBytes;
+
+ ok = gTrue;
}
StreamPredictor::~StreamPredictor() {
@@ -1012,6 +1028,10 @@
FilterStream(strA) {
if (predictor != 1) {
pred = new StreamPredictor(this, predictor, columns, colors, bits);
+ if (!pred->isOk()) {
+ delete pred;
+ pred = NULL;
+ }
} else {
pred = NULL;
}
@@ -2897,6 +2917,10 @@
height = read16();
width = read16();
numComps = str->getChar();
+ if (numComps <= 0 || numComps > 4) {
+ error(getPos(), "Bad number of components in DCT stream", prec);
+ return gFalse;
+ }
if (prec != 8) {
error(getPos(), "Bad DCT precision %d", prec);
return gFalse;
@@ -2923,6 +2947,10 @@
height = read16();
width = read16();
numComps = str->getChar();
+ if (numComps <= 0 || numComps > 4) {
+ error(getPos(), "Bad number of components in DCT stream", prec);
+ return gFalse;
+ }
if (prec != 8) {
error(getPos(), "Bad DCT precision %d", prec);
return gFalse;
@@ -2945,6 +2973,10 @@
length = read16() - 2;
scanInfo.numComps = str->getChar();
+ if (scanInfo.numComps <= 0 || scanInfo.numComps > 4) {
+ error(getPos(), "Bad number of components in DCT stream");
+ return gFalse;
+ }
--length;
if (length != 2 * scanInfo.numComps + 3) {
error(getPos(), "Bad DCT scan info block");
@@ -3255,6 +3287,10 @@
FilterStream(strA) {
if (predictor != 1) {
pred = new StreamPredictor(this, predictor, columns, colors, bits);
+ if (!pred->isOk()) {
+ delete pred;
+ pred = NULL;
+ }
} else {
pred = NULL;
}
--- xpdf-3.00/xpdf/JBIG2Stream.cc (revision 488119)
+++ xpdf-3.00/xpdf/JBIG2Stream.cc (working copy)
@@ -7,6 +7,7 @@
//========================================================================
#include <aconf.h>
+#include <limits.h>
#ifdef USE_GCC_PRAGMAS
#pragma implementation
@@ -681,9 +682,15 @@ JBIG2Bitmap::JBIG2Bitmap(Guint segNumA,
w = wA;
h = hA;
line = (wA + 7) >> 3;
- // need to allocate one extra guard byte for use in combine()
- data = (Guchar *)gmalloc(h * line + 1);
- data[h * line] = 0;
+
+ if (h < 0 || line <= 0 || h >= INT_MAX / line) {
+ data = NULL;
+ }
+ else {
+ // need to allocate one extra guard byte for use in combine()
+ data = (Guchar *)gmalloc(h * line + 1);
+ data[h * line] = 0;
+ }
}
JBIG2Bitmap::JBIG2Bitmap(Guint segNumA, JBIG2Bitmap *bitmap):
@@ -692,6 +699,12 @@ JBIG2Bitmap::JBIG2Bitmap(Guint segNumA,
w = bitmap->w;
h = bitmap->h;
line = bitmap->line;
+
+ if (h < 0 || line <= 0 || h >= INT_MAX / line) {
+ data = NULL;
+ return;
+ }
+
// need to allocate one extra guard byte for use in combine()
data = (Guchar *)gmalloc(h * line + 1);
memcpy(data, bitmap->data, h * line);
@@ -720,7 +733,7 @@ JBIG2Bitmap *JBIG2Bitmap::getSlice(Guint
}
void JBIG2Bitmap::expand(int newH, Guint pixel) {
- if (newH <= h) {
+ if (newH <= h || line <= 0 || newH >= INT_MAX / line) {
return;
}
// need to allocate one extra guard byte for use in combine()
@@ -2305,6 +2318,15 @@ void JBIG2Stream::readHalftoneRegionSeg(
error(getPos(), "Bad symbol dictionary reference in JBIG2 halftone segment");
return;
}
+ if (gridH == 0 || gridW >= INT_MAX / gridH) {
+ error(getPos(), "Bad size in JBIG2 halftone segment");
+ return;
+ }
+ if (w == 0 || h >= INT_MAX / w) {
+ error(getPos(), "Bad size in JBIG2 bitmap segment");
+ return;
+ }
+
patternDict = (JBIG2PatternDict *)seg;
bpp = 0;
i = 1;
@@ -2936,6 +2958,9 @@ JBIG2Bitmap *JBIG2Stream::readGenericRef
JBIG2BitmapPtr tpgrCXPtr0, tpgrCXPtr1, tpgrCXPtr2;
int x, y, pix;
+ if (w < 0 || h <= 0 || w >= INT_MAX / h)
+ return NULL;
+
bitmap = new JBIG2Bitmap(0, w, h);
bitmap->clearToZero();
--- xpdf-3.00/xpdf/Stream.cc (revision 488119)
+++ xpdf-3.00/xpdf/Stream.cc (working copy)
@@ -1277,7 +1277,7 @@ CCITTFaxStream::CCITTFaxStream(Stream *s
endOfLine = endOfLineA;
byteAlign = byteAlignA;
columns = columnsA;
- if (columns < 1) {
+ if (columns + 3 < 1 || columns + 4 < 1 || columns < 1) {
columns = 1;
}
rows = rowsA;
@@ -3066,12 +3066,12 @@ GBool DCTStream::readHuffmanTables() {
while (length > 0) {
index = str->getChar();
--length;
- if ((index & 0x0f) >= 4) {
+ if ((index & ~0x10) >= 4 || (index & ~0x10) < 0) {
error(getPos(), "Bad DCT Huffman table");
return gFalse;
}
if (index & 0x10) {
- index &= 0x0f;
+ index &= 0x03;
if (index >= numACHuffTables)
numACHuffTables = index+1;
tbl = &acHuffTables[index];
xpdf-3.01-crash.patch:
fofi/FoFiType1.cc | 11 ++++++++---
splash/Splash.cc | 5 +++++
2 files changed, 13 insertions(+), 3 deletions(-)
--- NEW FILE xpdf-3.01-crash.patch ---
--- xpdf-3.00/splash/Splash.cc.tn 2005-07-25 09:59:45.000000000 +0200
+++ xpdf-3.00/splash/Splash.cc 2005-07-25 10:00:58.000000000 +0200
@@ -636,6 +641,11 @@
xPath = new SplashXPath(path, state->flatness, gTrue);
xPath->sort();
+ if (!&xPath->segs[0])
+ {
+ delete xPath;
+ return splashErrEmptyPath;
+ }
scanner = new SplashXPathScanner(xPath, eo);
// get the min and max x and y values
--- xpdf-3.00/fofi/FoFiType1.cc.tn 2005-07-25 10:34:04.000000000 +0200
+++ xpdf-3.00/fofi/FoFiType1.cc 2005-07-25 10:41:37.000000000 +0200
@@ -187,9 +187,14 @@
}
}
} else {
- if (strtok(buf, " \t") &&
- (p = strtok(NULL, " \t\n\r")) && !strcmp(p, "def")) {
- break;
+ p = strtok(buf, " \t\n\r");
+ if (p)
+ {
+ if (!strcmp(p, "def")) break;
+ if (!strcmp(p, "readonly")) break;
+ // the spec does not says this but i'm mantaining old xpdf behaviour that accepts "foo def" as end of the encoding array
+ p = strtok(buf, " \t\n\r");
+ if (p && !strcmp(p, "def")) break;
}
}
line = line1;
xpdf-3.01-resize.patch:
XPDFCore.cc | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
--- NEW FILE xpdf-3.01-resize.patch ---
--- xpdf-3.01/xpdf/XPDFCore.cc.resize 2005-10-06 23:40:10.000000000 +0200
+++ xpdf-3.01/xpdf/XPDFCore.cc 2005-10-06 23:40:10.000000000 +0200
@@ -979,6 +979,9 @@
XPDFCore *core = (XPDFCore *)ptr;
XEvent event;
Widget top;
+ Window rootWin;
+ int x1, y1;
+ Guint w1, h1, bw1, depth1;
Arg args[2];
int n;
Dimension w, h;
@@ -986,15 +989,20 @@
// find the top-most widget which has an associated window, and look
// for a pending ConfigureNotify in the event queue -- if there is
- // one, that means we're still resizing, and we want to skip the
- // current event
+ // one, and it specifies a different width or height, that means
+ // we're still resizing, and we want to skip the current event
for (top = core->parentWidget;
XtParent(top) && XtWindow(XtParent(top));
top = XtParent(top)) ;
if (XCheckTypedWindowEvent(core->display, XtWindow(top),
ConfigureNotify, &event)) {
XPutBackEvent(core->display, &event);
- return;
+ XGetGeometry(core->display, event.xconfigure.window,
+ &rootWin, &x1, &y1, &w1, &h1, &bw1, &depth1);
+ if ((Guint)event.xconfigure.width != w1 ||
+ (Guint)event.xconfigure.height != h1) {
+ return;
+ }
}
n = 0;
xpdf-3.01pl1.patch:
JPXStream.cc | 11 !!!!!!!!!!!
Stream.cc | 33 ++++++++++++++++++++++++++++!!!!!
Stream.h | 3 +++
3 files changed, 31 insertions(+), 16 modifications(!)
--- NEW FILE xpdf-3.01pl1.patch ---
diff -c -r xpdf-3.01-orig/xpdf/JPXStream.cc xpdf-3.01/xpdf/JPXStream.cc
*** xpdf-3.01-orig/xpdf/JPXStream.cc Tue Aug 16 22:34:31 2005
--- xpdf-3.01/xpdf/JPXStream.cc Thu Nov 3 16:50:39 2005
***************
*** 783,789 ****
int segType;
GBool haveSIZ, haveCOD, haveQCD, haveSOT;
Guint precinctSize, style;
! Guint segLen, capabilities, comp, i, j, r;
//----- main header
haveSIZ = haveCOD = haveQCD = haveSOT = gFalse;
--- 783,789 ----
int segType;
GBool haveSIZ, haveCOD, haveQCD, haveSOT;
Guint precinctSize, style;
! Guint segLen, capabilities, nTiles, comp, i, j, r;
//----- main header
haveSIZ = haveCOD = haveQCD = haveSOT = gFalse;
***************
*** 818,825 ****
/ img.xTileSize;
img.nYTiles = (img.ySize - img.yTileOffset + img.yTileSize - 1)
/ img.yTileSize;
! img.tiles = (JPXTile *)gmallocn(img.nXTiles * img.nYTiles,
! sizeof(JPXTile));
for (i = 0; i < img.nXTiles * img.nYTiles; ++i) {
img.tiles[i].tileComps = (JPXTileComp *)gmallocn(img.nComps,
sizeof(JPXTileComp));
--- 818,830 ----
/ img.xTileSize;
img.nYTiles = (img.ySize - img.yTileOffset + img.yTileSize - 1)
/ img.yTileSize;
! nTiles = img.nXTiles * img.nYTiles;
! // check for overflow before allocating memory
! if (nTiles == 0 || nTiles / img.nXTiles != img.nYTiles) {
! error(getPos(), "Bad tile count in JPX SIZ marker segment");
! return gFalse;
! }
! img.tiles = (JPXTile *)gmallocn(nTiles, sizeof(JPXTile));
for (i = 0; i < img.nXTiles * img.nYTiles; ++i) {
img.tiles[i].tileComps = (JPXTileComp *)gmallocn(img.nComps,
sizeof(JPXTileComp));
diff -c -r xpdf-3.01-orig/xpdf/Stream.cc xpdf-3.01/xpdf/Stream.cc
*** xpdf-3.01-orig/xpdf/Stream.cc Tue Aug 16 22:34:31 2005
--- xpdf-3.01/xpdf/Stream.cc Thu Nov 3 16:50:39 2005
***************
*** 401,418 ****
StreamPredictor::StreamPredictor(Stream *strA, int predictorA,
int widthA, int nCompsA, int nBitsA) {
str = strA;
predictor = predictorA;
width = widthA;
nComps = nCompsA;
nBits = nBitsA;
nVals = width * nComps;
pixBytes = (nComps * nBits + 7) >> 3;
! rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes;
predLine = (Guchar *)gmalloc(rowBytes);
memset(predLine, 0, rowBytes);
predIdx = rowBytes;
}
StreamPredictor::~StreamPredictor() {
--- 401,433 ----
StreamPredictor::StreamPredictor(Stream *strA, int predictorA,
int widthA, int nCompsA, int nBitsA) {
+ int totalBits;
+
str = strA;
predictor = predictorA;
width = widthA;
nComps = nCompsA;
nBits = nBitsA;
+ predLine = NULL;
+ ok = gFalse;
nVals = width * nComps;
+ totalBits = nVals * nBits;
+ if (totalBits == 0 ||
+ (totalBits / nBits) / nComps != width ||
+ totalBits + 7 < 0) {
+ return;
+ }
pixBytes = (nComps * nBits + 7) >> 3;
! rowBytes = ((totalBits + 7) >> 3) + pixBytes;
! if (rowBytes < 0) {
! return;
! }
predLine = (Guchar *)gmalloc(rowBytes);
memset(predLine, 0, rowBytes);
predIdx = rowBytes;
+
+ ok = gTrue;
}
StreamPredictor::~StreamPredictor() {
***************
*** 1004,1009 ****
--- 1019,1028 ----
FilterStream(strA) {
if (predictor != 1) {
pred = new StreamPredictor(this, predictor, columns, colors, bits);
+ if (!pred->isOk()) {
+ delete pred;
+ pred = NULL;
+ }
} else {
pred = NULL;
}
***************
*** 2899,2904 ****
--- 2918,2931 ----
height = read16();
width = read16();
numComps = str->getChar();
+ if (numComps <= 0 || numComps > 4) {
+ error(getPos(), "Bad number of components in DCT stream", prec);
+ return gFalse;
+ }
+ if (numComps <= 0 || numComps > 4) {
+ error(getPos(), "Bad number of components in DCT stream", prec);
+ return gFalse;
+ }
if (prec != 8) {
error(getPos(), "Bad DCT precision %d", prec);
return gFalse;
***************
*** 3827,3832 ****
--- 3854,3863 ----
FilterStream(strA) {
if (predictor != 1) {
pred = new StreamPredictor(this, predictor, columns, colors, bits);
+ if (!pred->isOk()) {
+ delete pred;
+ pred = NULL;
+ }
} else {
pred = NULL;
}
diff -c -r xpdf-3.01-orig/xpdf/Stream.h xpdf-3.01/xpdf/Stream.h
*** xpdf-3.01-orig/xpdf/Stream.h Tue Aug 16 22:34:31 2005
--- xpdf-3.01/xpdf/Stream.h Thu Nov 3 16:50:39 2005
***************
*** 232,237 ****
--- 232,239 ----
~StreamPredictor();
+ GBool isOk() { return ok; }
+
int lookChar();
int getChar();
***************
*** 249,254 ****
--- 251,257 ----
int rowBytes; // bytes per line
Guchar *predLine; // line buffer
int predIdx; // current index in predLine
+ GBool ok;
};
//------------------------------------------------------------------------
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xpdf/FC-4/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 9 Sep 2004 15:12:33 -0000 1.12
+++ .cvsignore 14 Dec 2005 21:13:40 -0000 1.13
@@ -1,8 +1 @@
-t1lib-5.0.2.tar.gz
-xpdf-3.00.tar.gz
-xpdf-chinese-simplified.tar.gz
-xpdf-chinese-traditional.tar.gz
-xpdf-cyrillic.tar.gz
-xpdf-japanese.tar.gz
-xpdf-korean.tar.gz
-xpdf-thai.tar.gz
+xpdf-3.01.tar.gz
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xpdf/FC-4/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 9 Sep 2004 15:12:33 -0000 1.12
+++ sources 14 Dec 2005 21:13:40 -0000 1.13
@@ -1,8 +1 @@
-cc5d4130b25bb8a1c930488b78930e9b t1lib-5.0.2.tar.gz
-95294cef3031dd68e65f331e8750b2c2 xpdf-3.00.tar.gz
-030392ef4ad4e75caf899064265f73aa xpdf-chinese-simplified.tar.gz
-233d80c56b636facb434c510addc0f28 xpdf-chinese-traditional.tar.gz
-4d80764d10ff406ddb7d26784ed575d9 xpdf-cyrillic.tar.gz
-7f3d680a49fd71cb86c0d60527402217 xpdf-japanese.tar.gz
-308af86071963cc959d596c710ac4119 xpdf-korean.tar.gz
-c4954dad99e2c2df997ac50dc2c09d1b xpdf-thai.tar.gz
+e004c69c7dddef165d768b1362b44268 xpdf-3.01.tar.gz
Index: xpdf.spec
===================================================================
RCS file: /cvs/dist/rpms/xpdf/FC-4/xpdf.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- xpdf.spec 14 Dec 2005 19:56:23 -0000 1.53
+++ xpdf.spec 14 Dec 2005 21:13:40 -0000 1.54
@@ -1,13 +1,13 @@
%define desktop_file 1
%define desktop_file_utils_version 0.2.90
-%define t1lib_version 5.0.2
+%define t1lib_version 5.1.0
%define t1lib 0
%define monolithic 1
Summary: A PDF file viewer for the X Window System.
Name: xpdf
-Version: 3.00
-Release: 22
+Version: 3.01
+Release: 0.FC4.4
License: GPL
Epoch: 1
Url: http://www.foolabs.com/xpdf/
@@ -25,21 +25,15 @@
Source11: acroread.png
Patch0: xpdf-3.00-redhat.patch
-Patch1: xpdf-2.01-locale.patch
-Patch2: xpdf-2.02-pdftops.patch
Patch3: xpdf-2.02-ext.patch
-Patch4: xpdf-3.00-freetype2.patch
-Patch5: xpdf-3.0-cjk-font.patch
Patch6: xpdf-3.00-core.patch
Patch7: xpdf-3.00-xfont.patch
-Patch8: xpdf-3.00-PathScanner.patch
Patch9: xpdf-3.00-papersize.patch
-
-# security
-Patch100: xpdf-3.00-overflow.patch
-Patch101: xpdf-3.00-can-2004-1125.patch
-Patch102: xpdf-3.00-CAN-2005-0064.patch
-Patch103: xpdf-3.00-CVE-2005-3191.patch
+Patch10: xpdf-3.00-gcc4.patch
+Patch11: xpdf-3.01-crash.patch
+Patch12: xpdf-3.00-64bit.patch
+Patch13: xpdf-3.01-resize.patch
+Patch15: xpdf-3.01-CVE-2005-3191.patch
Requires: urw-fonts
Requires: htmlview
@@ -58,7 +52,7 @@
Obsoletes: %{name}-japanese
%endif
-BuildRoot: %{_tmppath}/%{name}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
%package chinese-simplified
Summary: Chinese Simplified support
@@ -117,18 +111,14 @@
%setup -q -a 1 -a 3 -a 4 -a 5 -a 6
%patch -p1
%patch3 -p1 -b .ext
-%patch4 -p1 -b .freetype217
-%patch5 -p1 -b .cjk
%patch6 -p1 -b .core
%patch7 -p1 -b .fonts
-%patch8 -p1 -b .xpath
%patch9 -p1 -b .papersize
-
-# security fixes
-%patch100 -p1 -b .CAN-2004-0888
-%patch101 -p1 -b .can-2004-1125
-%patch102 -p1 -b .CAN-2005-0064
-%patch103 -p1 -b .CVE-2005-3191
+%patch10 -p1 -b .gcc4
+%patch11 -p1 -b .crash
+%patch12 -p1 -b .alloc
+%patch13 -p1 -b .resize
+%patch15 -p1 -b .CVE-2005-3191
%build
find -name "*orig" | xargs rm -f
@@ -228,9 +218,26 @@
%lang(ko) %{_datadir}/xpdf/korean
%changelog
-* Wed Dec 14 2005 Kristian Høgsberg <krh at redhat.com> 1:3.00-21
-- Add xpdf-3.00-CVE-2005-3191.patch to fix CVS-2005-3191 security
- problem (#175113).
+* Wed Dec 14 2005 Kristian Høgsberg <krh at redhat.com> 1:3.01-0.FC4.4
+- Add xpdf-3.01-CVE-2005-3191.patch to fix security bug #173888 and
+ merge embargo branch back to FC-4
+
+* Mon Nov 07 2005 Than Ngo <than at redhat.com> 1:3.01-0.FC4.3
+- apply upstream patch to fix security holes in Xpdf
+
+* Mon Oct 10 2005 Than Ngo <than at redhat.com> 1:3.01-0.FC4.2
+- apply upstream patch to fix resize/redraw bug #166569
+
+* Thu Aug 18 2005 Than Ngo <than at redhat.com> 1:3.01-0.FC4.1
+- update to 3.01
+
+* Wed Jul 27 2005 Than Ngo <than at redhat.com> 1:3.00-20.FC4.2
+- better patch to fix CAN-2005-2097, #163918
+- fix build problem with gcc4
+
+* Tue Jul 26 2005 Than Ngo <than at redhat.com> 3.00-20.FC4.1
+- backport patch to fix xpdf DoS, CAN-2005-2097, #163918
+- fix xpdf crash #163807
* Mon May 23 2005 Than Ngo <than at redhat.com> 3.00-20
- get rid of buildreq on obsoleted fileutils
More information about the fedora-cvs-commits
mailing list