[pkgsrc/pkgsrc-2006Q4]: pkgsrc/devel/gtexinfo Pullup ticket 1982 - requested ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b96ff352ba32
branches:  pkgsrc-2006Q4
changeset: 522956:b96ff352ba32
user:      ghen <ghen%pkgsrc.org@localhost>
date:      Mon Jan 08 12:01:21 2007 +0000

description:
Pullup ticket 1982 - requested by rillig
security fix for gtexinfo

- pkgsrc/devel/gtexinfo/Makefile                1.67
- pkgsrc/devel/gtexinfo/distinfo                1.26-1.27
- pkgsrc/devel/gtexinfo/patches/patch-al        1.4-1.5

   Module Name: pkgsrc
   Committed By:        rillig
   Date:                Mon Jan  8 08:21:48 UTC 2007

   Modified Files:
        pkgsrc/devel/gtexinfo: distinfo
        pkgsrc/devel/gtexinfo/patches: patch-al

   Log Message:
   Fixed the "fix" for CVE-2006-4810, since it introduced these compiler
   warnings.

   ===> GCC
   texindex.c: In function `readline':
   texindex.c:848: warning: assignment makes pointer from integer without a cast

   ===> MIPSpro
   cc-1515 cc: ERROR File = texindex.c, Line = 848
     A value of type "long" cannot be assigned to an entity of type "char *".

               end = buffer - linebuffer->buffer;

   Well, if the compilers were more intelligent, they could have seen that
   (buffer == linebuffer->buffer) was an invariant and that the resulting
   difference was therefore always zero, and zero can be converted into any
   pointer type. ;)
---
   Module Name: pkgsrc
   Committed By:        rillig
   Date:                Mon Jan  8 08:50:51 UTC 2007

   Modified Files:
        pkgsrc/devel/gtexinfo: Makefile distinfo
        pkgsrc/devel/gtexinfo/patches: patch-al

   Log Message:
   Corrected my last change. The original patch for CVE-2006-4810 was
   correct, only the pkgsrc version somehow managed to get wrong.

   PKGREVISION++

diffstat:

 devel/gtexinfo/Makefile         |  4 ++--
 devel/gtexinfo/distinfo         |  5 +++--
 devel/gtexinfo/patches/patch-al |  8 ++++----
 3 files changed, 9 insertions(+), 8 deletions(-)

diffs (58 lines):

diff -r 93dc97500cb8 -r b96ff352ba32 devel/gtexinfo/Makefile
--- a/devel/gtexinfo/Makefile   Sun Jan 07 13:13:25 2007 +0000
+++ b/devel/gtexinfo/Makefile   Mon Jan 08 12:01:21 2007 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.66 2006/11/18 15:49:02 adrianp Exp $
+# $NetBSD: Makefile,v 1.66.2.1 2007/01/08 12:01:21 ghen Exp $
 
 DISTNAME=              texinfo-4.8
 PKGNAME=               g${DISTNAME}
-PKGREVISION=           6
+PKGREVISION=           7
 CATEGORIES=            devel sysutils
 MASTER_SITES=          ${MASTER_SITE_GNU:=texinfo/}
 EXTRACT_SUFX=          .tar.bz2
diff -r 93dc97500cb8 -r b96ff352ba32 devel/gtexinfo/distinfo
--- a/devel/gtexinfo/distinfo   Sun Jan 07 13:13:25 2007 +0000
+++ b/devel/gtexinfo/distinfo   Mon Jan 08 12:01:21 2007 +0000
@@ -1,12 +1,13 @@
-$NetBSD: distinfo,v 1.25 2006/11/18 15:49:02 adrianp Exp $
+$NetBSD: distinfo,v 1.25.2.1 2007/01/08 12:01:21 ghen Exp $
 
 SHA1 (texinfo-4.8.tar.bz2) = b19e906f7220294c1e8b087d583c50f5c4d7c420
 RMD160 (texinfo-4.8.tar.bz2) = 5cb82cd240d1f22da813c7142df8828b4f6f1ea4
 Size (texinfo-4.8.tar.bz2) = 1521822 bytes
+SHA1 (patch-al.mine) = 8763b5d73088b2fea9da83c45686c27fd4525455
 SHA1 (patch-aa) = 2c6d6a812fcf3b1aa944832601c3415548e763f5
 SHA1 (patch-ab) = 299ae7a5001c6ab42cca7c6278ae1edb3b348511
 SHA1 (patch-ac) = 01baf8634edcecab0b5edaeddf1e38811cab490d
 SHA1 (patch-ad) = c5c3374322eb8a2c8dfc7871971b73194ab1b14c
 SHA1 (patch-aj) = d9071c62c993550d253c9e1889880d4fccf7d278
 SHA1 (patch-ak) = 2cef2ae464ddb5324acae000420017d4faf7b145
-SHA1 (patch-al) = b55ac4b85f23f11248f9cb66b242be7b4daf46ee
+SHA1 (patch-al) = 5cbae19a93752d37eac70dee454af716b7b35a9c
diff -r 93dc97500cb8 -r b96ff352ba32 devel/gtexinfo/patches/patch-al
--- a/devel/gtexinfo/patches/patch-al   Sun Jan 07 13:13:25 2007 +0000
+++ b/devel/gtexinfo/patches/patch-al   Mon Jan 08 12:01:21 2007 +0000
@@ -1,9 +1,9 @@
-$NetBSD: patch-al,v 1.3 2006/11/18 15:49:02 adrianp Exp $
+$NetBSD: patch-al,v 1.3.2.1 2007/01/08 12:01:21 ghen Exp $
 
 Security fix for CAN-2005-3001 and CVE-2006-4810
 
---- util/texindex.c.orig       2004-04-11 18:56:47.000000000 +0100
-+++ util/texindex.c
+--- util/texindex.c.orig       2004-04-11 19:56:47.000000000 +0200
++++ util/texindex.c    2007-01-08 09:41:42.000000000 +0100
 @@ -387,14 +387,15 @@ For more information about these matters
  /* Return a name for temporary file COUNT. */
  
@@ -52,7 +52,7 @@
            buffer = (char *) xrealloc (buffer, linebuffer->size *= 2);
            p += buffer - linebuffer->buffer;
 -          end += buffer - linebuffer->buffer;
-+          end = buffer - linebuffer->buffer;
++          end = buffer + linebuffer->size;
            linebuffer->buffer = buffer;
          }
        if (c < 0 || c == '\n')