head	1.4;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.4
	OPENPKG_E1_MP:1.4
	OPENPKG_E1_MP_2_STABLE:1.3.2.2
	OPENPKG_E1_FP:1.3.2.2
	OPENPKG_2_STABLE_MP:1.3
	OPENPKG_2_STABLE_20061018:1.3.2.2
	OPENPKG_2_STABLE:1.3.0.2
	OPENPKG_CW_FP:1.3;
locks; strict;
comment	@# @;


1.4
date	2006.12.12.19.45.22;	author rse;	state dead;
branches;
next	1.3;
commitid	hqOUUfLBvunsOgYr;

1.3
date	2005.02.25.11.14.13;	author rse;	state Exp;
branches
	1.3.2.1;
next	1.2;

1.2
date	2004.07.02.10.19.36;	author tho;	state dead;
branches;
next	1.1;

1.1
date	2004.04.29.15.07.00;	author thl;	state Exp;
branches;
next	;

1.3.2.1
date	2005.02.25.11.14.13;	author rse;	state dead;
branches;
next	1.3.2.2;
commitid	iZxwRSmmWscPXUQr;

1.3.2.2
date	2006.10.16.14.58.02;	author rse;	state Exp;
branches;
next	;
commitid	iZxwRSmmWscPXUQr;


desc
@@


1.4
log
@upgrading package: wx 2.7.1 -> 2.8.0
@
text
@Index: Makefile.in
--- Makefile.in.orig	2004-10-10 17:17:27 +0200
+++ Makefile.in	2005-02-24 22:26:54 +0100
@@@@ -7894,7 +7894,7 @@@@
 	$(INSTALL_DIR) $(DESTDIR)$(bindir)
 	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
 	$(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
-	(cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
+	(cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
 
 locale_install: 
 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
@


1.3
log
@upgrading package: wx 2.4.2 -> 2.5.4
@
text
@@


1.3.2.1
log
@file wx.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:58:02 +0000
@
text
@d1 12
@


1.3.2.2
log
@Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class)
@
text
@a0 12
Index: Makefile.in
--- Makefile.in.orig	2004-10-10 17:17:27 +0200
+++ Makefile.in	2005-02-24 22:26:54 +0100
@@@@ -7894,7 +7894,7 @@@@
 	$(INSTALL_DIR) $(DESTDIR)$(bindir)
 	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
 	$(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
-	(cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
+	(cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
 
 locale_install: 
 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
@


1.2
log
@Removed patch as its linking with external libs the Security Fix (CAN-2002-1363) for png is not needed
@
text
@d1 9
a9 46
--- src/png/pngrtran.c.orig	Wed Oct  2 20:20:24 2002
+++ src/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 <linux_4ever@@yahoo.com>
Libpng accesses memory that is out of bounds when creating an error message

Index: pngerror.c
--- src/png/pngerror.c.orig	2002-10-03 13:32:27.000000000 +0200
+++ src/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;
    }
 }
d11 2
@


1.1
log
@SA-2004.017-png
@
text
@@