[CVS] OpenPKG: openpkg-src/kde-qt/ kde-qt.patch kde-qt.spec
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: RevisionChanges 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 - 1.5 +++ openpkg-src/kde-qt/kde-qt.patch 15 Mar 2006 21:16:44 - 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 -+++ configure2004-08-11 16:13:39 +0200 -@@ -1783,21 +1783,6 @@ +--- configure.orig 2006-03-08 13:11:24 +0100 configure2006-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.h2006-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_PALETTE1 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.h2004-08-11 16:18:06 +0200 +--- src/3rdparty/libpng/pngconf.h.orig 2004-09-03 20:37:07 +0200 src/3rdparty/libpng/pngconf.h2006-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[i
[CVS] OpenPKG: openpkg-src/kde-qt/ kde-qt.patch kde-qt.spec
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: 06-Mar-2005 19:32:41
Branch: HEAD Handle: 2005030618324100
Modified files:
openpkg-src/kde-qt kde-qt.patch kde-qt.spec
Log:
upgrading package: kde-qt 3.3.3 -> 3.3.4
Summary:
RevisionChanges Path
1.5 +4 -346openpkg-src/kde-qt/kde-qt.patch
1.19+2 -2 openpkg-src/kde-qt/kde-qt.spec
patch -p0 <<'@@ .'
Index: openpkg-src/kde-qt/kde-qt.patch
$ cvs diff -u -r1.4 -r1.5 kde-qt.patch
--- openpkg-src/kde-qt/kde-qt.patch 2 Oct 2004 08:11:29 - 1.4
+++ openpkg-src/kde-qt/kde-qt.patch 6 Mar 2005 18:32:41 - 1.5
@@ -2,7 +2,7 @@
diff -Nau configure.orig configure
--- configure.orig 2004-06-14 11:18:55 +0200
+++ configure2004-08-11 16:13:39 +0200
-@@ -1782,21 +1782,6 @@
+@@ -1783,21 +1783,6 @@
CFG_FREETYPE=yes
fi
fi
@@ -24,7 +24,7 @@
# auto-detect Session Management support
if [ "$CFG_SM" = "auto" ]; then
if $x11tests/sm.test $XQMAKESPEC $OPT_VERBOSE $L_FLAGS $I_FLAGS; then
-@@ -2926,6 +2911,21 @@
+@@ -2927,6 +2912,21 @@
if [ "$CFG_XKB" = "yes" ]; then
QMAKE_CONFIG="$QMAKE_CONFIG xkb"
fi
@@ -96,61 +96,13 @@
+ len = 63;
buffer[iout++] = ':';
buffer[iout++] = ' ';
-- png_memcpy(buffer+iout, error_message, 64);
+- png_strncpy(buffer+iout, error_message, 63);
- buffer[iout+63] = 0;
-+ png_memcpy(buffer+iout, error_message, len);
++ png_strncpy(buffer+iout, error_message, len);
+ buffer[iout+len] = 0;
}
}
-Index: src/3rdparty/libpng/pngrtran.c
-diff -Nau src/3rdparty/libpng/pngrtran.c.orig src/3rdparty/libpng/pngrtran.c
src/3rdparty/libpng/pngrtran.c.orig 2003-05-27 17:19:23 +0200
-+++ src/3rdparty/libpng/pngrtran.c 2004-08-11 16:26:04 +0200
-@@ -1889,8 +1889,8 @@
- /* This changes the data from GG to GGXX */
- if (flags & PNG_FLAG_FILLER_AFTER)
- {
--png_bytep sp = row + (png_size_t)row_width;
--png_bytep dp = sp + (png_size_t)row_width;
-+png_bytep sp = row + (png_size_t)row_width * 2;
-+png_bytep dp = sp + (png_size_t)row_width * 2;
- for (i = 1; i < row_width; i++)
- {
-*(--dp) = hi_filler;
-@@ -1907,8 +1907,8 @@
- /* This changes the data from GG to XXGG */
- else
- {
--png_bytep sp = row + (png_size_t)row_width;
--png_bytep dp = sp + (png_size_t)row_width;
-+png_bytep sp = row + (png_size_t)row_width * 2;
-+png_bytep dp = sp + (png_size_t)row_width * 2;
- for (i = 0; i < row_width; i++)
- {
-*(--dp) = *(--sp);
-@@ -1965,8 +1965,8 @@
- /* This changes the data from RRGGBB to RRGGBBXX */
- if (flags & PNG_FLAG_FILLER_AFTER)
- {
--png_bytep sp = row + (png_size_t)row_width * 3;
--png_bytep dp = sp + (png_size_t)row_width;
-+png_bytep sp = row + (png_size_t)row_width * 6;
-+png_bytep dp = sp + (png_size_t)row_width * 2;
- for (i = 1; i < row_width; i++)
- {
-*(--dp) = hi_filler;
-@@ -1987,8 +1987,8 @@
- /* This changes the data from RRGGBB to XXRRGGBB */
- else
- {
--png_bytep sp = row + (png_size_t)row_width * 3;
--png_bytep dp = sp + (png_size_t)row_width;
-+png_bytep sp = row + (png_size_t)row_width * 6;
-+png_bytep dp = sp + (png_size_t)row_width * 2;
- for (i = 0; i < row_width; i++)
- {
-*(--dp) = *(--sp);
http://www.graphicsmagick.org/libpng/beta/patches/INFO.txt
@@ -174,300 +126,6 @@
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/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:29:37 +0200
-+++ src/3rdparty/libpng/pngrutil.c 2004-08-11 16:30:11 +0200
-@@ -1241,7 +1241,8 @@
- /* Should be an error, but we can cope with it */
- png_warning(png_ptr, "Missing PLTE before tRNS");
- }
-- if (len
[CVS] OpenPKG: openpkg-src/kde-qt/ kde-qt.patch kde-qt.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 02-Oct-2004 10:11:30 Branch: HEAD Handle: 2004100209112900 Modified files: openpkg-src/kde-qt kde-qt.patch kde-qt.spec Log: upgrading package: kde-qt 3.2.3 -> 3.3.3 Summary: RevisionChanges Path 1.4 +151 -67openpkg-src/kde-qt/kde-qt.patch 1.16+2 -2 openpkg-src/kde-qt/kde-qt.spec patch -p0 <<'@@ .' Index: openpkg-src/kde-qt/kde-qt.patch $ cvs diff -u -r1.3 -r1.4 kde-qt.patch --- openpkg-src/kde-qt/kde-qt.patch 4 Aug 2004 14:01:51 - 1.3 +++ openpkg-src/kde-qt/kde-qt.patch 2 Oct 2004 08:11:29 - 1.4 @@ -1,6 +1,77 @@ +Index: configure +diff -Nau configure.orig configure +--- configure.orig 2004-06-14 11:18:55 +0200 configure2004-08-11 16:13:39 +0200 +@@ -1782,21 +1782,6 @@ + CFG_FREETYPE=yes + fi + fi +-# add freetype2 include path +-if [ "$CFG_FREETYPE" = "yes" ] && [ -f $outpath/config.tests/x11/xft.inc ];then +-QMAKE_VARS="$QMAKE_VARS \"INCLUDEPATH+=`cat $outpath/config.tests/x11/xft.inc`\"" +-fi +-rm -f $outpath/config.tests/x11/xft.inc +-# add Xft specific libraries +-if [ "$CFG_FREETYPE" = "yes" ] && [ -f $outpath/config.tests/x11/xft.lib ]; then +-QMAKE_VARS="$QMAKE_VARS \"QMAKE_LIBS_X11=`cat $outpath/config.tests/x11/xft.lib` \$\$QMAKE_LIBS_X11\"" +-fi +-rm -f $outpath/config.tests/x11/xft.lib +-# add Xft specific config options +-if [ "$CFG_FREETYPE" = "yes" ] && [ -f $outpath/config.tests/x11/xft.cfg ]; then +-QMAKE_CONFIG="$QMAKE_CONFIG `cat $outpath/config.tests/x11/xft.cfg`" +-fi +-rm -f $outpath/config.tests/x11/xft.cfg + # auto-detect Session Management support + if [ "$CFG_SM" = "auto" ]; then + if $x11tests/sm.test $XQMAKESPEC $OPT_VERBOSE $L_FLAGS $I_FLAGS; then +@@ -2926,6 +2911,21 @@ + if [ "$CFG_XKB" = "yes" ]; then + QMAKE_CONFIG="$QMAKE_CONFIG xkb" + fi ++# add freetype2 include path ++if [ "$CFG_FREETYPE" = "yes" ] && [ -f $outpath/config.tests/x11/xft.inc ];then ++QMAKE_VARS="$QMAKE_VARS \"INCLUDEPATH+=`cat $outpath/config.tests/x11/xft.inc`\"" ++fi ++rm -f $outpath/config.tests/x11/xft.inc ++# add Xft specific libraries ++if [ "$CFG_FREETYPE" = "yes" ] && [ -f $outpath/config.tests/x11/xft.lib ]; then ++QMAKE_VARS="$QMAKE_VARS \"QMAKE_LIBS_X11=`cat $outpath/config.tests/x11/xft.lib` \$\$QMAKE_LIBS_X11\"" ++fi ++rm -f $outpath/config.tests/x11/xft.lib ++# add Xft specific config options ++if [ "$CFG_FREETYPE" = "yes" ] && [ -f $outpath/config.tests/x11/xft.cfg ]; then ++QMAKE_CONFIG="$QMAKE_CONFIG `cat $outpath/config.tests/x11/xft.cfg`" ++fi ++rm -f $outpath/config.tests/x11/xft.cfg + 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/pngconf.h src/3rdparty/libpng/pngconf.h.orig 2003-05-13 09:08:31 +0200 -+++ src/3rdparty/libpng/pngconf.h2004-07-02 09:03:26 +0200 +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.h2004-08-11 16:18:06 +0200 @@ -251,10 +251,6 @@ # define PNG_SAVE_BSD_SOURCE # undef _BSD_SOURCE @@ -13,8 +84,9 @@ /* include setjmp.h for error handling */ Index: src/3rdparty/libpng/pngerror.c src/3rdparty/libpng/pngerror.c.orig 2003-05-13 09:08:31 +0200 -+++ src/3rdparty/libpng/pngerror.c 2004-07-02 09:03:26 +0200
[CVS] OpenPKG: openpkg-src/kde-qt/ kde-qt.patch kde-qt.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Torsten Homeyer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 02-Jul-2004 09:20:25
Branch: HEAD Handle: -NONE-
Modified files:
openpkg-src/kde-qt kde-qt.patch kde-qt.spec
Log:
revoke last changes and added Security Fix (CAN-2002-1363) for png
Summary:
RevisionChanges Path
1.2 +58 -25 openpkg-src/kde-qt/kde-qt.patch
1.13+4 -5 openpkg-src/kde-qt/kde-qt.spec
patch -p0 <<'@@ .'
Index: openpkg-src/kde-qt/kde-qt.patch
$ cvs diff -u -r1.1 -r1.2 kde-qt.patch
--- openpkg-src/kde-qt/kde-qt.patch 29 Apr 2004 15:06:55 - 1.1
+++ openpkg-src/kde-qt/kde-qt.patch 2 Jul 2004 07:20:25 - 1.2
@@ -1,5 +1,61 @@
src/3rdparty/libpng/pngrtran.c.orig Wed Oct 2 20:20:24 2002
-+++ src/3rdparty/libpng/pngrtran.c Wed Jan 15 11:30:23 2003
+Index: src/3rdparty/libpng/pngconf.h
+--- src/3rdparty/libpng/pngconf.h.orig 2003-05-13 09:08:31 +0200
src/3rdparty/libpng/pngconf.h2004-07-02 09:03:26 +0200
+@@ -251,10 +251,6 @@
+ # define PNG_SAVE_BSD_SOURCE
+ # undef _BSD_SOURCE
+ #endif
+-#ifdef _SETJMP_H
+- __png.h__ already includes setjmp.h;
+- __dont__ include it again.;
+-#endif
+ # endif /* __linux__ */
+
+/* include setjmp.h for error handling */
+Index: src/3rdparty/libpng/pngerror.c
+--- src/3rdparty/libpng/pngerror.c.orig 2003-05-13 09:08:31 +0200
src/3rdparty/libpng/pngerror.c 2004-07-02 09:03:26 +0200
+@@ -135,10 +135,13 @@
+ buffer[iout] = 0;
+else
+{
++ png_size_t len;
++ if ((len = png_strlen(error_message)) > 63)
++ len = 63;
+ buffer[iout++] = ':';
+ buffer[iout++] = ' ';
+- png_memcpy(buffer+iout, error_message, 64);
+- buffer[iout+63] = 0;
++ png_memcpy(buffer+iout, error_message, len);
++ buffer[iout+len] = 0;
+}
+ }
+
+Index: src/3rdparty/libpng/pngrtran.c
+--- src/3rdparty/libpng/pngrtran.c.orig 2003-05-13 09:08:31 +0200
src/3rdparty/libpng/pngrtran.c 2004-07-02 09:03:26 +0200
+@@ -1889,8 +1889,8 @@
+ /* This changes the data from GG to GGXX */
+ if (flags & PNG_FLAG_FILLER_AFTER)
+ {
+-png_bytep sp = row + (png_size_t)row_width;
+-png_bytep dp = sp + (png_size_t)row_width;
++png_bytep sp = row + (png_size_t)row_width * 2;
++png_bytep dp = sp + (png_size_t)row_width * 2;
+ for (i = 1; i < row_width; i++)
+ {
+*(--dp) = hi_filler;
+@@ -1907,8 +1907,8 @@
+ /* This changes the data from GG to XXGG */
+ else
+ {
+-png_bytep sp = row + (png_size_t)row_width;
+-png_bytep dp = sp + (png_size_t)row_width;
++png_bytep sp = row + (png_size_t)row_width * 2;
++png_bytep dp = sp + (png_size_t)row_width * 2;
+ for (i = 0; i < row_width; i++)
+ {
+*(--dp) = *(--sp);
@@ -1965,8 +1965,8 @@
/* This changes the data from RRGGBB to RRGGBBXX */
if (flags & PNG_FLAG_FILLER_AFTER)
@@ -22,26 +78,3 @@
for (i = 0; i < row_width; i++)
{
*(--dp) = *(--sp);
-
-Steve G <[EMAIL PROTECTED]>
-Libpng accesses memory that is out of bounds when creating an error message
-
-Index: pngerror.c
src/3rdparty/libpng/pngerror.c.orig 2002-10-03 13:32:27.0 +0200
-+++ src/3rdparty/libpng/pngerror.c 2004-04-28 13:24:22.0 +0200
-@@ -135,10 +135,13 @@
- buffer[iout] = 0;
-else
-{
-+ png_size_t len;
-+ if ((len = png_strlen(error_message)) > 63)
-+ len = 63;
- buffer[iout++] = ':';
- buffer[iout++] = ' ';
-- png_memcpy(buffer+iout, error_message, 64);
-- buffer[iout+63] = 0;
-+ png_memcpy(buffer+iout, error_message, len);
-+ buffer[iout+len] = 0;
-}
- }
-
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/kde-qt/kde-qt.spec
$ cvs diff -u -r1.12 -r1.13 kde-qt.spec
--- openpkg-src/kde-qt/kde-qt.spec1 Jul 2004 14:05:22 - 1.12
+++ openpkg-src/kde-qt/kde-qt.spec2 Jul 2004 07:20:25 - 1.13
@@ -34,7 +34,7 @@
Group:KDE
License: GPL
Version: 3.2.3
-Release: 20040701
+Releas
