Pullup ticket 1708 - requested by salo

security update for chmlib

Revisions pulled up:
- pkgsrc/devel/chmlib/Makefile		1.14
- pkgsrc/devel/chmlib/PLIST		1.3
- pkgsrc/devel/chmlib/distinfo		1.11
- pkgsrc/devel/chmlib/patches/patch-ab	removed
- pkgsrc/devel/chmlib/patches/patch-ac	1.2

   Module Name:	pkgsrc
   Committed By:	salo
   Date:		Fri Jun 23 12:56:26 UTC 2006

   Modified Files:
	pkgsrc/devel/chmlib: Makefile PLIST distinfo
	pkgsrc/devel/chmlib/patches: patch-ac
   Removed Files:
	pkgsrc/devel/chmlib/patches: patch-ab

   Log Message:
   Update to version 0.38

   Changes:

   - Security fix for extract_chmLib.  Pathnames containing a ".." element
     will not be extracted.  There doesn't seem to be a legitimate reason
     to use ".." as a path element in a chm file.

     http://secunia.com/advisories/20734/

   - Fix for reading some chm files.  Running over a large directory of chm
     files, about 1% of them turned out to be unreadable.  This resulted
     from an incomplete understanding of one of the header fields
     (index_root).  Apparently, this can take negative values other than -1.

5 files changed, 34 insertions, 58 deletions

diff --git a/devel/chmlib/Makefile b/devel/chmlib/Makefile
index f8694a52f64..acec1e2ff8c 100644
--- a/devel/chmlib/Makefile
+++ b/devel/chmlib/Makefile
@@ -1,22 +1,20 @@
-# $NetBSD: Makefile,v 1.13 2006/03/04 21:29:13 jlam Exp $
+# $NetBSD: Makefile,v 1.13.2.1 2006/06/23 13:46:05 ghen Exp $
 #
 
-DISTNAME=	chmlib-0.37.4
-PKGREVISION=	2
+DISTNAME=	chmlib-0.38
 CATEGORIES=	devel
-MASTER_SITES=	http://66.93.236.84/%7Ejedwin/projects/chmlib/
-EXTRACT_SUFX=	.tbz
+MASTER_SITES=	http://morte.jedrea.com/~jedwin/projects/chmlib/
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://66.93.236.84/%7Ejedwin/projects/chmlib/
+HOMEPAGE=	http://morte.jedrea.com/~jedwin/projects/chmlib/
 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
+GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+USE_TOOLS+=	gmake
 
 CONFIGURE_ARGS+=	--disable-io64
 
diff --git a/devel/chmlib/PLIST b/devel/chmlib/PLIST
index 2d1e54210c6..2633742cceb 100644
--- a/devel/chmlib/PLIST
+++ b/devel/chmlib/PLIST
@@ -1,3 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:24 jlam Exp $
+@comment $NetBSD: PLIST,v 1.2.12.1 2006/06/23 13:46:05 ghen Exp $
 include/chm_lib.h
+include/lzx.h
 lib/libchm.la
diff --git a/devel/chmlib/distinfo b/devel/chmlib/distinfo
index 8779e5a5c5f..148fcce0794 100644
--- a/devel/chmlib/distinfo
+++ b/devel/chmlib/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.10 2006/01/03 16:25:59 joerg Exp $
+$NetBSD: distinfo,v 1.10.2.1 2006/06/23 13:46:05 ghen Exp $
 
-SHA1 (chmlib-0.37.4.tbz) = 7efd0def927aa3eed70838ee2261a01fa66b3cfa
-RMD160 (chmlib-0.37.4.tbz) = 84512ac999a3b38cb09bbd1db6edcbc0356d2394
-Size (chmlib-0.37.4.tbz) = 260643 bytes
+SHA1 (chmlib-0.38.tar.bz2) = 52165495bd28a6dfb98ca61c25fa57758b62b41c
+RMD160 (chmlib-0.38.tar.bz2) = 4893e8cf48815f8d64aad1afc4063c0b0e369236
+Size (chmlib-0.38.tar.bz2) = 262494 bytes
 SHA1 (patch-aa) = c4a7c21e8ae0cb097e9225cdf7e099395c5ed331
-SHA1 (patch-ab) = 30e496d927d7816dab6e5da03264e198b0645c1e
-SHA1 (patch-ac) = e480d6193e737ca7ffe7510b05f9213b9ba8cf9a
+SHA1 (patch-ac) = b57e5c7246fd3db876325f476bdf4249c49e0734
diff --git a/devel/chmlib/patches/patch-ab b/devel/chmlib/patches/patch-ab
deleted file mode 100644
index a97633ad76f..00000000000
--- a/devel/chmlib/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2006/01/03 16:25:59 joerg Exp $
-
---- Makefile.in.orig	2005-10-28 17:26:18.000000000 +0000
-+++ Makefile.in
-@@ -35,8 +35,8 @@ src/libchm.la: src/chm_lib.lo src/lzx.lo
- 
- install: src/libchm.la
- 	mkdir -p $(DESTDIR)$(prefix) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
--	${LIBTOOL} --mode=install install -m0755 src/libchm.la $(DESTDIR)$(libdir)/
--	install -m0644 $(srcdir)/src/chm_lib.h $(DESTDIR)$(includedir)/
-+	${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} src/libchm.la $(DESTDIR)$(libdir)/
-+	${BSD_INSTALL_DATA} $(srcdir)/src/chm_lib.h $(DESTDIR)$(includedir)/
- 
- clean:
- 	rm -fr src/libchm.la src/*.o src/*.lo .libs src/.libs src/${EXAMPLES}
-@@ -54,5 +54,5 @@ extract_chmLib: $(srcdir)/src/extract_ch
- 	${CC} -o $@ $^ -I$(includedir) -L$(libdir) -lchm ${CFLAGS}
- 
- chm_http: $(srcdir)/src/chm_http.c
--	${CC} -o $@ $^ -I$(includedir) -L$(libdir) -lchm -lpthread ${CFLAGS}
-+	${CC} -o $@ $^ -I$(includedir) -L$(libdir) -lchm ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} ${CFLAGS}
- 
diff --git a/devel/chmlib/patches/patch-ac b/devel/chmlib/patches/patch-ac
index 8364f4b315f..0f83a4eeb8a 100644
--- a/devel/chmlib/patches/patch-ac
+++ b/devel/chmlib/patches/patch-ac
@@ -1,25 +1,25 @@
-$NetBSD: patch-ac,v 1.1 2006/01/03 16:25:59 joerg Exp $
+$NetBSD: patch-ac,v 1.1.2.1 2006/06/23 13:46:05 ghen Exp $
 
---- configure.orig	2006-01-03 16:13:34.000000000 +0000
-+++ configure
-@@ -3201,13 +3201,13 @@ if test "${enable_pthread+set}" = set; t
- 
+--- configure.orig	2006-06-17 01:09:19.000000000 +0200
++++ configure	2006-06-23 14:13:20.000000000 +0200
+@@ -19435,13 +19435,13 @@ if test "${enable_pthread+set}" = set; t
+   enableval=$enable_pthread;
     if test "$enableval" = "yes"; then
  
--echo "$as_me:$LINENO: checking for pthread_mutex_init in -lpthread" >&5
--echo $ECHO_N "checking for pthread_mutex_init in -lpthread... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking for pthread_mutex_init in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
-+echo $ECHO_N "checking for pthread_mutex_init in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6
+-{ echo "$as_me:$LINENO: checking for pthread_mutex_init in -lpthread" >&5
+-echo $ECHO_N "checking for pthread_mutex_init in -lpthread... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: checking for pthread_mutex_init in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
++echo $ECHO_N "checking for pthread_mutex_init in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6; }
  if test "${ac_cv_lib_pthread_pthread_mutex_init+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lpthread  $LIBS"
-+LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}  $LIBS"
++LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -3269,12 +3269,12 @@ if test $ac_cv_lib_pthread_pthread_mutex
+@@ -19505,12 +19505,12 @@ if test $ac_cv_lib_pthread_pthread_mutex
  #define HAVE_LIBPTHREAD 1
  _ACEOF
  
@@ -34,24 +34,24 @@ $NetBSD: patch-ac,v 1.1 2006/01/03 16:25:59 joerg Exp $
       else
        CHM_MT=""
        { echo "$as_me:$LINENO: WARNING: Thread safe mode turned off. chm_http will not be built" >&5
-@@ -3284,13 +3284,13 @@ echo "$as_me: WARNING: Thread safe mode 
+@@ -19520,13 +19520,13 @@ echo "$as_me: WARNING: Thread safe mode 
  else
  
  
--echo "$as_me:$LINENO: checking for pthread_mutex_init in -lpthread" >&5
--echo $ECHO_N "checking for pthread_mutex_init in -lpthread... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking for pthread_mutex_init in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
-+echo $ECHO_N "checking for pthread_mutex_init in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6
+-{ echo "$as_me:$LINENO: checking for pthread_mutex_init in -lpthread" >&5
+-echo $ECHO_N "checking for pthread_mutex_init in -lpthread... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: checking for pthread_mutex_init in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
++echo $ECHO_N "checking for pthread_mutex_init in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6; }
  if test "${ac_cv_lib_pthread_pthread_mutex_init+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lpthread  $LIBS"
-+LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}  $LIBS"
++LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -3352,12 +3352,12 @@ if test $ac_cv_lib_pthread_pthread_mutex
+@@ -19590,12 +19590,12 @@ if test $ac_cv_lib_pthread_pthread_mutex
  #define HAVE_LIBPTHREAD 1
  _ACEOF
  
@@ -64,5 +64,5 @@ $NetBSD: patch-ac,v 1.1 2006/01/03 16:25:59 joerg Exp $
 -   LDFLAGS="$LDFLAGS -lpthread"
 +   LDFLAGS="$LDFLAGS ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
  
- fi;
+ fi