From 42dcc0d55e95be7de843769ec7a33c05bc572449 Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Mon, 15 Dec 2003 13:45:07 +0000
Subject: Add two patches that avoid double free()s of the same space. Bump
 PKGREVISION to 1. (patches have been sent to author)

---
 print/dvipng/Makefile         |  3 ++-
 print/dvipng/distinfo         |  4 +++-
 print/dvipng/patches/patch-ab | 12 ++++++++++++
 print/dvipng/patches/patch-ac | 12 ++++++++++++
 4 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 print/dvipng/patches/patch-ab
 create mode 100644 print/dvipng/patches/patch-ac

(limited to 'print')

diff --git a/print/dvipng/Makefile b/print/dvipng/Makefile
index 79d752a60b8..33598bfc7d7 100644
--- a/print/dvipng/Makefile
+++ b/print/dvipng/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/12/12 22:36:14 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/12/15 13:45:07 wiz Exp $
 #
 
 DISTNAME=		dvipng-0.8
+PKGREVISION=		1
 CATEGORIES=		textproc converters
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=preview-latex/}
 
diff --git a/print/dvipng/distinfo b/print/dvipng/distinfo
index 645899bcdf5..7f37adbb2e8 100644
--- a/print/dvipng/distinfo
+++ b/print/dvipng/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.3 2003/12/12 22:36:14 wiz Exp $
+$NetBSD: distinfo,v 1.4 2003/12/15 13:45:07 wiz Exp $
 
 SHA1 (dvipng-0.8.tar.gz) = 563115707185ef23bfe211518f4ff7c1555d718f
 Size (dvipng-0.8.tar.gz) = 119186 bytes
 SHA1 (patch-aa) = a493bdd38e2728b37efed8b0b2d46d199aebe77a
+SHA1 (patch-ab) = dfbcbdf80d503d5c63c892b77e739eb60bd07fc0
+SHA1 (patch-ac) = 05a6b2afdf13359313b7fb692d97bcd83e08bc43
diff --git a/print/dvipng/patches/patch-ab b/print/dvipng/patches/patch-ab
new file mode 100644
index 00000000000..df4b6f34dd3
--- /dev/null
+++ b/print/dvipng/patches/patch-ab
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.1 2003/12/15 13:45:07 wiz Exp $
+
+--- font.c.orig	Sun Nov 30 12:56:55 2003
++++ font.c
+@@ -294,7 +294,6 @@ void ClearFonts(void)
+   while(hfontptr!=NULL) {
+     tmp=hfontptr->next;
+     DoneFont(hfontptr);
+-    free(hfontptr);
+     hfontptr=tmp;
+   }
+   FreeFontNumP(dvi->fontnump);
diff --git a/print/dvipng/patches/patch-ac b/print/dvipng/patches/patch-ac
new file mode 100644
index 00000000000..45c9fa5d64c
--- /dev/null
+++ b/print/dvipng/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.1 2003/12/15 13:45:07 wiz Exp $
+
+--- tfm.c.orig	Sun Nov 30 12:56:55 2003
++++ tfm.c
+@@ -58,7 +58,6 @@ bool ReadTFM(struct font_entry * tfontp,
+     c++;
+     position += 4;
+   }
+-  free(width);
+   return(true);
+ }
+   
-- 
cgit v1.2.3