[pkgsrc/trunk]: pkgsrc/misc/openoffice2 remove section of patch which (only) ...

[abs <abs%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/36ff143a0c84
branches:  trunk
changeset: 533866:36ff143a0c84
user:      abs <abs%pkgsrc.org@localhost>
date:      Thu Oct 04 12:16:26 2007 +0000

description:
remove section of patch which (only) contains CVS tokens

diffstat:

 misc/openoffice2/distinfo         |   4 ++--
 misc/openoffice2/patches/patch-co |  26 +++++++-------------------
 2 files changed, 9 insertions(+), 21 deletions(-)

diffs (72 lines):

diff -r 7f78d7e71e14 -r 36ff143a0c84 misc/openoffice2/distinfo
--- a/misc/openoffice2/distinfo Thu Oct 04 12:08:34 2007 +0000
+++ b/misc/openoffice2/distinfo Thu Oct 04 12:16:26 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2007/10/04 10:46:33 abs Exp $
+$NetBSD: distinfo,v 1.23 2007/10/04 12:16:26 abs Exp $
 
 SHA1 (openoffice-2.2.1/OOo_2.2.1_src_binfilter.tar.bz2) = aa2c316e0fab13a25c07c2cfd0eafb7a50c96678
 RMD160 (openoffice-2.2.1/OOo_2.2.1_src_binfilter.tar.bz2) = a6194849bb8e2130709a7ff769a8e751a43f86c6
@@ -61,4 +61,4 @@
 SHA1 (patch-ci) = 2861e8a4b21977cbc8abeabe4581093e966cdfa7
 SHA1 (patch-cj) = c54fd98e5302a86ec849b90c617ebfcf339c936d
 SHA1 (patch-cn) = 67afccde1d7bfa42ec4082067189da23ada97190
-SHA1 (patch-co) = 9037b3e6f28e3c7bd3b8e5d3aadfd2aa8e293410
+SHA1 (patch-co) = 9c4f2b9d50830df4bd6f81a06591bccc638c78e0
diff -r 7f78d7e71e14 -r 36ff143a0c84 misc/openoffice2/patches/patch-co
--- a/misc/openoffice2/patches/patch-co Thu Oct 04 12:08:34 2007 +0000
+++ b/misc/openoffice2/patches/patch-co Thu Oct 04 12:16:26 2007 +0000
@@ -1,22 +1,10 @@
-$NetBSD: patch-co,v 1.1 2007/09/30 12:27:40 hira Exp $
+$NetBSD: patch-co,v 1.2 2007/10/04 12:16:26 abs Exp $
 
 NOTE: This patch fixes CVE-2007-2834.  It's already fixed in OOo 2.3.0.
 
---- goodies/source/filter.vcl/itiff/itiff.cxx.orig     2006-11-15 01:17:15.000000000 +0900
-+++ goodies/source/filter.vcl/itiff/itiff.cxx  2007-09-30 18:12:19.000000000 +0900
-@@ -4,9 +4,9 @@
-  *
-  *  $RCSfile: patch-co,v $
-  *
-- *  $Revision: 1.1 $
-+ *  $Revision: 1.1 $
-  *
-- *  last change: $Author: hira $ $Date: 2007/09/30 12:27:40 $
-+ *  last change: $Author: hira $ $Date: 2007/09/30 12:27:40 $
-  *
-  *  The Contents of this file are made available subject to
-  *  the terms of GNU Lesser General Public License Version 2.1.
-@@ -132,7 +132,7 @@
+--- goodies/source/filter.vcl/itiff/itiff.cxx.orig     2006-11-14 16:17:15.000000000 +0000
++++ goodies/source/filter.vcl/itiff/itiff.cxx
+@@ -132,7 +132,7 @@ private:
        double  ReadDoubleData();
  
        void    ReadHeader();
@@ -25,7 +13,7 @@
  
        BOOL    ReadMap( ULONG nMinPercent, ULONG nMaxPercent );
                // Liesst/dekomprimert die Bitmap-Daten, und fuellt pMap
-@@ -290,7 +290,7 @@
+@@ -290,7 +290,7 @@ double TIFFReader::ReadDoubleData()
  
  // ---------------------------------------------------------------------------------
  
@@ -34,7 +22,7 @@
  {
        if ( bStatus == FALSE )
                return;
-@@ -353,16 +353,25 @@
+@@ -353,16 +353,25 @@ void TIFFReader::ReadTagData( USHORT nTa
                case 0x0111: { // Strip Offset(s)
                        ULONG nOldNumSO, i, * pOldSO;
                        pOldSO = pStripOffsets;
@@ -68,7 +56,7 @@
                        OOODEBUG("StripOffsets (Anzahl:)",nDataLen);
                        break;
                }
-@@ -384,16 +393,25 @@
+@@ -384,16 +393,25 @@ void TIFFReader::ReadTagData( USHORT nTa
                case 0x0117: { // Strip Byte Counts
                        ULONG nOldNumSBC, i, * pOldSBC;
                        pOldSBC = pStripByteCounts;