OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Herbert Schmid
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 22-Oct-2004 13:52:00
Branch: HEAD Handle: 2004102212520000
Modified files:
openpkg-src/abiword abiword.patch abiword.spec
Log:
upgrading package: abiword 2.1.90 -> 2.1.91
Summary:
Revision Changes Path
1.5 +1 -26 openpkg-src/abiword/abiword.patch
1.30 +2 -3 openpkg-src/abiword/abiword.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/abiword/abiword.patch
============================================================================
$ cvs diff -u -r1.4 -r1.5 abiword.patch
--- openpkg-src/abiword/abiword.patch 5 Aug 2004 12:41:35 -0000 1.4
+++ openpkg-src/abiword/abiword.patch 22 Oct 2004 11:52:00 -0000 1.5
@@ -11,31 +11,6 @@
#define ICONV_CONST const
-Index: libpng/pngrtran.c
---- 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
@@ -52,7 +27,7 @@
+ 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);
+ buffer[iout+len] = 0;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/abiword/abiword.spec
============================================================================
$ cvs diff -u -r1.29 -r1.30 abiword.spec
--- openpkg-src/abiword/abiword.spec 13 Oct 2004 17:27:46 -0000 1.29
+++ openpkg-src/abiword/abiword.spec 22 Oct 2004 11:52:00 -0000 1.30
@@ -33,8 +33,8 @@
Class: EVAL
Group: Editor
License: GPL
-Version: 2.1.90
-Release: 20041013
+Version: 2.1.91
+Release: 20041022
# list of sources
Source0:
http://osdn.dl.sourceforge.net/sourceforge/abiword/abiword-%{version}.tar.gz
@@ -72,7 +72,6 @@
%track
prog abiword = {
- comment = "ms: unexpected EOF in broken 2.1.90 tarball"
version = %{version}
url = http://prdownloads.sourceforge.net/abiword/
regex = abiword-(\d+\.\d+\.\d+(-\d+)?)\.tar\.gz
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]