[pkgsrc/pkgsrc-2006Q3]: pkgsrc/graphics/libwmf Pullup ticket 1858 - requested...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ce11c11b04bf
branches:  pkgsrc-2006Q3
changeset: 519137:ce11c11b04bf
user:      salo <salo%pkgsrc.org@localhost>
date:      Tue Oct 17 15:50:37 2006 +0000

description:
Pullup ticket 1858 - requested by dmcmahill
portability fix for libwmf

Revisions pulled up:
- pkgsrc/graphics/libwmf/distinfo                       1.15
- pkgsrc/graphics/libwmf/patches/patch-ae               1.2

   Module Name:         pkgsrc
   Committed By:        dmcmahill
   Date:                Tue Oct 10 00:22:28 UTC 2006

   Modified Files:
        pkgsrc/graphics/libwmf: distinfo
        pkgsrc/graphics/libwmf/patches: patch-ae

   Log Message:
   repair compilation on solaris (don't include stdint.h if it doesn't
   exist)

diffstat:

 graphics/libwmf/distinfo         |   4 ++--
 graphics/libwmf/patches/patch-ae |  24 ++++++++++++------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diffs (53 lines):

diff -r 7b47a6622b05 -r ce11c11b04bf graphics/libwmf/distinfo
--- a/graphics/libwmf/distinfo  Tue Oct 17 15:32:30 2006 +0000
+++ b/graphics/libwmf/distinfo  Tue Oct 17 15:50:37 2006 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.14 2006/08/20 21:38:45 salo Exp $
+$NetBSD: distinfo,v 1.14.2.1 2006/10/17 15:50:37 salo Exp $
 
 SHA1 (libwmf-0.2.8.4.tar.gz) = 822ab3bd0f5e8f39ad732f2774a8e9f18fc91e89
 RMD160 (libwmf-0.2.8.4.tar.gz) = 98cd631adb5bb332d9224d04bc8a265c105435f2
 Size (libwmf-0.2.8.4.tar.gz) = 2169375 bytes
 SHA1 (patch-ad) = b74be16c5da490394b86403009f5f35d80ba4bfa
-SHA1 (patch-ae) = 644684733090c26250a1ce0e2c5a6c978bd54b74
+SHA1 (patch-ae) = 980c70e981209cfb5da85bd28accd81c35ed1c52
diff -r 7b47a6622b05 -r ce11c11b04bf graphics/libwmf/patches/patch-ae
--- a/graphics/libwmf/patches/patch-ae  Tue Oct 17 15:32:30 2006 +0000
+++ b/graphics/libwmf/patches/patch-ae  Tue Oct 17 15:50:37 2006 +0000
@@ -1,19 +1,20 @@
-$NetBSD: patch-ae,v 1.1 2006/08/20 21:38:45 salo Exp $
-
-Security fix for CVE-2006-3376, from Red Hat.
+$NetBSD: patch-ae,v 1.1.4.1 2006/10/17 15:50:37 salo Exp $
 
---- src/player.c.orig  2002-12-10 20:30:26.000000000 +0100
-+++ src/player.c       2006-08-20 23:29:44.000000000 +0200
-@@ -42,6 +42,7 @@
- #include "player/defaults.h" /* Provides: default settings               */
- #include "player/record.h"   /* Provides: parameter mechanism            */
+--- src/player.c.orig  2002-12-10 14:30:26.000000000 -0500
++++ src/player.c       2006-10-09 13:31:30.464278000 -0400
+@@ -44,4 +44,11 @@
  #include "player/meta.h"     /* Provides: record interpreters            */
+ 
++#ifdef HAVE_STDINT_H
 +#include <stdint.h>
- 
++#endif
++#ifndef UINT32_MAX
++#include <limits.h>
++#endif
++
  /**
   * @internal
-@@ -132,8 +133,14 @@
-               }
+@@ -133,6 +140,12 @@
        }
  
 -/*    P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API)-3) * 2 * sizeof (unsigned char));
@@ -28,4 +29,3 @@
 +      P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API)  ) * 2 * sizeof (unsigned char));
  
        if (ERR (API))
-       {       WMF_DEBUG (API,"bailing...");