head 1.6; access; symbols pkgsrc-2013Q2:1.6.0.32 pkgsrc-2013Q2-base:1.6 pkgsrc-2012Q4:1.6.0.30 pkgsrc-2012Q4-base:1.6 pkgsrc-2011Q4:1.6.0.28 pkgsrc-2011Q4-base:1.6 pkgsrc-2011Q2:1.6.0.26 pkgsrc-2011Q2-base:1.6 pkgsrc-2009Q4:1.6.0.24 pkgsrc-2009Q4-base:1.6 pkgsrc-2008Q4:1.6.0.22 pkgsrc-2008Q4-base:1.6 pkgsrc-2008Q3:1.6.0.20 pkgsrc-2008Q3-base:1.6 cube-native-xorg:1.6.0.18 cube-native-xorg-base:1.6 pkgsrc-2008Q2:1.6.0.16 pkgsrc-2008Q2-base:1.6 pkgsrc-2008Q1:1.6.0.14 pkgsrc-2008Q1-base:1.6 pkgsrc-2007Q4:1.6.0.12 pkgsrc-2007Q4-base:1.6 pkgsrc-2007Q3:1.6.0.10 pkgsrc-2007Q3-base:1.6 pkgsrc-2007Q2:1.6.0.8 pkgsrc-2007Q2-base:1.6 pkgsrc-2007Q1:1.6.0.6 pkgsrc-2007Q1-base:1.6 pkgsrc-2006Q4:1.6.0.4 pkgsrc-2006Q4-base:1.6 pkgsrc-2006Q3:1.6.0.2 pkgsrc-2006Q3-base:1.6 pkgsrc-2006Q2:1.5.0.2 pkgsrc-2006Q2-base:1.5 pkgsrc-2006Q1:1.3.0.2 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.2.0.18 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.16 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.14 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.12 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.10 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.8 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.6 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.4 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.2.0.2 pkgsrc-2003Q4-base:1.2 buildlink2-base:1.2 netbsd-1-5-PATCH001:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.6 date 2006.07.15.21.14.00; author markd; state dead; branches; next 1.5; 1.5 date 2006.05.24.12.54.45; author markd; state Exp; branches; next 1.4; 1.4 date 2006.04.12.12.37.35; author markd; state dead; branches; next 1.3; 1.3 date 2006.01.05.10.28.27; author markd; state Exp; branches; next 1.2; 1.2 date 2001.11.13.21.23.45; author jlam; state dead; branches 1.2.18.1; next 1.1; 1.1 date 2001.03.30.00.25.20; author hubertf; state Exp; branches 1.1.1.1; next ; 1.2.18.1 date 2006.01.08.04.23.08; author salo; state Exp; branches; next ; 1.1.1.1 date 2001.03.30.00.25.20; author hubertf; state Exp; branches; next ; desc @@ 1.6 log @Update koffice to 1.5.2 Major Improvements in this release are: * Many crashes are fixed * PowerPC support in Krita works now * Karbon improved interaction with shapes a lot * Various other bugfixes @ text @$NetBSD: patch-an,v 1.5 2006/05/24 12:54:45 markd Exp $ --- krita/plugins/filters/cimg/Makefile.in.orig 2006-05-12 07:20:35.000000000 +1200 +++ krita/plugins/filters/cimg/Makefile.in @@@@ -562,7 +562,7 @@@@ x_libraries = @@x_libraries@@ xdg_appsdir = @@xdg_appsdir@@ xdg_directorydir = @@xdg_directorydir@@ xdg_menudir = @@xdg_menudir@@ -KDE_CXXFLAGS = $(USE_EXCEPTIONS) -D_POSIX_C_SOURCE=199309L +KDE_CXXFLAGS = $(USE_EXCEPTIONS) kde_services_DATA = kritacimg.desktop # all_includes must remain last! @ 1.5 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$ @ 1.4 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-an,v 1.3 2006/01/05 10:28:27 markd Exp $ d3 9 a11 102 Index: filters/kword/pdf/xpdf/xpdf/JBIG2Stream.cc =================================================================== --- filters/kword/pdf/xpdf/xpdf/JBIG2Stream.cc (revision 409205) +++ filters/kword/pdf/xpdf/xpdf/JBIG2Stream.cc (revision 488720) @@@@ -7,6 +7,7 @@@@ //======================================================================== #include +#include #ifdef USE_GCC_PRAGMAS #pragma implementation @@@@ -977,7 +978,15 @@@@ JBIG2Bitmap::JBIG2Bitmap(Guint segNumA, w = wA; h = hA; line = (wA + 7) >> 3; - data = (Guchar *)gmalloc(h * line); + + if (h < 0 || line <= 0 || h >= (INT_MAX - 1)/ line) { + error(-1, "invalid width/height"); + data = NULL; + return; + } + + // need to allocate one extra guard byte for use in combine() + data = (Guchar *)gmalloc(h * line + 1); } JBIG2Bitmap::JBIG2Bitmap(Guint segNumA, JBIG2Bitmap *bitmap): @@@@ -986,7 +995,15 @@@@ JBIG2Bitmap::JBIG2Bitmap(Guint segNumA, w = bitmap->w; h = bitmap->h; line = bitmap->line; - data = (Guchar *)gmalloc(h * line); + + if (h < 0 || line <= 0 || h >= (INT_MAX - 1) / line) { + error(-1, "invalid width/height"); + 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); } @@@@ -1012,10 +1029,14 @@@@ JBIG2Bitmap *JBIG2Bitmap::getSlice(Guint } void JBIG2Bitmap::expand(int newH, Guint pixel) { - if (newH <= h) { + if (newH <= h || line <= 0 || newH >= (INT_MAX-1) / line) { + error(-1, "invalid width/height"); + gfree(data); + data = NULL; return; } - data = (Guchar *)grealloc(data, newH * line); + /* need to allocate one extra guard byte for use in combine() */ + data = (Guchar *)grealloc(data, newH * line + 1); if (pixel) { memset(data + h * line, 0xff, (newH - h) * line); } else { @@@@ -2239,6 +2260,11 @@@@ JBIG2Bitmap *JBIG2Stream::readTextRegion strips = 1 << logStrips; + if (w < 0 || h <= 0 || w >= INT_MAX / h) { + error(-1, "invalid width/height"); + return NULL; + } + // allocate the bitmap bitmap = new JBIG2Bitmap(0, w, h); if (defPixel) { @@@@ -2505,6 +2531,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; @@@@ -3078,6 +3113,11 @@@@ JBIG2Bitmap *JBIG2Stream::readGenericRef Guint ltpCX, cx, cx0, cx2, cx3, cx4, tpgrCX0, tpgrCX1, tpgrCX2; int x, y, pix; + if (w < 0 || h <= 0 || w >= INT_MAX / h) { + error(-1, "invalid width/height"); + return NULL; + } + bitmap = new JBIG2Bitmap(0, w, h); bitmap->clearToZero(); d13 1 @ 1.3 log @updated xpdf patch. http://www.kde.org/info/security/advisory-20051207-2.txt Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @Update koffice to 1.1. Package update was provided in pkg/14425 by Mark Davies with changes by me. Pkgsrc-related changes include: * Strongly buildlinkifying. * Using qt2-designer-kde for a uic that understands KDE2 widgets. * Fixing sources to compile with egcs-1.1.2's much-less-than-compliant C++ compiler. Given the rapid development between the 1.0 and 1.1 releases, plus the scope of the applications in the suite, it's difficult to summarize the changes. The major change is that KIllustrator is now named Kontour for trademark reasons. Aside from that, basically everything is more featureful and more stable, plus there are more import/export filters for other application suites. @ text @d1 1 a1 1 $NetBSD: patch-an,v 1.1 2001/03/30 00:25:20 hubertf Exp $ d3 103 a105 10 --- kword/kword_page.cc.orig Sat Jan 6 20:34:54 2001 +++ kword/kword_page.cc @@@@ -59,6 +59,7 @@@@ #include +#include /******************************************************************/ /* Class: KWPage * This class is responsible for the rendering of the frames to @ 1.2.18.1 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 @d1 1 a1 1 $NetBSD: patch-an,v 1.3 2006/01/05 10:28:27 markd Exp $ d3 10 a12 103 Index: filters/kword/pdf/xpdf/xpdf/JBIG2Stream.cc =================================================================== --- filters/kword/pdf/xpdf/xpdf/JBIG2Stream.cc (revision 409205) +++ filters/kword/pdf/xpdf/xpdf/JBIG2Stream.cc (revision 488720) @@@@ -7,6 +7,7 @@@@ //======================================================================== #include +#include #ifdef USE_GCC_PRAGMAS #pragma implementation @@@@ -977,7 +978,15 @@@@ JBIG2Bitmap::JBIG2Bitmap(Guint segNumA, w = wA; h = hA; line = (wA + 7) >> 3; - data = (Guchar *)gmalloc(h * line); + + if (h < 0 || line <= 0 || h >= (INT_MAX - 1)/ line) { + error(-1, "invalid width/height"); + data = NULL; + return; + } + + // need to allocate one extra guard byte for use in combine() + data = (Guchar *)gmalloc(h * line + 1); } JBIG2Bitmap::JBIG2Bitmap(Guint segNumA, JBIG2Bitmap *bitmap): @@@@ -986,7 +995,15 @@@@ JBIG2Bitmap::JBIG2Bitmap(Guint segNumA, w = bitmap->w; h = bitmap->h; line = bitmap->line; - data = (Guchar *)gmalloc(h * line); + + if (h < 0 || line <= 0 || h >= (INT_MAX - 1) / line) { + error(-1, "invalid width/height"); + 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); } @@@@ -1012,10 +1029,14 @@@@ JBIG2Bitmap *JBIG2Bitmap::getSlice(Guint } void JBIG2Bitmap::expand(int newH, Guint pixel) { - if (newH <= h) { + if (newH <= h || line <= 0 || newH >= (INT_MAX-1) / line) { + error(-1, "invalid width/height"); + gfree(data); + data = NULL; return; } - data = (Guchar *)grealloc(data, newH * line); + /* need to allocate one extra guard byte for use in combine() */ + data = (Guchar *)grealloc(data, newH * line + 1); if (pixel) { memset(data + h * line, 0xff, (newH - h) * line); } else { @@@@ -2239,6 +2260,11 @@@@ JBIG2Bitmap *JBIG2Stream::readTextRegion strips = 1 << logStrips; + if (w < 0 || h <= 0 || w >= INT_MAX / h) { + error(-1, "invalid width/height"); + return NULL; + } + // allocate the bitmap bitmap = new JBIG2Bitmap(0, w, h); if (defPixel) { @@@@ -2505,6 +2531,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; @@@@ -3078,6 +3113,11 @@@@ JBIG2Bitmap *JBIG2Stream::readGenericRef Guint ltpCX, cx, cx0, cx2, cx3, cx4, tpgrCX0, tpgrCX1, tpgrCX2; int x, y, pix; + if (w < 0 || h <= 0 || w >= INT_MAX / h) { + error(-1, "invalid width/height"); + return NULL; + } + bitmap = new JBIG2Bitmap(0, w, h); bitmap->clearToZero(); @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ @ 1.1.1.1 log @Added koffice-2.0.1: KDE Office Suite with text processor, spreadsheet, ... KOffice is an integrated office suite for KDE, the K Desktop Environment. Includes: KWord - A frame-based wordprocessor comparable to FrameMaker KSpread - A powerful spreadsheet application KPresenter - A full-featured presentation program Kivio - A Visio-style flowcharting application KIllustrator - A vector drawing application Krayon - A pixel-based image manipulation program like GIMP or Adobe Photoshop Based on package from Nick Hudson . @ text @@