head	1.5;
access;
symbols
	pkgsrc-2013Q2:1.5.0.34
	pkgsrc-2013Q2-base:1.5
	pkgsrc-2012Q4:1.5.0.32
	pkgsrc-2012Q4-base:1.5
	pkgsrc-2011Q4:1.5.0.30
	pkgsrc-2011Q4-base:1.5
	pkgsrc-2011Q2:1.5.0.28
	pkgsrc-2011Q2-base:1.5
	pkgsrc-2009Q4:1.5.0.26
	pkgsrc-2009Q4-base:1.5
	pkgsrc-2008Q4:1.5.0.24
	pkgsrc-2008Q4-base:1.5
	pkgsrc-2008Q3:1.5.0.22
	pkgsrc-2008Q3-base:1.5
	cube-native-xorg:1.5.0.20
	cube-native-xorg-base:1.5
	pkgsrc-2008Q2:1.5.0.18
	pkgsrc-2008Q2-base:1.5
	pkgsrc-2008Q1:1.5.0.16
	pkgsrc-2008Q1-base:1.5
	pkgsrc-2007Q4:1.5.0.14
	pkgsrc-2007Q4-base:1.5
	pkgsrc-2007Q3:1.5.0.12
	pkgsrc-2007Q3-base:1.5
	pkgsrc-2007Q2:1.5.0.10
	pkgsrc-2007Q2-base:1.5
	pkgsrc-2007Q1:1.5.0.8
	pkgsrc-2007Q1-base:1.5
	pkgsrc-2006Q4:1.5.0.6
	pkgsrc-2006Q4-base:1.5
	pkgsrc-2006Q3:1.5.0.4
	pkgsrc-2006Q3-base:1.5
	pkgsrc-2006Q2:1.5.0.2
	pkgsrc-2006Q2-base:1.5
	pkgsrc-2006Q1:1.4.0.2
	pkgsrc-2006Q1-base:1.4
	pkgsrc-2005Q4:1.3.0.2
	pkgsrc-2005Q4-base:1.3
	pkgsrc-2005Q3:1.2.0.2;
locks; strict;
comment	@# @;


1.5
date	2006.06.23.12.56.26;	author salo;	state dead;
branches;
next	1.4;

1.4
date	2006.01.03.16.25.59;	author joerg;	state Exp;
branches
	1.4.2.1;
next	1.3;

1.3
date	2005.11.07.19.56.47;	author tv;	state Exp;
branches;
next	1.2;

1.2
date	2005.10.29.08.23.11;	author wiz;	state dead;
branches
	1.2.2.1;
next	1.1;

1.1
date	2005.10.28.16.01.09;	author wiz;	state Exp;
branches;
next	;

1.4.2.1
date	2006.06.23.13.46.05;	author ghen;	state dead;
branches;
next	;

1.2.2.1
date	2005.10.29.08.23.11;	author seb;	state dead;
branches;
next	1.2.2.2;

1.2.2.2
date	2005.10.30.12.53.01;	author seb;	state Exp;
branches;
next	;


desc
@@


1.5
log
@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.
@
text
@$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}
 
@


1.4
log
@Use PTHREAD_* instead of hard-wired -lpthread.
@
text
@d1 1
a1 1
$NetBSD$
@


1.4.2.1
log
@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.
@
text
@d1 1
a1 1
$NetBSD: patch-ab,v 1.4 2006/01/03 16:25:59 joerg Exp $
@


1.3
log
@Use BSD_INSTALL_* macros rather than mostly bare "install" command.
Bump PKGREVISION.
@
text
@d3 1
a3 1
--- Makefile.in.orig	2005-10-28 13:26:18.000000000 -0400
d16 7
@


1.2
log
@Update to 0.37.4: upstream release including patch-ab fixes.
@
text
@d1 1
a1 1
$NetBSD: patch-ab,v 1.1 2005/10/28 16:01:09 wiz Exp $
d3 1
a3 1
--- Makefile.in.orig	2005-10-27 14:04:34.000000000 +0200
d5 2
a6 9
@@@@ -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
a7 1
 	chmod a+r src/libchm.la
d9 2
a10 1
-	install -m0755 src/libchm.la $(DESTDIR)$(libdir)/
d12 1
a12 4
 	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
@


1.2.2.1
log
@file patch-ab was added on branch pkgsrc-2005Q3 on 2005-10-29 08:23:11 +0000
@
text
@d1 25
@


1.2.2.2
log
@Pullup ticket 858 - requested by Thomas Klausner
security update for devel/chmlib

Revisions pulled up:
- pkgsrc/devel/chmlib/Makefile                                1.9
- pkgsrc/devel/chmlib/buildlink3.mk                           1.4
- pkgsrc/devel/chmlib/distinfo                                1.7
- pkgsrc/devel/chmlib/patches/patch-aa                        1.6
- pkgsrc/devel/chmlib/patches/patch-ab                        1.1

   Module Name:	pkgsrc
   Committed By:	wiz
   Date:		Fri Oct 28 16:00:50 UTC 2005

   Modified Files:
   	pkgsrc/devel/chmlib: Makefile buildlink3.mk distinfo
   	pkgsrc/devel/chmlib/patches: patch-aa

   Log Message:
   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.
---
   Module Name:	pkgsrc
   Committed By:	wiz
   Date:		Fri Oct 28 16:01:09 UTC 2005

   Added Files:
   	pkgsrc/devel/chmlib/patches: patch-ab

   Log Message:
   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.
@
text
@a0 25
$NetBSD: patch-ab,v 1.2.2.1 2005/10/30 12:53:01 seb 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}
@


1.1
log
@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.
@
text
@d1 1
a1 1
$NetBSD$
@
