head 1.5; access; symbols pkgsrc-2017Q3:1.4.0.94 pkgsrc-2017Q3-base:1.4 pkgsrc-2017Q2:1.4.0.90 pkgsrc-2017Q2-base:1.4 pkgsrc-2017Q1:1.4.0.88 pkgsrc-2017Q1-base:1.4 pkgsrc-2016Q4:1.4.0.86 pkgsrc-2016Q4-base:1.4 pkgsrc-2016Q3:1.4.0.84 pkgsrc-2016Q3-base:1.4 pkgsrc-2016Q2:1.4.0.82 pkgsrc-2016Q2-base:1.4 pkgsrc-2016Q1:1.4.0.80 pkgsrc-2016Q1-base:1.4 pkgsrc-2015Q4:1.4.0.78 pkgsrc-2015Q4-base:1.4 pkgsrc-2015Q3:1.4.0.76 pkgsrc-2015Q3-base:1.4 pkgsrc-2015Q2:1.4.0.74 pkgsrc-2015Q2-base:1.4 pkgsrc-2015Q1:1.4.0.72 pkgsrc-2015Q1-base:1.4 pkgsrc-2014Q4:1.4.0.70 pkgsrc-2014Q4-base:1.4 pkgsrc-2014Q3:1.4.0.68 pkgsrc-2014Q3-base:1.4 pkgsrc-2014Q2:1.4.0.66 pkgsrc-2014Q2-base:1.4 pkgsrc-2014Q1:1.4.0.64 pkgsrc-2014Q1-base:1.4 pkgsrc-2013Q4:1.4.0.62 pkgsrc-2013Q4-base:1.4 pkgsrc-2013Q3:1.4.0.60 pkgsrc-2013Q3-base:1.4 pkgsrc-2013Q2:1.4.0.58 pkgsrc-2013Q2-base:1.4 pkgsrc-2013Q1:1.4.0.56 pkgsrc-2013Q1-base:1.4 pkgsrc-2012Q4:1.4.0.54 pkgsrc-2012Q4-base:1.4 pkgsrc-2012Q3:1.4.0.52 pkgsrc-2012Q3-base:1.4 pkgsrc-2012Q2:1.4.0.50 pkgsrc-2012Q2-base:1.4 pkgsrc-2012Q1:1.4.0.48 pkgsrc-2012Q1-base:1.4 pkgsrc-2011Q4:1.4.0.46 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q3:1.4.0.44 pkgsrc-2011Q3-base:1.4 pkgsrc-2011Q2:1.4.0.42 pkgsrc-2011Q2-base:1.4 pkgsrc-2011Q1:1.4.0.40 pkgsrc-2011Q1-base:1.4 pkgsrc-2010Q4:1.4.0.38 pkgsrc-2010Q4-base:1.4 pkgsrc-2010Q3:1.4.0.36 pkgsrc-2010Q3-base:1.4 pkgsrc-2010Q2:1.4.0.34 pkgsrc-2010Q2-base:1.4 pkgsrc-2010Q1:1.4.0.32 pkgsrc-2010Q1-base:1.4 pkgsrc-2009Q4:1.4.0.30 pkgsrc-2009Q4-base:1.4 pkgsrc-2009Q3:1.4.0.28 pkgsrc-2009Q3-base:1.4 pkgsrc-2009Q2:1.4.0.26 pkgsrc-2009Q2-base:1.4 pkgsrc-2009Q1:1.4.0.24 pkgsrc-2009Q1-base:1.4 pkgsrc-2008Q4:1.4.0.22 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.4.0.20 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.18 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.16 pkgsrc-2008Q2-base:1.4 cwrapper:1.4.0.14 pkgsrc-2008Q1:1.4.0.12 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.10 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.8 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.4.0.6 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.4.0.4 pkgsrc-2007Q1-base:1.4 pkgsrc-2006Q4:1.4.0.2 pkgsrc-2006Q4-base:1.4 pkgsrc-2006Q3:1.3.0.4 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.2 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.1.0.4 pkgsrc-2006Q1-base:1.1 pkgsrc-2005Q4:1.1.0.2; locks; strict; comment @# @; 1.5 date 2017.09.26.10.27.08; author wiz; state dead; branches; next 1.4; commitid 9ARpkXTuh9Wg2H8A; 1.4 date 2006.10.17.09.33.16; author markd; state Exp; branches; next 1.3; 1.3 date 2006.05.24.12.54.45; author markd; state Exp; branches; next 1.2; 1.2 date 2006.04.12.12.37.35; author markd; state dead; branches; next 1.1; 1.1 date 2006.01.05.10.28.27; author markd; state Exp; branches 1.1.2.1; next ; 1.1.2.1 date 2006.01.05.10.28.27; author salo; state dead; branches; next 1.1.2.2; 1.1.2.2 date 2006.01.08.04.23.08; author salo; state Exp; branches; next ; desc @@ 1.5 log @*: remove qt3 and the packages using it, including KDE3 Announced in https://mail-index.netbsd.org/pkgsrc-users/2017/09/10/msg025556.html @ text @$NetBSD: patch-ao,v 1.4 2006/10/17 09:33:16 markd Exp $ --- krita/plugins/filters/cimg/CImg.h.orig 2006-10-08 02:33:53.000000000 +1300 +++ krita/plugins/filters/cimg/CImg.h @@@@ -73,7 +73,7 @@@@ #if defined(sun) || defined(__sun) || defined(linux) || defined(__linux) \ || defined(__linux__) || defined(__CYGWIN__) || defined(BSD) || defined(__FreeBSD__) \ || defined(__OPENBSD__) || defined(__MACOSX__) || defined(__APPLE__) || defined(sgi) \ - || defined(__sgi) + || defined(__sgi) || defined(__NetBSD__) // Unix-like (Linux, Solaris, BSD, Irix,...) #define cimg_OS 1 #ifndef cimg_display_type @ 1.4 log @Update koffice to 1.6.0 This release is mostly a feature release of Krita and Kexi, but also contains major enhancements to the OpenDocument and MathML support of KFormula and new scripting functionality. This version also contains a vastly improved version of KPlato, the project planning application. @ text @d1 1 a1 1 $NetBSD: patch-ao,v 1.3 2006/05/24 12:54:45 markd Exp $ @ 1.3 log @Update koffice to version 1.5.1 Major Improvements in this release are: * Improved OASIS OpenDocument Support, especially in KSpread * Rotating large images and scaling of images now works correctly in Krita * Various other bugfixes Known issues: * Two issues with Kexi forms. Forms may not appear in Kexi (1.0.0 version was affected as well). No existing data or design can be lost, though. SUSE and Debian packages are not affected. Please read the details. * Krita crashes when saving an image containing exif information to .kra twice @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- krita/plugins/filters/cimg/CImg.h.orig 2006-05-11 06:28:04.000000000 +1200 d5 1 a5 1 @@@@ -65,7 +65,7 @@@@ d11 1 a11 1 // Unix (Linux,Solaris,BSD,Irix,...) @ 1.2 log @Update to koffice 1.5.0 This version sports OpenDocument as the default file format, accessibility, a new project planning tool KPlato, professional color support and adjustment layers in Krita and the long awaited Kexi 1.0. @ text @d1 1 a1 1 $NetBSD: patch-ao,v 1.1 2006/01/05 10:28:27 markd Exp $ d3 11 a13 137 Index: filters/kword/pdf/xpdf/xpdf/Stream.cc =================================================================== --- filters/kword/pdf/xpdf/xpdf/Stream.cc (revision 409205) +++ filters/kword/pdf/xpdf/xpdf/Stream.cc (revision 488720) @@@@ -15,6 +15,7 @@@@ #include #include #include +#include #ifndef WIN32 #include #endif @@@@ -409,13 +410,28 @@@@ StreamPredictor::StreamPredictor(Stream 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() { @@@@ -982,6 +998,10 @@@@ LZWStream::LZWStream(Stream *strA, int p FilterStream(strA) { if (predictor != 1) { pred = new StreamPredictor(this, predictor, columns, colors, bits); + if ( !pred->isOk()) { + delete pred; + pred = NULL; + } } else { pred = NULL; } @@@@ -1227,6 +1247,10 @@@@ CCITTFaxStream::CCITTFaxStream(Stream *s endOfLine = endOfLineA; byteAlign = byteAlignA; columns = columnsA; + if (columns < 1 || columns >= INT_MAX / sizeof(short)) { + error(-1, "invalid number of columns"); + exit(1); + } rows = rowsA; endOfBlock = endOfBlockA; black = blackA; @@@@ -2861,6 +2885,11 @@@@ GBool DCTStream::readBaselineSOF() { height = read16(); width = read16(); numComps = str->getChar(); + if (numComps <= 0 || numComps > 4) { + numComps = 0; + error(getPos(), "Bad number of components in DCT stream"); + return gFalse; + } if (prec != 8) { error(getPos(), "Bad DCT precision %d", prec); return gFalse; @@@@ -2887,6 +2916,11 @@@@ GBool DCTStream::readProgressiveSOF() { height = read16(); width = read16(); numComps = str->getChar(); + if (numComps <= 0 || numComps > 4) { + numComps = 0; + error(getPos(), "Bad number of components in DCT stream"); + return gFalse; + } if (prec != 8) { error(getPos(), "Bad DCT precision %d", prec); return gFalse; @@@@ -2909,6 +2943,11 @@@@ GBool DCTStream::readScanInfo() { length = read16() - 2; scanInfo.numComps = str->getChar(); + if (scanInfo.numComps <= 0 || scanInfo.numComps > 4) { + scanInfo.numComps = 0; + 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"); @@@@ -2976,12 +3015,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]; @@@@ -3069,9 +3108,11 @@@@ int DCTStream::readMarker() { do { do { c = str->getChar(); + if(c == EOF) return EOF; } while (c != 0xff); do { c = str->getChar(); + if(c == EOF) return EOF; } while (c == 0xff); } while (c == 0x00); return c; @@@@ -3179,6 +3220,10 @@@@ FlateStream::FlateStream(Stream *strA, i FilterStream(strA) { if (predictor != 1) { pred = new StreamPredictor(this, predictor, columns, colors, bits); + if ( !pred->isOk()) { + delete pred; + pred = NULL; + } } else { pred = NULL; } @ 1.1 log @updated xpdf patch. http://www.kde.org/info/security/advisory-20051207-2.txt Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD$ @ 1.1.2.1 log @file patch-ao was added on branch pkgsrc-2005Q4 on 2006-01-05 10:28:27 +0000 @ text @d1 139 @ 1.1.2.2 log @Pullup ticket 1000 - requested by Mark Davies security fix for koffice Revisions pulled up: - pkgsrc/misc/koffice/Makefile 1.71 - pkgsrc/misc/koffice/distinfo 1.28 - pkgsrc/misc/koffice/patches/patch-an 1.3 - pkgsrc/misc/koffice/patches/patch-ao 1.1 - pkgsrc/misc/koffice/patches/patch-ap 1.1 Module Name: pkgsrc Committed By: markd Date: Thu Jan 5 10:28:27 UTC 2006 Modified Files: pkgsrc/misc/koffice: Makefile distinfo Added Files: pkgsrc/misc/koffice/patches: patch-an patch-ao patch-ap Log Message: updated xpdf patch. http://www.kde.org/info/security/advisory-20051207-2.txt Bump PKGREVISION. @ text @a0 139 $NetBSD: patch-ao,v 1.1.2.1 2006/01/08 04:23:08 salo Exp $ Index: filters/kword/pdf/xpdf/xpdf/Stream.cc =================================================================== --- filters/kword/pdf/xpdf/xpdf/Stream.cc (revision 409205) +++ filters/kword/pdf/xpdf/xpdf/Stream.cc (revision 488720) @@@@ -15,6 +15,7 @@@@ #include #include #include +#include #ifndef WIN32 #include #endif @@@@ -409,13 +410,28 @@@@ StreamPredictor::StreamPredictor(Stream 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() { @@@@ -982,6 +998,10 @@@@ LZWStream::LZWStream(Stream *strA, int p FilterStream(strA) { if (predictor != 1) { pred = new StreamPredictor(this, predictor, columns, colors, bits); + if ( !pred->isOk()) { + delete pred; + pred = NULL; + } } else { pred = NULL; } @@@@ -1227,6 +1247,10 @@@@ CCITTFaxStream::CCITTFaxStream(Stream *s endOfLine = endOfLineA; byteAlign = byteAlignA; columns = columnsA; + if (columns < 1 || columns >= INT_MAX / sizeof(short)) { + error(-1, "invalid number of columns"); + exit(1); + } rows = rowsA; endOfBlock = endOfBlockA; black = blackA; @@@@ -2861,6 +2885,11 @@@@ GBool DCTStream::readBaselineSOF() { height = read16(); width = read16(); numComps = str->getChar(); + if (numComps <= 0 || numComps > 4) { + numComps = 0; + error(getPos(), "Bad number of components in DCT stream"); + return gFalse; + } if (prec != 8) { error(getPos(), "Bad DCT precision %d", prec); return gFalse; @@@@ -2887,6 +2916,11 @@@@ GBool DCTStream::readProgressiveSOF() { height = read16(); width = read16(); numComps = str->getChar(); + if (numComps <= 0 || numComps > 4) { + numComps = 0; + error(getPos(), "Bad number of components in DCT stream"); + return gFalse; + } if (prec != 8) { error(getPos(), "Bad DCT precision %d", prec); return gFalse; @@@@ -2909,6 +2943,11 @@@@ GBool DCTStream::readScanInfo() { length = read16() - 2; scanInfo.numComps = str->getChar(); + if (scanInfo.numComps <= 0 || scanInfo.numComps > 4) { + scanInfo.numComps = 0; + 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"); @@@@ -2976,12 +3015,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]; @@@@ -3069,9 +3108,11 @@@@ int DCTStream::readMarker() { do { do { c = str->getChar(); + if(c == EOF) return EOF; } while (c != 0xff); do { c = str->getChar(); + if(c == EOF) return EOF; } while (c == 0xff); } while (c == 0x00); return c; @@@@ -3179,6 +3220,10 @@@@ FlateStream::FlateStream(Stream *strA, i FilterStream(strA) { if (predictor != 1) { pred = new StreamPredictor(this, predictor, columns, colors, bits); + if ( !pred->isOk()) { + delete pred; + pred = NULL; + } } else { pred = NULL; } @