[CVS] OpenPKG: openpkg-src/qt/ qt.patch 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:06:51 Branch: HEAD Handle: 2006031521065000 Modified files: openpkg-src/qt qt.patch qt.spec Log: upgrading package: qt 3.3.5 -> 3.3.6 Summary: RevisionChanges Path 1.15+43 -223openpkg-src/qt/qt.patch 1.125 +2 -2 openpkg-src/qt/qt.spec patch -p0 <<'@@ .' Index: openpkg-src/qt/qt.patch $ cvs diff -u -r1.14 -r1.15 qt.patch --- openpkg-src/qt/qt.patch 27 Sep 2005 11:51:49 - 1.14 +++ openpkg-src/qt/qt.patch 15 Mar 2006 21:06:50 - 1.15 @@ -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[iout] = 0; else @@ -103,47 +112,9 @@
[CVS] OpenPKG: openpkg-src/qt/ qt.patch qt.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 27-Sep-2005 13:51:49
Branch: HEAD Handle: 2005092712514900
Modified files:
openpkg-src/qt qt.patch qt.spec
Log:
make sure fontconfig dependency libiconv is found
Summary:
RevisionChanges Path
1.14+0 -32 openpkg-src/qt/qt.patch
1.122 +3 -2 openpkg-src/qt/qt.spec
patch -p0 <<'@@ .'
Index: openpkg-src/qt/qt.patch
$ cvs diff -u -r1.13 -r1.14 qt.patch
--- openpkg-src/qt/qt.patch 28 Jul 2005 06:36:51 - 1.13
+++ openpkg-src/qt/qt.patch 27 Sep 2005 11:51:49 - 1.14
@@ -346,35 +346,3 @@
next();
break;
}
-Index: src/3rdparty/zlib/inftrees.c
src/3rdparty/zlib/inftrees.c.orig2004-09-15 16:30:06 +0200
-+++ src/3rdparty/zlib/inftrees.c 2005-07-07 11:33:34 +0200
-@@ -134,7 +134,7 @@
- left -= count[len];
- if (left < 0) return -1;/* over-subscribed */
- }
--if (left > 0 && (type == CODES || (codes - count[0] != 1)))
-+if (left > 0 && (type == CODES || max != 1))
- return -1; /* incomplete set */
-
- /* generate offsets into symbol table for each length for sorting */
-Index: src/3rdparty/zlib/inftrees.h
src/3rdparty/zlib/inftrees.h.orig2003-08-11 00:15:50 +0200
-+++ src/3rdparty/zlib/inftrees.h 2005-07-11 08:50:37 +0200
-@@ -36,12 +36,12 @@
- */
-
- /* Maximum size of dynamic tree. The maximum found in a long but non-
-- exhaustive search was 1004 code structures (850 for length/literals
-- and 154 for distances, the latter actually the result of an
-+ exhaustive search was 1444 code structures (852 for length/literals
-+ and 592 for distances, the latter actually the result of an
-exhaustive search). The true maximum is not known, but the value
-below is more than safe. */
--#define ENOUGH 1440
--#define MAXD 154
-+#define ENOUGH 2048
-+#define MAXD 592
-
- /* Type of code to build for inftable() */
- typedef enum {
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/qt/qt.spec
$ cvs diff -u -r1.121 -r1.122 qt.spec
--- openpkg-src/qt/qt.spec28 Jul 2005 06:36:51 - 1.121
+++ openpkg-src/qt/qt.spec27 Sep 2005 11:51:49 - 1.122
@@ -32,8 +32,8 @@
Class:PLUS
Group:XWindow
License: GPL
-Version: 3.3.4
-Release: 20050728
+Version: 3.3.5
+Release: 20050927
# package library options (each 'yes' builds more libraries)
%option with_shared no
@@ -108,6 +108,7 @@
%{l_shtool} subst \
-e 's;freetype2/freetype/;freetype/;g' \
-e 's;freetype2;freetype;g' \
+-e "s;-lfontconfig;`%{l_prefix}/bin/pkg-config --libs fontconfig`;" \
config.tests/x11/xfreetype.test
# repair nonstandard posix thread test macro usage
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/qt/ qt.patch 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: 28-Jul-2005 08:36:51
Branch: HEAD Handle: 2005072807365100
Modified files:
openpkg-src/qt qt.patch qt.spec
Log:
Security Bugfix (OpenPKG-SA-2005.014-zlib; CAN-2005-1849)
Summary:
RevisionChanges Path
1.13+20 -0 openpkg-src/qt/qt.patch
1.121 +1 -1 openpkg-src/qt/qt.spec
patch -p0 <<'@@ .'
Index: openpkg-src/qt/qt.patch
$ cvs diff -u -r1.12 -r1.13 qt.patch
--- openpkg-src/qt/qt.patch 7 Jul 2005 09:35:51 - 1.12
+++ openpkg-src/qt/qt.patch 28 Jul 2005 06:36:51 - 1.13
@@ -358,3 +358,23 @@
return -1; /* incomplete set */
/* generate offsets into symbol table for each length for sorting */
+Index: src/3rdparty/zlib/inftrees.h
+--- src/3rdparty/zlib/inftrees.h.orig2003-08-11 00:15:50 +0200
src/3rdparty/zlib/inftrees.h 2005-07-11 08:50:37 +0200
+@@ -36,12 +36,12 @@
+ */
+
+ /* Maximum size of dynamic tree. The maximum found in a long but non-
+- exhaustive search was 1004 code structures (850 for length/literals
+- and 154 for distances, the latter actually the result of an
++ exhaustive search was 1444 code structures (852 for length/literals
++ and 592 for distances, the latter actually the result of an
+exhaustive search). The true maximum is not known, but the value
+below is more than safe. */
+-#define ENOUGH 1440
+-#define MAXD 154
++#define ENOUGH 2048
++#define MAXD 592
+
+ /* Type of code to build for inftable() */
+ typedef enum {
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/qt/qt.spec
$ cvs diff -u -r1.120 -r1.121 qt.spec
--- openpkg-src/qt/qt.spec7 Jul 2005 09:35:51 - 1.120
+++ openpkg-src/qt/qt.spec28 Jul 2005 06:36:51 - 1.121
@@ -33,7 +33,7 @@
Group:XWindow
License: GPL
Version: 3.3.4
-Release: 20050707
+Release: 20050728
# package library options (each 'yes' builds more libraries)
%option with_shared no
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/qt/ qt.patch 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: 07-Jul-2005 11:35:51
Branch: HEAD Handle: 2005070710355100
Modified files:
openpkg-src/qt qt.patch qt.spec
Log:
Fix zlib security issue (OpenPKG-SA-2005.013, CAN-2005-2096)
Summary:
RevisionChanges Path
1.12+12 -0 openpkg-src/qt/qt.patch
1.120 +2 -2 openpkg-src/qt/qt.spec
patch -p0 <<'@@ .'
Index: openpkg-src/qt/qt.patch
$ cvs diff -u -r1.11 -r1.12 qt.patch
--- openpkg-src/qt/qt.patch 3 May 2005 13:25:54 - 1.11
+++ openpkg-src/qt/qt.patch 7 Jul 2005 09:35:51 - 1.12
@@ -346,3 +346,15 @@
next();
break;
}
+Index: src/3rdparty/zlib/inftrees.c
+--- src/3rdparty/zlib/inftrees.c.orig2004-09-15 16:30:06 +0200
src/3rdparty/zlib/inftrees.c 2005-07-07 11:33:34 +0200
+@@ -134,7 +134,7 @@
+ left -= count[len];
+ if (left < 0) return -1;/* over-subscribed */
+ }
+-if (left > 0 && (type == CODES || (codes - count[0] != 1)))
++if (left > 0 && (type == CODES || max != 1))
+ return -1; /* incomplete set */
+
+ /* generate offsets into symbol table for each length for sorting */
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/qt/qt.spec
$ cvs diff -u -r1.119 -r1.120 qt.spec
--- openpkg-src/qt/qt.spec3 May 2005 13:25:54 - 1.119
+++ openpkg-src/qt/qt.spec7 Jul 2005 09:35:51 - 1.120
@@ -33,7 +33,7 @@
Group:XWindow
License: GPL
Version: 3.3.4
-Release: 20050503
+Release: 20050707
# package library options (each 'yes' builds more libraries)
%option with_shared no
@@ -131,7 +131,7 @@
case "%{l_platform -t}" in
*-freebsd* ) oscomp="freebsd-g++" ;;
*-linux* ) oscomp="linux-g++";;
-*-sunos* ) oscomp="solaris-g++" ;;
+*-sunos* ) oscomp="solaris-g++" ;;
* ) echo "platform %{l_platform -t} not supported" 2>&1; exit 1 ;;
esac
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/qt/ qt.patch qt.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Michael Schloh
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 03-May-2005 15:25:54
Branch: HEAD Handle: 2005050314255400
Modified files:
openpkg-src/qt qt.patch qt.spec
Log:
rename conflicting identifiers in the global C++ namespace
Summary:
RevisionChanges Path
1.11+151 -0 openpkg-src/qt/qt.patch
1.119 +1 -1 openpkg-src/qt/qt.spec
patch -p0 <<'@@ .'
Index: openpkg-src/qt/qt.patch
$ cvs diff -u -r1.10 -r1.11 qt.patch
--- openpkg-src/qt/qt.patch 1 Feb 2005 09:15:37 - 1.10
+++ openpkg-src/qt/qt.patch 3 May 2005 13:25:54 - 1.11
@@ -195,3 +195,154 @@
png_reset_crc(png_ptr);
png_crc_read(png_ptr, png_ptr->chunk_name, 4);
if (png_memcmp(png_ptr->chunk_name, (png_bytep)png_IDAT, 4))
+Index: src/xml/qxml.cpp
+diff -Nau src/xml/qxml.cpp.orig src/xml/qxml.cpp
+--- src/xml/qxml.cpp.orig2005-01-21 18:16:02.0 +0100
src/xml/qxml.cpp 2005-05-03 14:48:42.080658900 +0200
+@@ -5999,38 +5999,38 @@
+ */
+ bool QXmlSimpleReader::parseChoiceSeq()
+ {
+-const signed char Init = 0;
+-const signed char Ws1 = 1; // eat whitespace
+-const signed char CS = 2; // choice or set
+-const signed char Ws2 = 3; // eat whitespace
+-const signed char More = 4; // more cp to read
+-const signed char Name = 5; // read name
+-const signed char Done = 6; //
+-
+-const signed char InpWs= 0; // S
+-const signed char InpOp= 1; // (
+-const signed char InpCp= 2; // )
+-const signed char InpQm= 3; // ?
+-const signed char InpAst = 4; // *
+-const signed char InpPlus = 5; // +
+-const signed char InpPipe = 6; // |
+-const signed char InpComm = 7; // ,
+-const signed char InpUnknown = 8;
++const signed char Qt_Init = 0;
++const signed char Qt_Ws1 = 1; // eat whitespace
++const signed char Qt_CS = 2; // choice or set
++const signed char Qt_Ws2 = 3; // eat whitespace
++const signed char Qt_More = 4; // more cp to read
++const signed char Qt_Name = 5; // read name
++const signed char Qt_Done = 6; //
++
++const signed char Qt_InpWs= 0; // S
++const signed char Qt_InpOp= 1; // (
++const signed char Qt_InpCp= 2; // )
++const signed char Qt_InpQm= 3; // ?
++const signed char Qt_InpAst = 4; // *
++const signed char Qt_InpPlus = 5; // +
++const signed char Qt_InpPipe = 6; // |
++const signed char Qt_InpComm = 7; // ,
++const signed char Qt_InpUnknown = 8;
+
+ static const signed char table[6][9] = {
+ /* InpWs InpOp InpCp InpQm InpAst InpPlus InpPipe InpComm
InpUnknown */
+-{ -1, Ws1, -1,-1,-1, -1, -1, -1, Name
}, // Init
+-{ -1, CS,-1,-1,-1, -1, -1, -1, CS
}, // Ws1
+-{ Ws2,-1,Done, Ws2, Ws2,Ws2, More,More,-1
}, // CS
+-{ -1, -1,Done, -1,-1, -1, More,More,-1
}, // Ws2
+-{ -1, Ws1, -1,-1,-1, -1, -1, -1, Name
}, // More (same as Init)
+-{ Ws2,-1,Done, Ws2, Ws2,Ws2, More,More,-1
} // Name (same as CS)
++{ -1, Qt_Ws1, -1,-1,-1, -1, -1, -1,
Qt_Name }, // Qt_Init
++{ -1, Qt_CS,-1,-1,-1, -1, -1, -1,
Qt_CS}, // Qt_Ws1
++{ Qt_Ws2,-1,Qt_Done, Qt_Ws2, Qt_Ws2,Qt_Ws2, Qt_More,
Qt_More,-1}, // Qt_CS
++{ -1, -1,Qt_Done, -1,-1, -1, Qt_More,Qt_More,
-1}, //Qt_Ws2
++{ -1, Qt_Ws1, -1,-1,-1, -1, -1, -1,
Qt_Name }, // More (same as Qt_Init)
++{ Qt_Ws2,-1,Qt_Done, Qt_Ws2, Qt_Ws2,Qt_Ws2, Qt_More,
Qt_More,-1} // Name (same as Qt_CS)
+ };
+ signed char state;
+ signed char input;
+
+ if ( d->parseStack==0 || d->parseStack->isEmpty() ) {
+-state = Init;
++state = Qt_Init;
[CVS] OpenPKG: openpkg-src/qt/ qt.patch qt.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 01-Feb-2005 10:15:37
Branch: HEAD Handle: 2005020109153700
Modified files:
openpkg-src/qt qt.patch qt.spec
Log:
upgrading package: qt 3.3.3 -> 3.3.4
Summary:
RevisionChanges Path
1.10+4 -346openpkg-src/qt/qt.patch
1.116 +2 -2 openpkg-src/qt/qt.spec
patch -p0 <<'@@ .'
Index: openpkg-src/qt/qt.patch
$ cvs diff -u -r1.9 -r1.10 qt.patch
--- openpkg-src/qt/qt.patch 20 Aug 2004 18:08:50 - 1.9
+++ openpkg-src/qt/qt.patch 1 Feb 2005 09:15:37 - 1.10
@@ -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 (length > (png_uint_32)png_ptr->num_palette)
-+ if (leng
[CVS] OpenPKG: openpkg-src/qt/ qt.patch qt.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Michael Schloh Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 20-Aug-2004 20:08:51 Branch: HEAD Handle: 2004082019085000 Modified files: openpkg-src/qt qt.patch qt.spec Log: add more diff(1) context and correct LIBDIRS substitution pattern Summary: RevisionChanges Path 1.9 +16 -0 openpkg-src/qt/qt.patch 1.113 +2 -2 openpkg-src/qt/qt.spec patch -p0 <<'@@ .' Index: openpkg-src/qt/qt.patch $ cvs diff -u -r1.8 -r1.9 qt.patch --- openpkg-src/qt/qt.patch 11 Aug 2004 15:06:37 - 1.8 +++ openpkg-src/qt/qt.patch 20 Aug 2004 18:08:50 - 1.9 @@ -1,4 +1,5 @@ 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 @@ @@ -46,6 +47,7 @@ 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 @@ @@ -67,6 +69,7 @@ fi 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 @@ -251,10 +251,6 @@ @@ -81,6 +84,7 @@ /* 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 @@ -135,10 +135,13 @@ @@ -100,6 +104,7 @@ } 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 @@ @@ -170,6 +175,7 @@ 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 @@ @@ -189,6 +195,7 @@ and png_get_uint_31(), which are needed by patches 05-08. 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 2003-05-27 17:19:23 +0200 +++ src/3rdparty/libpng/png.h2004-08-11 16:31:06 +0200 @@ -833,7 +833,11 @@ @@ -214,6 +221,7 @@ /* Initialize png_ptr struct for reading, and allocate any other memory. * (old interface - DEPRECATED - use png_create_read_struct instead). 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:32:11 +0200 @@ -38,6 +38,14 @@ @@ -237,6 +245,7 @@ Requires one of libpng-patch04* Index: src/3rdparty/libpng/pngpread.c +diff -Nau src/3rdparty/libpng/pngpread.c.orig src/3rdparty/libpng/pngpread.c --- src/3rdparty/libpng/pngpread.c.orig 2003-05-27 17:19:23 +0200 +++ src/3rdparty/libpng/pngpread.c 2004-08-11 16:34:45 +0200 @@ -208,7 +208,7 @@ @@ -276,6 +285,7 @@ Requires libpng-patch04-* Index: src/3rdparty/libpng/pngpread.c +diff -Nau src/3rdparty/libpng/pngread.c.orig src/3rdparty/libpng/pngread.c --- src/3rdparty/libpng/pngread.c.orig 2003-05-27 17:19:23 +0200 +++ src/3rdparty/libpng/pngread.c2004-08-11 16:36:04 +0200 @@ -384,7 +384,7 @@ @@ -333,6 +343,7 @@ Requires libpng-patch04-* Index: src/3rdparty/libpng/pngread.c +diff -Nau src/3rdparty/libpng/pngread.c.orig src/3rdparty/libpng/pngread.c --- src/3rdparty/libpng/pngread.c.orig 2004-08-11 16:36:04 +0200 +++ src/3rdparty/libpng/pngread.c2004-08-11 16:37:39 +0200 @@ -1290,6 +1290,9 @@ @@ -353,6 +364,7 @@ The "sPLT chunk too long" check from Matthias Clasen (RedHat libpng package m
[CVS] OpenPKG: openpkg-src/qt/ qt.patch qt.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 11-Aug-2004 17:06:38
Branch: HEAD Handle: 2004081116063700
Modified files:
openpkg-src/qt qt.patch qt.spec
Log:
upgrading package: qt 3.3.2 -> 3.3.3
Summary:
RevisionChanges Path
1.8 +71 -71 openpkg-src/qt/qt.patch
1.110 +8 -8 openpkg-src/qt/qt.spec
patch -p0 <<'@@ .'
Index: openpkg-src/qt/qt.patch
$ cvs diff -u -r1.7 -r1.8 qt.patch
--- openpkg-src/qt/qt.patch 4 Aug 2004 14:01:55 - 1.7
+++ openpkg-src/qt/qt.patch 11 Aug 2004 15:06:37 - 1.8
@@ -1,7 +1,7 @@
Index: configure
configure2004-02-11 11:21:42.0 +0100
-+++ configure2004-03-03 12:16:46.847102980 +0100
-@@ -1754,21 +1754,6 @@
+--- 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
@@ -23,7 +23,7 @@
# auto-detect Session Management support
if [ "$CFG_SM" = "auto" ]; then
if $x11tests/sm.test $XQMAKESPEC $OPT_VERBOSE $L_FLAGS $I_FLAGS; then
-@@ -2878,6 +2863,21 @@
+@@ -2926,6 +2911,21 @@
if [ "$CFG_XKB" = "yes" ]; then
QMAKE_CONFIG="$QMAKE_CONFIG xkb"
fi
@@ -45,9 +45,9 @@
elif [ "$PLATFORM_MAC" = "yes" ]; then
if [ "$CFG_TABLET" = "yes" ]; then
QMAKE_CONFIG="$QMAKE_CONFIG tablet"
-Index: config.tests/x11/xfreetype.test
config.tests/x11/xfreetype.test 2004-03-03 10:41:51.522773000 +0100
-+++ config.tests/x11/xfreetype.test 2004-03-03 10:43:42.588911196 +0100
+Index: config.test/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"
@@ -68,7 +68,7 @@
Index: src/3rdparty/libpng/pngconf.h
--- src/3rdparty/libpng/pngconf.h.orig 2003-05-27 17:19:23 +0200
-+++ src/3rdparty/libpng/pngconf.h2004-07-02 09:22:17 +0200
src/3rdparty/libpng/pngconf.h2004-08-11 16:18:06 +0200
@@ -251,10 +251,6 @@
# define PNG_SAVE_BSD_SOURCE
# undef _BSD_SOURCE
@@ -82,7 +82,7 @@
/* include setjmp.h for error handling */
Index: src/3rdparty/libpng/pngerror.c
--- src/3rdparty/libpng/pngerror.c.orig 2003-05-27 17:19:23 +0200
-+++ src/3rdparty/libpng/pngerror.c 2004-07-02 09:22:17 +0200
src/3rdparty/libpng/pngerror.c 2004-08-11 16:19:27 +0200
@@ -135,10 +135,13 @@
buffer[iout] = 0;
else
@@ -101,7 +101,7 @@
Index: src/3rdparty/libpng/pngrtran.c
--- src/3rdparty/libpng/pngrtran.c.orig 2003-05-27 17:19:23 +0200
-+++ src/3rdparty/libpng/pngrtran.c 2004-07-02 09:22:17 +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)
@@ -169,14 +169,14 @@
Use to patch libpng-1.0.9 through 1.2.5
This fixes the most dangerous of the newly reported vulnerabilities
-diff -r -U 3 libpng-1.2.5/pngrutil.c libpng-1.2.5patch03/pngrutil.c
src/3rdparty/libpng/pngrutil.c.orig Thu Oct 3 06:32:30 2002
-+++ src/3rdparty/libpng/pngrutil.c Fri Jul 23 18:54:36 2004
+Index: 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");
}
-- else if (length > (png_uint_32)png_ptr->num_palette)
+- if (length > (png_uint_32)png_ptr->num_palette)
+ if (length > (png_uint_32)png_ptr->num_palette ||
+ length > PNG_MAX_PALETTE_LENGTH)
{
@@ -188,9 +188,9 @@
This patch defines PNG_UINT_31_MAX, PNG_UINT_32_MAX, PNG_SIZE_MAX,
and png_get_uint_31(), which are needed by patches 05-08.
-diff -r -U 3 libpng-1.2.5/png.h libpng-1.2.5patch04/png.h
src/3rdparty/libpng/png.h.orig Thu Oct 3 06:32:26 2002
-+++ src/3rdparty/libpng/png.hFri Jul 23 18:56:27 2004
+Index: src/3rdparty/libpng/png.h
+--- src/3rdparty/libpng/png.h.orig 2003-05-27 17:19:23 +0200
src/3rdparty/libpng/png.h2004-08-11 16:
[CVS] OpenPKG: openpkg-src/qt/ qt.patch 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 10:01:20
Branch: HEAD Handle: -NONE-
Modified files:
openpkg-src/qt qt.patch qt.spec
Log:
added Security Fix (CAN-2002-1363) for png
Summary:
RevisionChanges Path
1.6 +58 -25 openpkg-src/qt/qt.patch
1.108 +1 -1 openpkg-src/qt/qt.spec
patch -p0 <<'@@ .'
Index: openpkg-src/qt/qt.patch
$ cvs diff -u -r1.5 -r1.6 qt.patch
--- openpkg-src/qt/qt.patch 29 Apr 2004 15:06:58 - 1.5
+++ openpkg-src/qt/qt.patch 2 Jul 2004 08:01:19 - 1.6
@@ -66,8 +66,64 @@
fi
fi
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-27 17:19:23 +0200
src/3rdparty/libpng/pngconf.h2004-07-02 09:22:17 +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-27 17:19:23 +0200
src/3rdparty/libpng/pngerror.c 2004-07-02 09:22:17 +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-27 17:19:23 +0200
src/3rdparty/libpng/pngrtran.c 2004-07-02 09:22:17 +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)
@@ -90,26 +146,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/qt/qt.spec
$ cvs diff -u -r1.107 -r1.108 qt.spec
--- openpkg-src/qt/qt.spec15 Jun 2004 21:51:04 - 1.107
+++ openpkg-src/qt/qt.spec2 Jul 2004 08:01:19 - 1.108
@@ -34,7 +34,7 @@
Group:XWindow
License: GPL
Version: 3.3.2
-Release: 20040615
+Release: 20040702
# package library options (each 'yes' builds
[CVS] OpenPKG: openpkg-src/qt/ qt.patch qt.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Michael Schloh Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 28-Apr-2004 17:41:03 Branch: HEAD Handle: 2004042816410300 Modified files: openpkg-src/qt qt.patch qt.spec Log: realign patch hunk against new version 3.3.2 Summary: RevisionChanges Path 1.4 +1 -1 openpkg-src/qt/qt.patch 1.104 +1 -1 openpkg-src/qt/qt.spec patch -p0 <<'@@ .' Index: openpkg-src/qt/qt.patch $ cvs diff -u -r1.3 -r1.4 qt.patch --- openpkg-src/qt/qt.patch 10 Apr 2004 10:13:59 - 1.3 +++ openpkg-src/qt/qt.patch 28 Apr 2004 15:41:03 - 1.4 @@ -23,7 +23,7 @@ # auto-detect Session Management support if [ "$CFG_SM" = "auto" ]; then if $x11tests/sm.test $XQMAKESPEC $OPT_VERBOSE $L_FLAGS $I_FLAGS; then -@@ -2875,6 +2860,21 @@ +@@ -2878,6 +2863,21 @@ if [ "$CFG_XKB" = "yes" ]; then QMAKE_CONFIG="$QMAKE_CONFIG xkb" fi @@ . patch -p0 <<'@@ .' Index: openpkg-src/qt/qt.spec $ cvs diff -u -r1.103 -r1.104 qt.spec --- openpkg-src/qt/qt.spec27 Apr 2004 12:28:58 - 1.103 +++ openpkg-src/qt/qt.spec28 Apr 2004 15:41:03 - 1.104 @@ -34,7 +34,7 @@ Group:XWindow License: GPL Version: 3.3.2 -Release: 20040427 +Release: 20040428 # package library options (each 'yes' builds more libraries) %option with_shared no @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]
