From 79ebc17b1a6195267b4158edaec79b468e36227e Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Wed, 15 Aug 2007 21:57:08 +0000
Subject: Update to xmessage-1.0.2: detabify messages before printing.

Fix an integer overflow in the newly added functions, just because
we can.
---
 x11/xmessage/Makefile         |  4 ++--
 x11/xmessage/distinfo         |  8 ++++----
 x11/xmessage/patches/patch-aa | 16 ++++++++++++++++
 3 files changed, 22 insertions(+), 6 deletions(-)
 create mode 100644 x11/xmessage/patches/patch-aa

(limited to 'x11/xmessage')

diff --git a/x11/xmessage/Makefile b/x11/xmessage/Makefile
index 405b118280a..8948d03979a 100644
--- a/x11/xmessage/Makefile
+++ b/x11/xmessage/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2007/06/19 09:39:13 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/08/15 21:57:08 joerg Exp $
 #
 
-DISTNAME=		xmessage-1.0.1
+DISTNAME=		xmessage-1.0.2
 CATEGORIES=		x11
 MASTER_SITES=		http://xorg.freedesktop.org/releases/individual/app/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/xmessage/distinfo b/x11/xmessage/distinfo
index 23989b7abb5..8ff4c9a56ca 100644
--- a/x11/xmessage/distinfo
+++ b/x11/xmessage/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/01/16 21:25:57 joerg Exp $
+$NetBSD: distinfo,v 1.2 2007/08/15 21:57:08 joerg Exp $
 
-SHA1 (xmessage-1.0.1.tar.bz2) = 3afc3c89472afdb5d4336d3c332b481be5e8b7ff
-RMD160 (xmessage-1.0.1.tar.bz2) = 43a6ab1b7284f7bf902d3bf9992c336830489e56
-Size (xmessage-1.0.1.tar.bz2) = 83465 bytes
+SHA1 (xmessage-1.0.2.tar.bz2) = 866dea3f01e2c9a3657bb1e56396b6ae1af4be3f
+RMD160 (xmessage-1.0.2.tar.bz2) = 610815e2c5a04f441fb41c6f63f2b33aaa2fa254
+Size (xmessage-1.0.2.tar.bz2) = 94805 bytes
diff --git a/x11/xmessage/patches/patch-aa b/x11/xmessage/patches/patch-aa
new file mode 100644
index 00000000000..41e7ad95777
--- /dev/null
+++ b/x11/xmessage/patches/patch-aa
@@ -0,0 +1,16 @@
+$NetBSD: patch-aa,v 1.1 2007/08/15 21:57:09 joerg Exp $
+
+--- xmessage.c.orig	2007-08-15 23:47:23.000000000 +0200
++++ xmessage.c
+@@ -170,6 +170,11 @@ detab (char **messagep, int *lengthp)
+       n++;
+ 
+   /* length increases by at most seven extra spaces for each tab */
++  if (n >= (INT_MAX - *lengthp - 1) / 7) {
++    fprintf (stderr, "%s: integer overflow, terminating\n", ProgramName);
++    exit (1);
++  }
++
+   psize = *lengthp + n*7 + 1;
+   p = XtMalloc (psize);
+ 
-- 
cgit v1.2.3