OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 29-Apr-2004 18:17:54
Branch: OPENPKG_2_0_SOLID Handle: 200404101113591663435
Added files: (Branch: OPENPKG_2_0_SOLID)
openpkg-src/analog analog.patch
openpkg-src/doxygen doxygen.patch
openpkg-src/perl-tk perl-tk.patch
openpkg-src/rrdtool rrdtool.patch
openpkg-src/tetex tetex.patch
Modified files: (Branch: OPENPKG_2_0_SOLID)
openpkg-src/analog analog.spec
openpkg-src/doxygen doxygen.spec
openpkg-src/ghostscript ghostscript.patch ghostscript.spec
openpkg-src/mozilla mozilla.patch mozilla.spec
openpkg-src/pdflib pdflib.patch pdflib.spec
openpkg-src/perl-tk perl-tk.spec
openpkg-src/png png.patch png.spec
openpkg-src/qt qt.patch qt.spec
openpkg-src/rrdtool rrdtool.spec
openpkg-src/tetex tetex.spec
Removed files: (Branch: OPENPKG_2_0_SOLID)
openpkg-src/qt readme.txt
Log:
SA-2004.017-png
Summary:
Revision Changes Path
1.1.2.1 +22 -0 openpkg-src/analog/analog.patch
1.38.2.2 +3 -1 openpkg-src/analog/analog.spec
1.1.2.1 +47 -0 openpkg-src/doxygen/doxygen.patch
1.34.2.2 +3 -1 openpkg-src/doxygen/doxygen.spec
1.5.2.1 +48 -0 openpkg-src/ghostscript/ghostscript.patch
1.53.2.2 +1 -1 openpkg-src/ghostscript/ghostscript.spec
1.7.2.1 +48 -0 openpkg-src/mozilla/mozilla.patch
1.82.2.2 +1 -1 openpkg-src/mozilla/mozilla.spec
1.1.2.1 +48 -0 openpkg-src/pdflib/pdflib.patch
1.26.2.2 +1 -1 openpkg-src/pdflib/pdflib.spec
1.2.2.1 +97 -0 openpkg-src/perl-tk/perl-tk.patch
1.52.2.2 +3 -1 openpkg-src/perl-tk/perl-tk.spec
1.1.12.1 +23 -0 openpkg-src/png/png.patch
1.33.2.2 +1 -1 openpkg-src/png/png.spec
1.1.2.1 +47 -0 openpkg-src/qt/qt.patch
1.100.2.2 +1 -1 openpkg-src/qt/qt.spec
1.7 +0 -181 openpkg-src/qt/readme.txt
1.3.2.1 +47 -0 openpkg-src/rrdtool/rrdtool.patch
1.49.2.2 +3 -1 openpkg-src/rrdtool/rrdtool.spec
1.2.2.1 +47 -0 openpkg-src/tetex/tetex.patch
1.53.2.2 +3 -1 openpkg-src/tetex/tetex.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/analog/analog.patch
============================================================================
$ cvs diff -u -r0 -r1.1.2.1 analog.patch
--- /dev/null 2004-04-29 18:17:48.000000000 +0200
+++ analog.patch 2004-04-29 18:17:48.000000000 +0200
@@ -0,0 +1,22 @@
+Steve G <[EMAIL PROTECTED]>
+Libpng accesses memory that is out of bounds when creating an error message
+
+Index: pngerror.c
+--- src/libpng/pngerror.c.orig 2002-10-03 13:32:27.000000000 +0200
++++ src/libpng/pngerror.c 2004-04-28 13:24:22.000000000 +0200
+@@ -135,10 +135,13 @@
+ buffer[iout] = 0;
+ else
+ {
++ png_size_t len;
++ if ((len = png_strlen(message)) > 63)
++ len = 63;
+ buffer[iout++] = ':';
+ buffer[iout++] = ' ';
+- png_memcpy(buffer+iout, message, 64);
+- buffer[iout+63] = 0;
++ png_memcpy(buffer+iout, message, len);
++ buffer[iout+len] = 0;
+ }
+ }
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/analog/analog.spec
============================================================================
$ cvs diff -u -r1.38.2.1 -r1.38.2.2 analog.spec
--- openpkg-src/analog/analog.spec 18 Feb 2004 14:48:13 -0000 1.38.2.1
+++ openpkg-src/analog/analog.spec 29 Apr 2004 16:17:48 -0000 1.38.2.2
@@ -34,10 +34,11 @@
Group: Web
License: GPL
Version: 5.32
-Release: 2.0.0
+Release: 2.0.1
# list of sources
Source0: http://www.analog.cx/analog-%{version}.tar.gz
+Patch0: analog.patch
# build information
Prefix: %{l_prefix}
@@ -62,6 +63,7 @@
%prep
%setup -q
+ %patch
%build
cd src
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/doxygen/doxygen.patch
============================================================================
$ cvs diff -u -r0 -r1.1.2.1 doxygen.patch
--- /dev/null 2004-04-29 18:17:48.000000000 +0200
+++ doxygen.patch 2004-04-29 18:17:49.000000000 +0200
@@ -0,0 +1,47 @@
+--- libpng/pngrtran.c.orig Wed Oct 2 20:20:24 2002
++++ libpng/pngrtran.c Wed Jan 15 11:30:23 2003
+@@ -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);
+
+Steve G <[EMAIL PROTECTED]>
+Libpng accesses memory that is out of bounds when creating an error message
+
+Index: pngerror.c
+--- libpng/pngerror.c.orig 2002-10-03 13:32:27.000000000 +0200
++++ libpng/pngerror.c 2004-04-28 13:24:22.000000000 +0200
+@@ -135,10 +135,13 @@
+ buffer[iout] = 0;
+ else
+ {
++ png_size_t len;
++ if ((len = png_strlen(message)) > 63)
++ len = 63;
+ buffer[iout++] = ':';
+ buffer[iout++] = ' ';
+- png_memcpy(buffer+iout, message, 64);
+- buffer[iout+63] = 0;
++ png_memcpy(buffer+iout, message, len);
++ buffer[iout+len] = 0;
+ }
+ }
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/doxygen/doxygen.spec
============================================================================
$ cvs diff -u -r1.34.2.1 -r1.34.2.2 doxygen.spec
--- openpkg-src/doxygen/doxygen.spec 18 Feb 2004 14:48:54 -0000 1.34.2.1
+++ openpkg-src/doxygen/doxygen.spec 29 Apr 2004 16:17:48 -0000 1.34.2.2
@@ -34,10 +34,11 @@
Group: Text
License: GPL
Version: 1.3.6
-Release: 2.0.0
+Release: 2.0.1
# list of sources
Source0: ftp://ftp.stack.nl/pub/users/dimitri/doxygen-%{version}.src.tar.gz
+Patch0: doxygen.patch
# build information
Prefix: %{l_prefix}
@@ -59,6 +60,7 @@
%prep
%setup -q
+ %patch
%build
opt=""
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ghostscript/ghostscript.patch
============================================================================
$ cvs diff -u -r1.5 -r1.5.2.1 ghostscript.patch
--- openpkg-src/ghostscript/ghostscript.patch 3 Jan 2004 09:08:22 -0000 1.5
+++ openpkg-src/ghostscript/ghostscript.patch 29 Apr 2004 16:17:49 -0000 1.5.2.1
@@ -48,3 +48,51 @@
zlibd_ = $(zlibd1_) $(zlibd2_)
$(ZGEN)zlibd_0.dev : $(ZLIB_MAK) $(ECHOGS_XE) $(ZGEN)zlibc.dev $(zlibd_)
$(SETMOD) $(ZGEN)zlibd_0 $(zlibd1_)
+
+--- ../libpng-1.2.5/pngrtran.c.orig Wed Oct 2 20:20:24 2002
++++ ../libpng-1.2.5/pngrtran.c Wed Jan 15 11:30:23 2003
+@@ -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);
+
+Steve G <[EMAIL PROTECTED]>
+Libpng accesses memory that is out of bounds when creating an error message
+
+Index: pngerror.c
+--- ../libpng-1.2.5/pngerror.c.orig 2002-10-03 13:32:27.000000000 +0200
++++ ../libpng-1.2.5/pngerror.c 2004-04-28 13:24:22.000000000 +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/ghostscript/ghostscript.spec
============================================================================
$ cvs diff -u -r1.53.2.1 -r1.53.2.2 ghostscript.spec
--- openpkg-src/ghostscript/ghostscript.spec 18 Feb 2004 14:49:11 -0000
1.53.2.1
+++ openpkg-src/ghostscript/ghostscript.spec 29 Apr 2004 16:17:49 -0000
1.53.2.2
@@ -43,7 +43,7 @@
Group: Graphics
License: Aladdin
Version: %{V_real}
-Release: 2.0.0
+Release: 2.0.1
# package options
%option with_x11 yes
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mozilla/mozilla.patch
============================================================================
$ cvs diff -u -r1.7 -r1.7.2.1 mozilla.patch
--- openpkg-src/mozilla/mozilla.patch 17 Oct 2003 12:36:37 -0000 1.7
+++ openpkg-src/mozilla/mozilla.patch 29 Apr 2004 16:17:50 -0000 1.7.2.1
@@ -51,3 +51,51 @@
#endif
fd = pt_SetMethods(osfd, ftype, PR_FALSE, PR_FALSE);
if (fd == NULL) close(osfd);
+
+--- modules/libimg/png/pngrtran.c.orig Wed Oct 2 20:20:24 2002
++++ modules/libimg/png/pngrtran.c Wed Jan 15 11:30:23 2003
+@@ -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);
+
+Steve G <[EMAIL PROTECTED]>
+Libpng accesses memory that is out of bounds when creating an error message
+
+Index: pngerror.c
+--- modules/libimg/png/pngerror.c.orig 2002-10-03 13:32:27.000000000 +0200
++++ modules/libimg/png/pngerror.c 2004-04-28 13:24:22.000000000 +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/mozilla/mozilla.spec
============================================================================
$ cvs diff -u -r1.82.2.1 -r1.82.2.2 mozilla.spec
--- openpkg-src/mozilla/mozilla.spec 18 Feb 2004 14:50:18 -0000 1.82.2.1
+++ openpkg-src/mozilla/mozilla.spec 29 Apr 2004 16:17:50 -0000 1.82.2.2
@@ -34,7 +34,7 @@
Group: Web
License: MPL
Version: 1.6
-Release: 2.0.0
+Release: 2.0.1
# package options
%option with_optimize yes
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/pdflib/pdflib.patch
============================================================================
$ cvs diff -u -r1.1 -r1.1.2.1 pdflib.patch
--- openpkg-src/pdflib/pdflib.patch 12 Feb 2004 08:10:48 -0000 1.1
+++ openpkg-src/pdflib/pdflib.patch 29 Apr 2004 16:17:51 -0000 1.1.2.1
@@ -10,3 +10,51 @@
@-if test "$(WITH_SHARED)" = "yes"; then \
$(LIBTOOL) -n --finish $(libdir);\
else\
+
+--- libs/png/pngrtran.c.orig Wed Oct 2 20:20:24 2002
++++ libs/png/pngrtran.c Wed Jan 15 11:30:23 2003
+@@ -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);
+
+Steve G <[EMAIL PROTECTED]>
+Libpng accesses memory that is out of bounds when creating an error message
+
+Index: pngerror.c
+--- libs/png/pngerror.c.orig 2002-10-03 13:32:27.000000000 +0200
++++ libs/png/pngerror.c 2004-04-28 13:24:22.000000000 +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/pdflib/pdflib.spec
============================================================================
$ cvs diff -u -r1.26.2.1 -r1.26.2.2 pdflib.spec
--- openpkg-src/pdflib/pdflib.spec 18 Feb 2004 14:50:45 -0000 1.26.2.1
+++ openpkg-src/pdflib/pdflib.spec 29 Apr 2004 16:17:51 -0000 1.26.2.2
@@ -38,7 +38,7 @@
Group: Graphics
License: PDFlib
Version: %{V_long}
-Release: 2.0.0
+Release: 2.0.1
# list of sources
Source0:
http://www.pdflib.com/products/pdflib/download/%{V_comp}src/PDFlib-Lite-%{V_long}-Unix-src.tar.gz
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/perl-tk/perl-tk.patch
============================================================================
$ cvs diff -u -r0 -r1.2.2.1 perl-tk.patch
--- /dev/null 2004-04-29 18:17:51.000000000 +0200
+++ perl-tk.patch 2004-04-29 18:17:51.000000000 +0200
@@ -0,0 +1,97 @@
+--- Tk-804.025_beta14/PNG/libpng/pngrtran.c.orig Wed Oct 2 20:20:24 2002
++++ Tk-804.025_beta14/PNG/libpng/pngrtran.c Wed Jan 15 11:30:23 2003
+@@ -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);
+
+Steve G <[EMAIL PROTECTED]>
+Libpng accesses memory that is out of bounds when creating an error message
+
+Index: pngerror.c
+--- Tk-804.025_beta14/PNG/libpng/pngerror.c.orig 2002-10-03 13:32:27.000000000
+0200
++++ Tk-804.025_beta14/PNG/libpng/pngerror.c 2004-04-28 13:24:22.000000000 +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;
+ }
+ }
+
+--- Tk-PNG-2.005/libpng/pngrtran.c.orig Wed Oct 2 20:20:24 2002
++++ Tk-PNG-2.005/libpng/pngrtran.c Wed Jan 15 11:30:23 2003
+@@ -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);
+
+Steve G <[EMAIL PROTECTED]>
+Libpng accesses memory that is out of bounds when creating an error message
+
+Index: pngerror.c
+--- Tk-PNG-2.005/libpng/pngerror.c.orig 2004-04-29 15:33:33.000000000 +0200
++++ Tk-PNG-2.005/libpng/pngerror.c 2004-04-29 15:35:46.000000000 +0200
+@@ -81,11 +81,15 @@
+
+ if (message == NULL)
+ buffer[iout] = 0;
+- else {
++ else
++ {
++ png_size_t len;
++ if ((len = png_strlen(message)) > 63)
++ len = 63;
+ buffer[iout++] = ':';
+ buffer[iout++] = ' ';
+- png_memcpy(buffer+iout, message, 64);
+- buffer[iout+63] = 0;
++ png_memcpy(buffer+iout, message, len);
++ buffer[iout+len] = 0;
+ }
+ }
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/perl-tk/perl-tk.spec
============================================================================
$ cvs diff -u -r1.52.2.1 -r1.52.2.2 perl-tk.spec
--- openpkg-src/perl-tk/perl-tk.spec 18 Feb 2004 14:51:01 -0000 1.52.2.1
+++ openpkg-src/perl-tk/perl-tk.spec 29 Apr 2004 16:17:51 -0000 1.52.2.2
@@ -67,7 +67,7 @@
Group: Language
License: GPL/Artistic
Version: %{V_perl}
-Release: 2.0.0
+Release: 2.0.1
# list of sources
Source0: http://www.cpan.org/modules/by-module/Tk/Tk-%{V_tk}.tar.gz
@@ -100,6 +100,7 @@
Source27:
http://www.cpan.org/modules/by-module/Tk/Tk-TreeGraph-%{V_tk_treegraph}.tar.gz
Source28:
http://www.cpan.org/modules/by-module/Tk/Tk-Workspace-%{V_tk_workspace}.tar.gz
Source29:
http://www.cpan.org/modules/by-module/Tk/Tk-WorldCanvas-%{V_tk_worldcanvas}.tar.gz
+Patch0: perl-tk.patch
# build information
Prefix: %{l_prefix}
@@ -320,6 +321,7 @@
%setup -q -T -D -a 27
%setup -q -T -D -a 28
%setup -q -T -D -a 29
+ %patch
%build
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/png/png.patch
============================================================================
$ cvs diff -u -r1.1 -r1.1.12.1 png.patch
--- openpkg-src/png/png.patch 15 Jan 2003 13:50:46 -0000 1.1
+++ openpkg-src/png/png.patch 29 Apr 2004 16:17:52 -0000 1.1.12.1
@@ -22,3 +22,26 @@
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
+--- pngerror.c.orig 2002-10-03 13:32:27.000000000 +0200
++++ pngerror.c 2004-04-28 13:24:22.000000000 +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/png/png.spec
============================================================================
$ cvs diff -u -r1.33.2.1 -r1.33.2.2 png.spec
--- openpkg-src/png/png.spec 18 Feb 2004 14:51:10 -0000 1.33.2.1
+++ openpkg-src/png/png.spec 29 Apr 2004 16:17:52 -0000 1.33.2.2
@@ -34,7 +34,7 @@
Group: Graphics
License: BSD
Version: 1.2.5
-Release: 2.0.0
+Release: 2.0.1
# list of sources
Source0:
http://osdn.dl.sourceforge.net/sourceforge/libpng/libpng-%{version}.tar.gz
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/qt/qt.patch
============================================================================
$ cvs diff -u -r1.1 -r1.1.2.1 qt.patch
--- openpkg-src/qt/qt.patch 20 Nov 2003 12:07:44 -0000 1.1
+++ openpkg-src/qt/qt.patch 29 Apr 2004 16:17:52 -0000 1.1.2.1
@@ -66,3 +66,50 @@
fi
fi
+--- DUMMY/src/3rdparty/libpng/pngrtran.c.orig Wed Oct 2 20:20:24 2002
++++ DUMMY/src/3rdparty/libpng/pngrtran.c Wed Jan 15 11:30:23 2003
+@@ -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);
+
+Steve G <[EMAIL PROTECTED]>
+Libpng accesses memory that is out of bounds when creating an error message
+
+Index: pngerror.c
+--- DUMMY/src/3rdparty/libpng/pngerror.c.orig 2002-10-03 13:32:27.000000000
+0200
++++ DUMMY/src/3rdparty/libpng/pngerror.c 2004-04-28 13:24:22.000000000 +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.100.2.1 -r1.100.2.2 qt.spec
--- openpkg-src/qt/qt.spec 18 Feb 2004 14:51:20 -0000 1.100.2.1
+++ openpkg-src/qt/qt.spec 29 Apr 2004 16:17:52 -0000 1.100.2.2
@@ -34,7 +34,7 @@
Group: XWindow
License: GPL
Version: 3.2.3
-Release: 2.0.0
+Release: 2.0.1
# package library options (each 'yes' builds more libraries)
%option with_shared no
@@ .
rm -f openpkg-src/qt/readme.txt <<'@@ .'
Index: openpkg-src/qt/readme.txt
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/rrdtool/rrdtool.patch
============================================================================
$ cvs diff -u -r0 -r1.3.2.1 rrdtool.patch
--- /dev/null 2004-04-29 18:17:54.000000000 +0200
+++ rrdtool.patch 2004-04-29 18:17:54.000000000 +0200
@@ -0,0 +1,47 @@
+--- libpng-1.0.9/pngrtran.c.orig Wed Oct 2 20:20:24 2002
++++ libpng-1.0.9/pngrtran.c Wed Jan 15 11:30:23 2003
+@@ -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);
+
+Steve G <[EMAIL PROTECTED]>
+Libpng accesses memory that is out of bounds when creating an error message
+
+Index: pngerror.c
+--- libpng-1.0.9/pngerror.c.orig 2002-10-03 13:32:27.000000000 +0200
++++ libpng-1.0.9/pngerror.c 2004-04-28 13:24:22.000000000 +0200
+@@ -135,10 +135,13 @@
+ buffer[iout] = 0;
+ else
+ {
++ png_size_t len;
++ if ((len = png_strlen(message)) > 63)
++ len = 63;
+ buffer[iout++] = ':';
+ buffer[iout++] = ' ';
+- png_memcpy(buffer+iout, message, 64);
+- buffer[iout+63] = 0;
++ png_memcpy(buffer+iout, message, len);
++ buffer[iout+len] = 0;
+ }
+ }
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/rrdtool/rrdtool.spec
============================================================================
$ cvs diff -u -r1.49.2.1 -r1.49.2.2 rrdtool.spec
--- openpkg-src/rrdtool/rrdtool.spec 18 Feb 2004 14:51:29 -0000 1.49.2.1
+++ openpkg-src/rrdtool/rrdtool.spec 29 Apr 2004 16:17:53 -0000 1.49.2.2
@@ -34,10 +34,11 @@
Group: Database
License: LGPL
Version: 1.0.46
-Release: 2.0.0
+Release: 2.0.1
# list of sources
Source0:
http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/rrdtool-%{version}.tar.gz
+Patch0: rrdtool.patch
# build information
Prefix: %{l_prefix}
@@ -66,6 +67,7 @@
%prep
%setup -q
+ %patch
%build
# configure package
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/tetex/tetex.patch
============================================================================
$ cvs diff -u -r0 -r1.2.2.1 tetex.patch
--- /dev/null 2004-04-29 18:17:54.000000000 +0200
+++ tetex.patch 2004-04-29 18:17:54.000000000 +0200
@@ -0,0 +1,47 @@
+--- libs/libpng/pngrtran.c.orig Wed Oct 2 20:20:24 2002
++++ libs/libpng/pngrtran.c Wed Jan 15 11:30:23 2003
+@@ -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);
+
+Steve G <[EMAIL PROTECTED]>
+Libpng accesses memory that is out of bounds when creating an error message
+
+Index: pngerror.c
+--- libs/libpng/pngerror.c.orig 2002-10-03 13:32:27.000000000 +0200
++++ libs/libpng/pngerror.c 2004-04-28 13:24:22.000000000 +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/tetex/tetex.spec
============================================================================
$ cvs diff -u -r1.53.2.1 -r1.53.2.2 tetex.spec
--- openpkg-src/tetex/tetex.spec 18 Feb 2004 14:52:02 -0000 1.53.2.1
+++ openpkg-src/tetex/tetex.spec 29 Apr 2004 16:17:54 -0000 1.53.2.2
@@ -39,7 +39,7 @@
Group: Text
License: GPL
Version: %{V_src}
-Release: 2.0.0
+Release: 2.0.1
# package options
%option with_x11 no
@@ -49,6 +49,7 @@
Source1:
ftp://cam.ctan.org/tex-archive/systems/unix/teTeX/%{V_base}/distrib/tetex-texmf-%{V_texmf}.tar.gz
Source2: http://www.tei-c.org.uk/Software/passivetex/passivetex.zip
Source3: ftp://ftp.tex.ac.uk/tex-archive/macros/xmltex/base.zip
+Patch0: tetex.patch
# build information
Prefix: %{l_prefix}
@@ -89,6 +90,7 @@
%prep
%setup -q -n tetex-src-%{V_src}
+ %patch
# teTeX requires the texmf stuff to be already in place
# for building and installing the source parts.
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
