From 26a4de740f737dd00eb5c86adbdd873c7603225e Mon Sep 17 00:00:00 2001
From: itojun <itojun>
Date: Sun, 30 Sep 2001 05:11:57 +0000
Subject: upgrade to 1.09a.  a lot of bugfixes, new directives, security hole
 fix (has been incorporated as pkgsrc patch), etc.

---
 graphics/magicpoint/Makefile         |  4 ++--
 graphics/magicpoint/distinfo         |  7 +++----
 graphics/magicpoint/patches/patch-ab | 35 -----------------------------------
 3 files changed, 5 insertions(+), 41 deletions(-)
 delete mode 100644 graphics/magicpoint/patches/patch-ab

(limited to 'graphics/magicpoint')

diff --git a/graphics/magicpoint/Makefile b/graphics/magicpoint/Makefile
index 73af80b3f71..5d90b16cd81 100644
--- a/graphics/magicpoint/Makefile
+++ b/graphics/magicpoint/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.27 2001/09/27 23:18:12 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2001/09/30 05:11:57 itojun Exp $
 
-DISTNAME=		magicpoint-1.08a
+DISTNAME=		magicpoint-1.09a
 CATEGORIES=		x11 graphics
 MASTER_SITES=		ftp://ftp.mew.org/pub/MagicPoint/
 
diff --git a/graphics/magicpoint/distinfo b/graphics/magicpoint/distinfo
index 8d6d6ce2599..48f8a857068 100644
--- a/graphics/magicpoint/distinfo
+++ b/graphics/magicpoint/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.6 2001/09/14 05:41:05 jlam Exp $
+$NetBSD: distinfo,v 1.7 2001/09/30 05:11:57 itojun Exp $
 
-SHA1 (magicpoint-1.08a.tar.gz) = 4b336fff82e0d2c7d4d36b7a914f5d374b6a9343
-Size (magicpoint-1.08a.tar.gz) = 815048 bytes
+SHA1 (magicpoint-1.09a.tar.gz) = 2903f7c42a30d558677fc1a93607fe7fc8c1fc0f
+Size (magicpoint-1.09a.tar.gz) = 816234 bytes
 SHA1 (patch-aa) = 8576e5caaa9a32c769cddab1779b43b8432e658a
-SHA1 (patch-ab) = e64f19da3f410f6b71053c9293c66d7290e9a4a2
 SHA1 (patch-ac) = ec4a83e3d9a7f39a4a632a87d45b0cbcf761e526
diff --git a/graphics/magicpoint/patches/patch-ab b/graphics/magicpoint/patches/patch-ab
deleted file mode 100644
index 6ab857be9c5..00000000000
--- a/graphics/magicpoint/patches/patch-ab
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2001/08/31 00:22:12 itojun Exp $
-
-Plug security hole inherited from xloadimage.
-
-Index: image/faces.c
-===================================================================
-RCS file: /usr/cvsroot/mgp/kit/image/faces.c,v
-retrieving revision 1.4
-retrieving revision 1.5
-diff -u -r1.4 -r1.5
---- faces.c	1998/12/28 08:22:58	1.4
-+++ faces.c	2001/08/30 17:10:30	1.5
-@@ -18,6 +18,7 @@
- 
- #define HEXIGNORE -1
- #define HEXBAD    -2
-+#define MAXFACESNAME 256 /* to avoid buffer overflow */
- 
- /* build a hex digit value table with the bits inverted
-  */
-@@ -107,10 +108,11 @@
-   while (zgets((byte *)buf, BUFSIZ - 1, zf)) {
-     if (! strcmp(buf, "\n"))
-       break;
--    if (!strncmp(buf, "FirstName:", 10))
--      strcpy(fname, buf + 11);
-+    if (!strncmp(buf, "FirstName:", 10)){
-+      strncpy(fname, buf + 11, MAXFACESNAME);
-+	}
-     else if (!strncmp(buf, "LastName:", 9))
--      strcpy(lname, buf + 10);
-+      strncpy(lname, buf + 10, MAXFACESNAME);
-     else if (!strncmp(buf, "Image:", 6)) {
-       if (sscanf(buf + 7, "%d%d%d", &iw, &ih, &id) != 3) {
- 	fprintf(stderr, "%s: Bad Faces Project image\n", fullname);
-- 
cgit v1.2.3