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: 29-Jun-2004 12:08:15
Branch: HEAD Handle: -NONE-
Modified files:
openpkg-src/mozilla mozilla.patch mozilla.spec
Log:
remove PNG fixes because they are not used due to the fact that we are
building and linking against the external PNG library
Summary:
Revision Changes Path
1.11 +0 -49 openpkg-src/mozilla/mozilla.patch
1.88 +1 -1 openpkg-src/mozilla/mozilla.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mozilla/mozilla.patch
============================================================================
$ cvs diff -u -r1.10 -r1.11 mozilla.patch
--- openpkg-src/mozilla/mozilla.patch 21 Jun 2004 15:50:52 -0000 1.10
+++ openpkg-src/mozilla/mozilla.patch 29 Jun 2004 10:08:14 -0000 1.11
@@ -51,52 +51,3 @@
#endif
fd = pt_SetMethods(osfd, ftype, PR_FALSE, PR_FALSE);
if (fd == NULL) close(osfd);
-
-Index: modules/libimg/png/pngrtran.c
---- 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: modules/libimg/png/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_strncpy(buffer+iout, error_message, 63);
-- buffer[iout+63] = 0;
-+ png_strncpy(buffer+iout, error_message, len);
-+ buffer[iout+len] = 0;
- }
- }
-
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mozilla/mozilla.spec
============================================================================
$ cvs diff -u -r1.87 -r1.88 mozilla.spec
--- openpkg-src/mozilla/mozilla.spec 22 Jun 2004 12:37:22 -0000 1.87
+++ openpkg-src/mozilla/mozilla.spec 29 Jun 2004 10:08:14 -0000 1.88
@@ -34,7 +34,7 @@
Group: Web
License: MPL
Version: 1.7
-Release: 20040622
+Release: 20040629
# package options
%option with_optimize yes
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
