[pkg-kde-commits] rev 2836 - in trunk/packages/koffice/debian: .
patches
Isaac Clerencia
isaac at costa.debian.org
Thu Jan 12 11:14:48 UTC 2006
Author: isaac
Date: 2006-01-12 11:14:46 +0000 (Thu, 12 Jan 2006)
New Revision: 2836
Added:
trunk/packages/koffice/debian/patches/01_koffice_branch_r497174.diff
Removed:
trunk/packages/koffice/debian/patches/01_koffice_branch_r489703.diff
Modified:
trunk/packages/koffice/debian/changelog
trunk/packages/koffice/debian/control
trunk/packages/koffice/debian/rules
Log:
No longer build with g++-3.4 in the GT
Do a new branch pull to further fix security bugs
Modified: trunk/packages/koffice/debian/changelog
===================================================================
--- trunk/packages/koffice/debian/changelog 2006-01-12 10:32:16 UTC (rev 2835)
+++ trunk/packages/koffice/debian/changelog 2006-01-12 11:14:46 UTC (rev 2836)
@@ -1,7 +1,12 @@
-koffice (1:1.4.2-6) unstable; urgency=low
+koffice (1:1.4.2-6) unstable; urgency=high
+
+ * Urgency high because of security fix
+ * Yet another branch pull (up to r497174) to fix security bug #342294,
+ this should take care definitely of the following CVE IDs:
+ CVE-2005-3191 CVE-2005-3193 CVE-2005-3624 CVE-2005-3625
+ CVE-2005-3626 CVE-2005-3627 CVE-2005-3628
+ * Build with gcc-4.0 in every arch, closes: #342993
- * Yet another branch pull to fix #342294.
-
-- Isaac Clerencia <isaac at debian.org> Mon, 19 Dec 2005 16:10:27 +0100
koffice (1:1.4.2-5) unstable; urgency=low
Modified: trunk/packages/koffice/debian/control
===================================================================
--- trunk/packages/koffice/debian/control 2006-01-12 10:32:16 UTC (rev 2835)
+++ trunk/packages/koffice/debian/control 2006-01-12 11:14:46 UTC (rev 2836)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Uploaders: Ben Burton <bab at debian.org>, Luk Claes <luk at debian.org>, Isaac Clerencia <isaac at debian.org>
-Build-Depends: g++-3.4 [arm hppa m68k], cdbs (>= 0.4.27), debhelper (>= 4.2.30), flex, kdelibs4-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libmagick++9-dev, libpaper-dev, libtiff4-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, libwpd8-dev
+Build-Depends: cdbs (>= 0.4.27), debhelper (>= 4.2.30), flex, kdelibs4-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libmagick++9-dev, libpaper-dev, libtiff4-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, libwpd8-dev
Standards-Version: 3.6.1
Package: koffice
Deleted: trunk/packages/koffice/debian/patches/01_koffice_branch_r489703.diff
Added: trunk/packages/koffice/debian/patches/01_koffice_branch_r497174.diff
===================================================================
--- trunk/packages/koffice/debian/patches/01_koffice_branch_r497174.diff 2006-01-12 10:32:16 UTC (rev 2835)
+++ trunk/packages/koffice/debian/patches/01_koffice_branch_r497174.diff 2006-01-12 11:14:46 UTC (rev 2836)
@@ -0,0 +1,100 @@
+#DPATCHLEVEL=0
+--- kexi/formeditor/form.cpp (revision 488386)
++++ kexi/formeditor/form.cpp (revision 497174)
+@@ -300,8 +300,8 @@
+ Form::emitSelectionSignals()
+ {
+ emit selectionChanged(selectedWidgets()->first(), false);
+- for(QWidget *w = selectedWidgets()->next(); w; w = selectedWidgets()->next())
+- emit selectionChanged(selectedWidgets()->first(), true);
++ for (WidgetListIterator it(*selectedWidgets()); it.current(); ++it)
++ emit selectionChanged(it.current(), true);
+ }
+
+ /////////////////////////// Various slots and signals /////////////////////
+--- filters/kword/pdf/xpdf/xpdf/JBIG2Stream.cc (revision 488386)
++++ filters/kword/pdf/xpdf/xpdf/JBIG2Stream.cc (revision 497174)
+@@ -979,13 +979,14 @@
+ h = hA;
+ line = (wA + 7) >> 3;
+
+- if (h < 0 || line <= 0 || h >= INT_MAX / line) {
++ if (h < 0 || line <= 0 || h >= (INT_MAX - 1)/ line) {
+ error(-1, "invalid width/height");
+ data = NULL;
+ return;
+ }
+
+- data = (Guchar *)gmalloc(h * line);
++ // need to allocate one extra guard byte for use in combine()
++ data = (Guchar *)gmalloc(h * line + 1);
+ }
+
+ JBIG2Bitmap::JBIG2Bitmap(Guint segNumA, JBIG2Bitmap *bitmap):
+@@ -995,13 +996,14 @@
+ h = bitmap->h;
+ line = bitmap->line;
+
+- if (h < 0 || line <= 0 || h >= INT_MAX / line) {
++ if (h < 0 || line <= 0 || h >= (INT_MAX - 1) / line) {
+ error(-1, "invalid width/height");
+ data = NULL;
+ return;
+ }
+
+- data = (Guchar *)gmalloc(h * line);
++ // need to allocate one extra guard byte for use in combine()
++ data = (Guchar *)gmalloc(h * line + 1);
+ memcpy(data, bitmap->data, h * line);
+ }
+
+@@ -1027,13 +1029,14 @@
+ }
+
+ void JBIG2Bitmap::expand(int newH, Guint pixel) {
+- if (newH <= h || line <= 0 || newH >= INT_MAX / line) {
++ 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 {
+@@ -2257,6 +2260,11 @@
+
+ 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) {
+--- filters/kword/pdf/xpdf/xpdf/Stream.cc (revision 488386)
++++ filters/kword/pdf/xpdf/xpdf/Stream.cc (revision 497174)
+@@ -419,7 +419,7 @@
+ return;
+
+ nVals = width * nComps;
+- if (nVals + 7 <= 0)
++ if (nVals * nBits + 7 <= 0)
+ return;
+
+ pixBytes = (nComps * nBits + 7) >> 3;
+@@ -1247,8 +1247,7 @@
+ endOfLine = endOfLineA;
+ byteAlign = byteAlignA;
+ columns = columnsA;
+- if (columns < 1 || columns + 2 < 0 || columns + 3 < 0 ||
+- (columns + 2) >= INT_MAX / sizeof(short) || (columns + 3) >= INT_MAX / sizeof(short)) {
++ if (columns < 1 || columns >= INT_MAX / sizeof(short)) {
+ error(-1, "invalid number of columns");
+ exit(1);
+ }
Modified: trunk/packages/koffice/debian/rules
===================================================================
--- trunk/packages/koffice/debian/rules 2006-01-12 10:32:16 UTC (rev 2835)
+++ trunk/packages/koffice/debian/rules 2006-01-12 11:14:46 UTC (rev 2836)
@@ -6,15 +6,6 @@
###
-GCC4_ICES_HERE := arm m68k hppa
-DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-
-ifneq (,$(findstring $(DEB_BUILD_ARCH),$(GCC4_ICES_HERE)))
- export CC=gcc-3.4
- export CPP=cpp-3.4
- export CXX=g++-3.4
-endif
-
PACKAGES_WITH_LIBS := karbon kchart kivio koffice-libs krita kspread kugar
DEB_INSTALL_CHANGELOGS_karbon := karbon/CHANGES
More information about the pkg-kde-commits
mailing list