Update to 0.37.3:

Another stack overflow has been fixed, this one reported by Sven Tantau.
The stack overflow is trivially exploitable to run arbitrary code.
Additionally, the Makefile.in was fixed so that "make install" does the
right thing. Previously, it was not working properly, and the examples
would subsequently fail to build.

5 files changed, 39 insertions, 12 deletions

diff --git a/devel/chmlib/Makefile b/devel/chmlib/Makefile
index b30994d228d..c1f25563fda 100644
--- a/devel/chmlib/Makefile
+++ b/devel/chmlib/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2005/09/12 14:49:10 minskim Exp $
+# $NetBSD: Makefile,v 1.9 2005/10/28 16:00:50 wiz Exp $
 #
 
-DISTNAME=	chmlib-0.36
+DISTNAME=	chmlib-0.37.3
 CATEGORIES=	devel
 MASTER_SITES=	http://66.93.236.84/%7Ejedwin/projects/chmlib/
-EXTRACT_SUFX=	.tgz
+EXTRACT_SUFX=	.tbz
 
 MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://66.93.236.84/%7Ejedwin/projects/chmlib/
@@ -12,6 +12,7 @@ COMMENT=	Library for dealing with Microsoft ITSS/CHM format files
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
+WRKSRC=			${WRKDIR}/chmlib-0.37
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake
 USE_LIBTOOL=		yes
diff --git a/devel/chmlib/buildlink3.mk b/devel/chmlib/buildlink3.mk
index cbfba39d218..6ba60939123 100644
--- a/devel/chmlib/buildlink3.mk
+++ b/devel/chmlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2005/09/12 14:49:10 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2005/10/28 16:00:50 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 CHMLIB_BUILDLINK3_MK:=	${CHMLIB_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	chmlib
 
 .if !empty(CHMLIB_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.chmlib+=	chmlib>=0.31
-BUILDLINK_RECOMMENDED.chmlib+=	chmlib>=0.36
+BUILDLINK_RECOMMENDED.chmlib+=	chmlib>=0.37.3
 BUILDLINK_PKGSRCDIR.chmlib?=	../../devel/chmlib
 .endif	# CHMLIB_BUILDLINK3_MK
 
diff --git a/devel/chmlib/distinfo b/devel/chmlib/distinfo
index f71388c77b9..e2418d333ef 100644
--- a/devel/chmlib/distinfo
+++ b/devel/chmlib/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.6 2005/09/12 14:49:10 minskim Exp $
+$NetBSD: distinfo,v 1.7 2005/10/28 16:00:50 wiz Exp $
 
-SHA1 (chmlib-0.36.tgz) = de4973f6f8807736b6979ac3f60593d9d3f00f22
-RMD160 (chmlib-0.36.tgz) = 6ca826d322a9cc8e4a55ea73a32dbdd873bb2f04
-Size (chmlib-0.36.tgz) = 369830 bytes
-SHA1 (patch-aa) = 221c455ae2b72265ac7e33604696e91fea6eb6b4
+SHA1 (chmlib-0.37.3.tbz) = 4f660f43b0936bbafc948ec287479b1430a30062
+RMD160 (chmlib-0.37.3.tbz) = 90d57aff75d98134d8415874388ac6a11cc23fd9
+Size (chmlib-0.37.3.tbz) = 260917 bytes
+SHA1 (patch-aa) = c4a7c21e8ae0cb097e9225cdf7e099395c5ed331
+SHA1 (patch-ab) = 37b1203768c67af14af8fa180b36e02f228488b1
diff --git a/devel/chmlib/patches/patch-aa b/devel/chmlib/patches/patch-aa
index 303b88040f2..10205fc4a25 100644
--- a/devel/chmlib/patches/patch-aa
+++ b/devel/chmlib/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.5 2005/09/12 14:49:10 minskim Exp $
+$NetBSD: patch-aa,v 1.6 2005/10/28 16:00:50 wiz Exp $
 
---- src/chm_lib.c.orig	2005-09-09 05:42:27.000000000 -0700
+--- src/chm_lib.c.orig	2005-10-26 14:17:50.000000000 +0200
 +++ src/chm_lib.c
 @@ -182,8 +182,14 @@ typedef unsigned long           UInt64;
  
diff --git a/devel/chmlib/patches/patch-ab b/devel/chmlib/patches/patch-ab
new file mode 100644
index 00000000000..fe7ca8bb8fc
--- /dev/null
+++ b/devel/chmlib/patches/patch-ab
@@ -0,0 +1,25 @@
+$NetBSD: patch-ab,v 1.1 2005/10/28 16:01:09 wiz Exp $
+
+--- Makefile.in.orig	2005-10-27 14:04:34.000000000 +0200
++++ Makefile.in
+@@ -11,6 +11,7 @@
+ CFLAGS=@CFLAGS@ @CHM_MT@ @CHM_USE_PREAD@ @CHM_USE_IO64@ @DMALLOC_DISABLE@ 
+ LDFLAGS=@LDFLAGS@
+ prefix=@prefix@
++exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ includedir=@includedir@
+ CC=@CC@
+@@ -35,11 +36,8 @@ src/libchm.la: src/chm_lib.lo src/lzx.lo
+ install: src/libchm.la
+ 	chmod a+r src/libchm.la
+ 	mkdir -p $(DESTDIR)$(prefix) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
+-	install -m0755 src/libchm.la $(DESTDIR)$(libdir)/
++	${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} src/libchm.la $(DESTDIR)$(libdir)/
+ 	install -m0644 $(srcdir)/src/chm_lib.h $(DESTDIR)$(includedir)/
+-	install -m0755 src/.libs/libchm.so.0.0.0 $(DESTDIR)$(libdir)/
+-	ln -s $(libdir)/libchm.so.0.0.0 $(DESTDIR)$(libdir)/libchm.so
+-	ln -s $(libdir)/libchm.so.0.0.0 $(DESTDIR)$(libdir)/libchm.so.0
+ 
+ clean:
+ 	rm -fr src/libchm.la src/*.o src/*.lo .libs src/.libs src/${EXAMPLES}