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: 02-Jul-2004 10:37:31
Branch: HEAD Handle: -NONE-
Modified files:
openpkg-src/rrdtool rrdtool.patch rrdtool.spec
Log:
changed usage of zlib and png from internal to system because of
Security Fix (CAN-2002-1363) for png
Summary:
Revision Changes Path
1.6 +0 -47 openpkg-src/rrdtool/rrdtool.patch
1.54 +9 -5 openpkg-src/rrdtool/rrdtool.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/rrdtool/rrdtool.patch
============================================================================
$ cvs diff -u -r1.5 -r1.6 rrdtool.patch
--- openpkg-src/rrdtool/rrdtool.patch 13 May 2004 08:20:18 -0000 1.5
+++ openpkg-src/rrdtool/rrdtool.patch 2 Jul 2004 08:37:31 -0000 1.6
@@ -1,50 +1,3 @@
---- 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;
- }
- }
-
Index: src/rrd_graph.c
--- src/rrd_graph.c.orig 2004-04-06 23:38:14.000000000 +0200
+++ src/rrd_graph.c 2004-05-13 10:17:49.000000000 +0200
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/rrdtool/rrdtool.spec
============================================================================
$ cvs diff -u -r1.53 -r1.54 rrdtool.spec
--- openpkg-src/rrdtool/rrdtool.spec 13 May 2004 08:20:18 -0000 1.53
+++ openpkg-src/rrdtool/rrdtool.spec 2 Jul 2004 08:37:31 -0000 1.54
@@ -34,7 +34,7 @@
Group: Database
License: LGPL
Version: 1.0.48
-Release: 20040513
+Release: 20040702
# list of sources
Source0:
http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/rrdtool-%{version}.tar.gz
@@ -43,8 +43,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, perl, perl-openpkg >= 5.8.3-20040126,
gcc
-PreReq: OpenPKG, openpkg >= 20040130, perl
+BuildPreReq: OpenPKG, openpkg >= 20040130, perl, perl-openpkg >= 5.8.3-20040126,
gcc, png, zlib
+PreReq: OpenPKG, openpkg >= 20040130, perl, png, zlib
AutoReq: no
AutoReqProv: no
@@ -67,17 +67,21 @@
%prep
%setup -q
- %patch
+ %patch -p0
%build
# configure package
echo "ac_cv_path_PERL=no" >config.cache
CC="%{l_cc}" \
+ CPPFLAGS="%{l_cppflags}" \
CFLAGS="%{l_cflags -O}" \
+ LDLAGS="%{l_ldflags}" \
./configure \
--cache-file=./config.cache \
--prefix=%{l_prefix} \
- --disable-shared
+ --disable-shared \
+ --enable-local-libpng \
+ --enable-local-zlib
# build package
%{l_make} %{l_mflags -O}
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
