OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 15-Mar-2006 22:16:44
Branch: HEAD Handle: 2006031521164400
Modified files:
openpkg-src/kde-qt kde-qt.patch kde-qt.spec
Log:
upgrading package: kde-qt 3.3.5 -> 3.3.6
Summary:
Revision Changes Path
1.6 +43 -72 openpkg-src/kde-qt/kde-qt.patch
1.24 +2 -2 openpkg-src/kde-qt/kde-qt.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/kde-qt/kde-qt.patch
============================================================================
$ cvs diff -u -r1.5 -r1.6 kde-qt.patch
--- openpkg-src/kde-qt/kde-qt.patch 6 Mar 2005 18:32:41 -0000 1.5
+++ openpkg-src/kde-qt/kde-qt.patch 15 Mar 2006 21:16:44 -0000 1.6
@@ -1,8 +1,28 @@
+Index: config.tests/x11/xfreetype.test
+--- config.tests/x11/xfreetype.test.orig 2004-08-09 22:16:57 +0200
++++ config.tests/x11/xfreetype.test 2006-03-15 21:01:02 +0100
+@@ -56,7 +56,7 @@
+ XFT=no
+ [ "$VERBOSE" = "yes" ] && echo " Could not find Xft lib anywhere in
$LIBDIRS"
+ fi
+-LIBXFT="-l$F -lfreetype"
++LIBXFT="-l$F -lfontconfig -lexpat -lfreetype"
+
+ # check for X11/Xft/Xft.h
+ XFT_H=
+@@ -90,7 +90,7 @@
+ [ "$VERBOSE" = "yes" ] && echo " Found Xft version
$XFT_MAJOR.$XFT_MINOR.$XFT_REVISION"
+ if [ "$XFT_MAJOR" = "2" ]; then
+ XFT2=yes
+- LIBXFT="$LIBXFT -lfontconfig"
++ LIBXFT="$LIBXFT"
+ fi
+ fi
+
Index: configure
-diff -Nau configure.orig configure
---- configure.orig 2004-06-14 11:18:55 +0200
-+++ configure 2004-08-11 16:13:39 +0200
-@@ -1783,21 +1783,6 @@
+--- configure.orig 2006-03-08 13:11:24 +0100
++++ configure 2006-03-15 21:01:02 +0100
+@@ -1788,21 +1788,6 @@
CFG_FREETYPE=yes
fi
fi
@@ -24,7 +44,7 @@
# auto-detect Session Management support
if [ "$CFG_SM" = "auto" ]; then
if $x11tests/sm.test $XQMAKESPEC $OPT_VERBOSE $L_FLAGS $I_FLAGS; then
-@@ -2927,6 +2912,21 @@
+@@ -2981,6 +2966,21 @@
if [ "$CFG_XKB" = "yes" ]; then
QMAKE_CONFIG="$QMAKE_CONFIG xkb"
fi
@@ -46,32 +66,22 @@
elif [ "$PLATFORM_MAC" = "yes" ]; then
if [ "$CFG_TABLET" = "yes" ]; then
QMAKE_CONFIG="$QMAKE_CONFIG tablet"
-Index: config.test/x11/xfreetype.test
-diff -Nau config.tests/x11/xfreetype.test.orig
config.tests/x11/xfreetype.test
---- config.tests/x11/xfreetype.test.orig 2003-12-08 10:04:06 +0100
-+++ config.tests/x11/xfreetype.test 2004-08-11 16:14:43 +0200
-@@ -56,7 +56,7 @@
- XFT=no
- [ "$VERBOSE" = "yes" ] && echo " Could not find Xft lib anywhere in
$LIBDIRS"
- fi
--LIBXFT="-l$F -lfreetype"
-+LIBXFT="-l$F -lfontconfig -lexpat -lfreetype"
-
- # check for X11/Xft/Xft.h
- XFT_H=
-@@ -90,7 +90,7 @@
- [ "$VERBOSE" = "yes" ] && echo " Found Xft version
$XFT_MAJOR.$XFT_MINOR.$XFT_REVISION"
- if [ "$XFT_MAJOR" = "2" ]; then
- XFT2=yes
-- LIBXFT="$LIBXFT -lfontconfig"
-+ LIBXFT="$LIBXFT"
- fi
- fi
+Index: src/3rdparty/libpng/png.h
+--- src/3rdparty/libpng/png.h.orig 2004-09-03 20:17:23 +0200
++++ src/3rdparty/libpng/png.h 2006-03-15 21:01:02 +0100
+@@ -839,6 +839,9 @@
+ /* PNG_MAX_UINT is deprecated; use PNG_UINT_31_MAX instead. */
+ #define PNG_MAX_UINT PNG_UINT_31_MAX
++/* Constraints on width, height, (2 ^ 24) - 1*/
++#define PNG_MAX_DIMENSION 16777215
++
+ /* These describe the color_type field in png_info. */
+ /* color type masks */
+ #define PNG_COLOR_MASK_PALETTE 1
Index: src/3rdparty/libpng/pngconf.h
-diff -Nau src/3rdparty/libpng/pngconf.h.orig src/3rdparty/libpng/pngconf.h
---- src/3rdparty/libpng/pngconf.h.orig 2003-05-27 17:19:23 +0200
-+++ src/3rdparty/libpng/pngconf.h 2004-08-11 16:18:06 +0200
+--- src/3rdparty/libpng/pngconf.h.orig 2004-09-03 20:37:07 +0200
++++ src/3rdparty/libpng/pngconf.h 2006-03-15 21:01:02 +0100
@@ -251,10 +251,6 @@
# define PNG_SAVE_BSD_SOURCE
# undef _BSD_SOURCE
@@ -84,9 +94,8 @@
/* include setjmp.h for error handling */
Index: src/3rdparty/libpng/pngerror.c
-diff -Nau src/3rdparty/libpng/pngerror.c.orig src/3rdparty/libpng/pngerror.c
---- src/3rdparty/libpng/pngerror.c.orig 2003-05-27 17:19:23 +0200
-+++ src/3rdparty/libpng/pngerror.c 2004-08-11 16:19:27 +0200
+--- src/3rdparty/libpng/pngerror.c.orig 2004-09-03 20:06:36 +0200
++++ src/3rdparty/libpng/pngerror.c 2006-03-15 21:01:02 +0100
@@ -135,10 +135,13 @@
buffer[iout] = 0;
else
@@ -103,47 +112,9 @@
}
}
-
-http://www.graphicsmagick.org/libpng/beta/patches/INFO.txt
-
-> [Problems discovered and fixed by] Chris Evans
->
-> 1) Remotely exploitable stack-based buffer overrun in png_handle_tRNS
(pngrutil.c)
-> 2) Dangerous code in png_handle_sBIT (pngrutil.c)
-CAN-2004-0597
-
-> 3) Possible NULL-pointer crash in png_handle_iCCP (pngrutil.c)
-> this flaw is duplicated in multiple other locations.
-CAN-2004-0598
-
-> 4) Theoretical integer overflow in allocation in png_handle_sPLT
(pngrutil.c)
-> 5) Integer overflow in png_read_png (pngread.c)
-> 6) Integer overflows during progressive reading.
-> 7) Other flaws. [integer overflows]
-CAN-2004-0599
-
-http://www.graphicsmagick.org/libpng/beta/patches/libpng-patch03-trns-chunk-overflow.txt
- Use to patch libpng-1.0.9 through 1.2.5
- This fixes the most dangerous of the newly reported vulnerabilities
-
-Index: src/3rdparty/libpng/png.h
-diff -Nau src/3rdparty/libpng/png.h.orig src/3rdparty/libpng/png.h
---- src/3rdparty/libpng/png.h.orig 2004-08-11 16:31:06 +0200
-+++ src/3rdparty/libpng/png.h 2004-08-11 16:44:14 +0200
-@@ -839,6 +839,9 @@
- /* PNG_MAX_UINT is deprecated; use PNG_UINT_31_MAX instead. */
- #define PNG_MAX_UINT PNG_UINT_31_MAX
-
-+/* Constraints on width, height, (2 ^ 24) - 1*/
-+#define PNG_MAX_DIMENSION 16777215
-+
- /* These describe the color_type field in png_info. */
- /* color type masks */
- #define PNG_COLOR_MASK_PALETTE 1
Index: src/3rdparty/libpng/pngrutil.c
-diff -Nau src/3rdparty/libpng/pngrutil.c.orig src/3rdparty/libpng/pngrutil.c
---- src/3rdparty/libpng/pngrutil.c.orig 2004-08-11 16:42:31 +0200
-+++ src/3rdparty/libpng/pngrutil.c 2004-08-11 16:45:38 +0200
+--- src/3rdparty/libpng/pngrutil.c.orig 2004-09-03 20:34:00 +0200
++++ src/3rdparty/libpng/pngrutil.c 2006-03-15 21:01:03 +0100
@@ -355,7 +355,11 @@
png_crc_finish(png_ptr, 0);
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/kde-qt/kde-qt.spec
============================================================================
$ cvs diff -u -r1.23 -r1.24 kde-qt.spec
--- openpkg-src/kde-qt/kde-qt.spec 1 Jan 2006 13:15:11 -0000 1.23
+++ openpkg-src/kde-qt/kde-qt.spec 15 Mar 2006 21:16:44 -0000 1.24
@@ -32,8 +32,8 @@
Class: EVAL
Group: KDE
License: GPL
-Version: 3.3.5
-Release: 20051014
+Version: 3.3.6
+Release: 20060315
# list of sources
Source0:
ftp://ftp.trolltech.com/pub/qt/source/qt-x11-free-%{version}.tar.bz2
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
