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: 30-Jun-2004 15:04:10
Branch: HEAD Handle: -NONE-
Modified files:
openpkg-src/doxygen doxygen.patch doxygen.spec
Log:
added Security Fix (CAN-2002-1363) for png
Summary:
Revision Changes Path
1.2 +46 -5 openpkg-src/doxygen/doxygen.patch
1.37 +2 -2 openpkg-src/doxygen/doxygen.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/doxygen/doxygen.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 doxygen.patch
--- openpkg-src/doxygen/doxygen.patch 29 Apr 2004 15:06:53 -0000 1.1
+++ openpkg-src/doxygen/doxygen.patch 30 Jun 2004 13:04:09 -0000 1.2
@@ -1,6 +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 @@
+Index: libpng/pngconf.h
+--- libpng/pngconf.h.orig 2002-02-20 22:03:02 +0100
++++ libpng/pngconf.h 2004-06-30 14:52:23 +0200
+@@ -243,10 +243,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 */
+----------------------------------------------------------------------
+Security Fix (CAN-2002-1363):
+Possible buffer overflows.
+
+Index: libpng/pngrtran.c
+--- libpng/pngrtran.c.orig 2002-02-18 22:25:09 +0100
++++ libpng/pngrtran.c 2004-06-30 14:52:23 +0200
+@@ -1851,8 +1851,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;
+@@ -1869,8 +1869,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);
+@@ -1927,8 +1927,8 @@
/* This changes the data from RRGGBB to RRGGBBXX */
if (flags & PNG_FLAG_FILLER_AFTER)
{
@@ -11,7 +52,7 @@
for (i = 1; i < row_width; i++)
{
*(--dp) = hi_filler;
-@@ -1987,8 +1987,8 @@
+@@ -1949,8 +1949,8 @@
/* This changes the data from RRGGBB to XXRRGGBB */
else
{
@@ -22,7 +63,7 @@
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
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/doxygen/doxygen.spec
============================================================================
$ cvs diff -u -r1.36 -r1.37 doxygen.spec
--- openpkg-src/doxygen/doxygen.spec 7 May 2004 19:14:53 -0000 1.36
+++ openpkg-src/doxygen/doxygen.spec 30 Jun 2004 13:04:09 -0000 1.37
@@ -34,7 +34,7 @@
Group: Text
License: GPL
Version: 1.3.7
-Release: 20040507
+Release: 20040630
# list of sources
Source0: ftp://ftp.stack.nl/pub/users/dimitri/doxygen-%{version}.src.tar.gz
@@ -60,7 +60,7 @@
%prep
%setup -q
- %patch
+ %patch -p0
%build
opt=""
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
