head 1.13; access; symbols pkgsrc-2013Q2:1.13.0.24 pkgsrc-2013Q2-base:1.13 pkgsrc-2012Q4:1.13.0.22 pkgsrc-2012Q4-base:1.13 pkgsrc-2011Q4:1.13.0.20 pkgsrc-2011Q4-base:1.13 pkgsrc-2011Q2:1.13.0.18 pkgsrc-2011Q2-base:1.13 pkgsrc-2009Q4:1.13.0.16 pkgsrc-2009Q4-base:1.13 pkgsrc-2008Q4:1.13.0.14 pkgsrc-2008Q4-base:1.13 pkgsrc-2008Q3:1.13.0.12 pkgsrc-2008Q3-base:1.13 cube-native-xorg:1.13.0.10 cube-native-xorg-base:1.13 pkgsrc-2008Q2:1.13.0.8 pkgsrc-2008Q2-base:1.13 pkgsrc-2008Q1:1.13.0.6 pkgsrc-2008Q1-base:1.13 pkgsrc-2007Q4:1.13.0.4 pkgsrc-2007Q4-base:1.13 pkgsrc-2007Q3:1.13.0.2 pkgsrc-2007Q3-base:1.13 pkgsrc-2007Q2:1.12.0.4 pkgsrc-2007Q2-base:1.12 pkgsrc-2007Q1:1.12.0.2 pkgsrc-2007Q1-base:1.12 pkgsrc-2006Q4:1.11.0.14 pkgsrc-2006Q4-base:1.11 pkgsrc-2006Q3:1.11.0.12 pkgsrc-2006Q3-base:1.11 pkgsrc-2006Q2:1.11.0.10 pkgsrc-2006Q2-base:1.11 pkgsrc-2006Q1:1.11.0.8 pkgsrc-2006Q1-base:1.11 pkgsrc-2005Q4:1.11.0.6 pkgsrc-2005Q4-base:1.11 pkgsrc-2005Q3:1.11.0.4 pkgsrc-2005Q3-base:1.11 pkgsrc-2005Q2:1.11.0.2 pkgsrc-2005Q2-base:1.11 pkgsrc-2005Q1:1.10.0.8 pkgsrc-2005Q1-base:1.10 pkgsrc-2004Q4:1.10.0.6 pkgsrc-2004Q4-base:1.10 pkgsrc-2004Q3:1.10.0.4 pkgsrc-2004Q3-base:1.10 pkgsrc-2004Q2:1.10.0.2 pkgsrc-2004Q2-base:1.10 pkgsrc-2004Q1:1.9.0.2 pkgsrc-2004Q1-base:1.9 pkgsrc-2003Q4:1.7.0.2 pkgsrc-2003Q4-base:1.7 netbsd-1-6-1:1.5.0.6 netbsd-1-6-1-base:1.5 netbsd-1-6:1.5.0.8 netbsd-1-6-RELEASE-base:1.5 pkgviews:1.5.0.4 pkgviews-base:1.5 buildlink2:1.5.0.2 buildlink2-base:1.5 netbsd-1-5-PATCH003:1.5 netbsd-1-5-PATCH001:1.1 netbsd-1-5-RELEASE:1.1 netbsd-1-4-PATCH003:1.1 netbsd-1-4-PATCH002:1.1 comdex-fall-1999:1.1 netbsd-1-4-PATCH001:1.1 netbsd-1-4-RELEASE:1.1; locks; strict; comment @# @; 1.13 date 2007.08.02.13.04.42; author joerg; state dead; branches; next 1.12; 1.12 date 2007.01.06.15.34.37; author wiz; state Exp; branches; next 1.11; 1.11 date 2005.05.26.15.03.11; author salo; state Exp; branches 1.11.14.1; next 1.10; 1.10 date 2004.03.29.01.18.41; author tv; state Exp; branches 1.10.8.1; next 1.9; 1.9 date 2003.12.30.16.46.03; author cjep; state Exp; branches; next 1.8; 1.8 date 2003.12.05.22.58.52; author erh; state Exp; branches; next 1.7; 1.7 date 2003.09.18.18.46.32; author wiz; state Exp; branches; next 1.6; 1.6 date 2003.03.18.21.53.30; author jschauma; state Exp; branches; next 1.5; 1.5 date 2002.03.24.14.02.36; author mjl; state Exp; branches; next 1.4; 1.4 date 2001.07.14.03.51.14; author jlam; state Exp; branches; next 1.3; 1.3 date 2001.06.21.22.36.55; author jlam; state Exp; branches; next 1.2; 1.2 date 2001.06.10.01.14.59; author wiz; state Exp; branches; next 1.1; 1.1 date 98.10.14.21.51.14; author tron; state Exp; branches; next ; 1.11.14.1 date 2007.01.07.03.52.45; author salo; state Exp; branches; next ; 1.10.8.1 date 2005.05.27.00.46.12; author snj; state Exp; branches; next ; desc @@ 1.13 log @Use in-tree versions. The replacement Makefile can be used for direct builds in bootstrap tools as well. Add DESTDIR support. @ text @$NetBSD: patch-aa,v 1.12 2007/01/06 15:34:37 wiz Exp $ --- Makefile.orig 2007-01-03 03:49:21.000000000 +0000 +++ Makefile @@@@ -15,42 +15,35 @@@@ SHELL=/bin/sh # To assist in cross-compiling -CC=gcc -AR=ar -RANLIB=ranlib -LDFLAGS= +CC=${LIBTOOL} --mode=compile ${REALCC} +LD=${LIBTOOL} --mode=link ${REALCC} +#AR=ar +#RANLIB=ranlib +#LDFLAGS= BIGFILES=-D_FILE_OFFSET_BITS=64 -CFLAGS=-Wall -Winline -O2 -g $(BIGFILES) +CFLAGS+=$(BIGFILES) -# Where you want it installed when you do 'make install' -PREFIX=/usr/local +OBJS= blocksort.lo \ + huffman.lo \ + crctable.lo \ + randtable.lo \ + compress.lo \ + decompress.lo \ + bzlib.lo +all: libbz2.la bzip2 bzip2recover test -OBJS= blocksort.o \ - huffman.o \ - crctable.o \ - randtable.o \ - compress.o \ - decompress.o \ - bzlib.o - -all: libbz2.a bzip2 bzip2recover test - -bzip2: libbz2.a bzip2.o - $(CC) $(CFLAGS) $(LDFLAGS) -o bzip2 bzip2.o -L. -lbz2 +bzip2: libbz2.la bzip2.o + $(LD) $(CFLAGS) $(LDFLAGS) -static -o bzip2 bzip2.o libbz2.la bzip2recover: bzip2recover.o - $(CC) $(CFLAGS) $(LDFLAGS) -o bzip2recover bzip2recover.o + $(LD) $(CFLAGS) $(LDFLAGS) -static -o bzip2recover bzip2recover.o -libbz2.a: $(OBJS) - rm -f libbz2.a - $(AR) cq libbz2.a $(OBJS) - @@if ( test -f $(RANLIB) -o -f /usr/bin/ranlib -o \ - -f /bin/ranlib -o -f /usr/ccs/bin/ranlib ) ; then \ - echo $(RANLIB) libbz2.a ; \ - $(RANLIB) libbz2.a ; \ - fi +libbz2.la: $(OBJS) + rm -f libbz2.la + $(LD) $(LDFLAGS) -o libbz2.la $(OBJS) -version-info 0:0 \ + -rpath $(PREFIX)/lib check: test test: bzip2 @@@@ -113,20 +106,20 @@@@ clean: sample1.rb2 sample2.rb2 sample3.rb2 \ sample1.tst sample2.tst sample3.tst -blocksort.o: blocksort.c +blocksort.lo: blocksort.c @@cat words0 $(CC) $(CFLAGS) -c blocksort.c -huffman.o: huffman.c +huffman.lo: huffman.c $(CC) $(CFLAGS) -c huffman.c -crctable.o: crctable.c +crctable.lo: crctable.c $(CC) $(CFLAGS) -c crctable.c -randtable.o: randtable.c +randtable.lo: randtable.c $(CC) $(CFLAGS) -c randtable.c -compress.o: compress.c +compress.lo: compress.c $(CC) $(CFLAGS) -c compress.c -decompress.o: decompress.c +decompress.lo: decompress.c $(CC) $(CFLAGS) -c decompress.c -bzlib.o: bzlib.c +bzlib.lo: bzlib.c $(CC) $(CFLAGS) -c bzlib.c bzip2.o: bzip2.c $(CC) $(CFLAGS) -c bzip2.c @ 1.12 log @Update to 1.0.4: 1.0.4 (20 Dec 06) ~~~~~~~~~~~~~~~~~ Fixes some minor bugs since the last version, 1.0.3. * Fix file permissions race problem (CAN-2005-0953). * Avoid possible segfault in BZ2_bzclose. From Coverity's NetBSD scan. * 'const'/prototype cleanups in the C code. * Change default install location to /usr/local, and handle multiple 'make install's without error. * Sanitise file names more carefully in bzgrep. Fixes CAN-2005-0758 to the extent that applies to bzgrep. * Use 'mktemp' rather than 'tempfile' in bzdiff. * Tighten up a couple of assertions in blocksort.c following automated analysis. * Fix minor doc/comment bugs. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.11 2005/05/26 15:03:11 salo Exp $ @ 1.11 log @Security update to version 1.0.3 - Further robustification against corrupted compressed data. There are currently no known bitstreams which can cause the decompressor to crash, loop or access memory which does not belong to it. If you are using bzip2 or the library to decompress bitstreams from untrusted sources, an upgrade to 1.0.3 is recommended. http://scary.beasts.org/security/CESA-2005-002.txt - The documentation has been converted to XML, from which html and pdf can be derived. - Various minor bugs in the documentation have been fixed. - Fixes for various compilation warnings with newer versions of gcc, and on 64-bit platforms. - The BZ_NO_STDIO cpp symbol was not properly observed in 1.0.2. This has been fixed. @ text @d1 1 a1 1 $NetBSD$ d3 3 a5 3 --- Makefile.orig 2005-02-17 12:28:24.000000000 +0100 +++ Makefile 2005-05-26 16:53:13.000000000 +0200 @@@@ -2,42 +2,35 @@@@ d20 1 a20 1 -CFLAGS=-Wall -Winline -O -g $(BIGFILES) d24 1 a24 1 -PREFIX=/usr d69 1 a69 1 @@@@ -100,20 +93,20 @@@@ @ 1.11.14.1 log @Pullup ticket 1980 - requested by wiz security update for bzip2 Revisions pulled up: - pkgsrc/archivers/bzip2/Makefile 1.43 - pkgsrc/archivers/bzip2/distinfo 1.13 - pkgsrc/archivers/bzip2/patches/patch-aa 1.12 Module Name: pkgsrc Committed By: wiz Date: Sat Jan 6 15:34:37 UTC 2007 Modified Files: pkgsrc/archivers/bzip2: Makefile distinfo pkgsrc/archivers/bzip2/patches: patch-aa Log Message: Update to 1.0.4: 1.0.4 (20 Dec 06) ~~~~~~~~~~~~~~~~~ Fixes some minor bugs since the last version, 1.0.3. * Fix file permissions race problem (CAN-2005-0953). * Avoid possible segfault in BZ2_bzclose. From Coverity's NetBSD scan. * 'const'/prototype cleanups in the C code. * Change default install location to /usr/local, and handle multiple 'make install's without error. * Sanitise file names more carefully in bzgrep. Fixes CAN-2005-0758 to the extent that applies to bzgrep. * Use 'mktemp' rather than 'tempfile' in bzdiff. * Tighten up a couple of assertions in blocksort.c following automated analysis. * Fix minor doc/comment bugs. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.12 2007/01/06 15:34:37 wiz Exp $ d3 3 a5 3 --- Makefile.orig 2007-01-03 03:49:21.000000000 +0000 +++ Makefile @@@@ -15,42 +15,35 @@@@ d20 1 a20 1 -CFLAGS=-Wall -Winline -O2 -g $(BIGFILES) d24 1 a24 1 -PREFIX=/usr/local d69 1 a69 1 @@@@ -113,20 +106,20 @@@@ clean: @ 1.10 log @Obey CFLAGS/CPPFLAGS. Link the binaries with the .o's, not the .lo's (libtool assumes that .lo means PIC, which is wrong for an end binary; breaks on Interix where PIC in an end binary is broken) @ text @d3 3 a5 3 --- Makefile.orig Fri Jan 25 18:34:53 2002 +++ Makefile Mon Mar 15 11:42:02 2004 @@@@ -2,43 +2,35 @@@@ d10 3 d15 3 a17 3 AR=ar RANLIB=ranlib -LDFLAGS= a18 1 # Suitably paranoid flags to avoid bugs in gcc-2.7 d20 1 a20 1 -CFLAGS=-Wall -Winline -O2 -fomit-frame-pointer -fno-strength-reduce $(BIGFILES) d64 1 a64 1 + $(LD) $(LDFLAGS) -o libbz2.la $(OBJS) -version-info 0:0 \ d69 1 a69 1 @@@@ -102,20 +94,20 @@@@ @ 1.10.8.1 log @Pullup ticket 516 - requested by Lubomir Sedlacik security update for bzip2 Revisions pulled up: - pkgsrc/archivers/bzip2/PLIST 1.3 - pkgsrc/archivers/bzip2/Makefile 1.39 - pkgsrc/archivers/bzip2/buildlink3.mk 1.17 - pkgsrc/archivers/bzip2/distinfo 1.12 - pkgsrc/archivers/bzip2/patches/patch-aa 1.11 Module Name: pkgsrc Committed By: rillig Date: Mon May 23 06:49:29 UTC 2005 Modified Files: pkgsrc/archivers/bzip2: PLIST Log Message: Sorted PLIST entries to make pkglint happy. ---- Module Name: pkgsrc Committed By: salo Date: Thu May 26 15:03:11 UTC 2005 Modified Files: pkgsrc/archivers/bzip2: Makefile buildlink3.mk distinfo pkgsrc/archivers/bzip2/patches: patch-aa Log Message: Security update to version 1.0.3 - Further robustification against corrupted compressed data. There are currently no known bitstreams which can cause the decompressor to crash, loop or access memory which does not belong to it. If you are using bzip2 or the library to decompress bitstreams from untrusted sources, an upgrade to 1.0.3 is recommended. http://scary.beasts.org/security/CESA-2005-002.txt - The documentation has been converted to XML, from which html and pdf can be derived. - Various minor bugs in the documentation have been fixed. - Fixes for various compilation warnings with newer versions of gcc, and on 64-bit platforms. - The BZ_NO_STDIO cpp symbol was not properly observed in 1.0.2. This has been fixed. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.11 2005/05/26 15:03:11 salo Exp $ d3 3 a5 3 --- Makefile.orig 2005-02-17 12:28:24.000000000 +0100 +++ Makefile 2005-05-26 16:53:13.000000000 +0200 @@@@ -2,42 +2,35 @@@@ a9 3 -AR=ar -RANLIB=ranlib -LDFLAGS= d12 3 a14 3 +#AR=ar +#RANLIB=ranlib +#LDFLAGS= d16 1 d18 1 a18 1 -CFLAGS=-Wall -Winline -O -g $(BIGFILES) d62 1 a62 1 + $(LD) $(LDFLAGS) -o libbz2.la $(OBJS) -version-info 0:0 \ d67 1 a67 1 @@@@ -100,20 +93,20 @@@@ @ 1.9 log @Add RCS tags @ text @d2 4 a5 3 --- Makefile.orig 2002-01-25 17:34:53.000000000 -0600 +++ Makefile 2003-12-05 16:45:09.000000000 -0600 @@@@ -2,43 +2,36 @@@@ a14 1 +LDFLAGS+= d19 1 a19 1 +CFLAGS+=${BZIP_CFLAGS} $(BIGFILES) d23 10 a32 2 - - d45 4 a48 2 - -bzip2recover: bzip2recover.o d50 2 a51 1 - a59 16 +OBJS= blocksort.lo \ + huffman.lo \ + crctable.lo \ + randtable.lo \ + compress.lo \ + decompress.lo \ + bzlib.lo + +all: libbz2.la bzip2 bzip2recover test + +bzip2: libbz2.la bzip2.lo + $(LD) $(CFLAGS) $(LDFLAGS) -static -o bzip2 bzip2.lo libbz2.la + +bzip2recover: bzip2recover.lo + $(LD) $(CFLAGS) $(LDFLAGS) -static -o bzip2recover bzip2recover.lo + d67 1 a67 1 @@@@ -102,24 +95,24 @@@@ d93 1 a93 2 -bzip2.o: bzip2.c +bzip2.lo: bzip2.c a94 5 -bzip2recover.o: bzip2recover.c +bzip2recover.lo: bzip2recover.c $(CC) $(CFLAGS) -c bzip2recover.c DISTNAME=bzip2-1.0.2 @ 1.8 log @Change the makefile patch to be even more libtool friendly to allow this to build on AIX. Essentially: s/.o/.lo/g @ text @d1 1 @ 1.7 log @Use libtool with correct --mode argument. From Ron Roskens in PR 22824. @ text @d1 3 a3 5 $NetBSD: patch-aa,v 1.6 2003/03/18 21:53:30 jschauma Exp $ --- Makefile.orig Sat Jan 26 00:34:53 2002 +++ Makefile Sun Mar 24 14:56:33 2002 @@@@ -2,18 +2,15 @@@@ d18 2 a19 1 - d23 9 a31 8 +CFLAGS+=${BZIP_CFLAGS} $(BIGFILES) OBJS= blocksort.o \ huffman.o \ @@@@ -23,22 +20,18 @@@@ decompress.o \ bzlib.o d33 1 a33 2 +all: libbz2.la bzip2 bzip2recover test d36 2 a37 4 +bzip2: libbz2.la bzip2.o + $(LD) $(CFLAGS) $(LDFLAGS) -static -o bzip2 bzip2.o libbz2.la bzip2recover: bzip2recover.o d39 1 a39 2 + $(LD) $(CFLAGS) $(LDFLAGS) -static -o bzip2recover bzip2recover.o d48 16 d66 1 a66 1 + $(LD) $(LDFLAGS) -o libbz2.la $(OBJS:.o=.lo) -version-info 0:0 \ d71 34 @ 1.6 log @Make this compile on Irix with the MIPSPro compiler by removing gcc-only CFLAGS from a patch iff CC is not gcc. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.5 2002/03/24 14:02:36 mjl Exp $ d10 2 a11 2 +CC=${LIBTOOL} ${REALCC} +LD=${LIBTOOL} ${REALCC} d38 1 a38 1 + $(CC) $(CFLAGS) $(LDFLAGS) -static -o bzip2 bzip2.o libbz2.la d42 1 a42 1 + $(CC) $(CFLAGS) $(LDFLAGS) -static -o bzip2recover bzip2recover.o @ 1.5 log @Update bzip2 to 1.0.2 A bug fix release, addressing various minor issues. * Fix an infinite segfault loop in 1.0.1 when a directory is encountered in -f (force) mode. * Avoid double fclose() of output file on certain I/O error paths. * Don't fail with internal error 1007 when fed a long stream (> 48MB) of byte 251. Also print useful message suggesting that 1007s may be caused by bad memory. * Fix uninitialised variable silly bug in demo prog dlltest.c. * Remove 512-MB limitation on recovered file size for bzip2recover on selected platforms which support 64-bit ints. * Copy file access times correctly. * Dereference symlinks when copying file permissions in -f mode. * Majorly simplify implementation of uInt64_qrm10. * Check the input file still exists before deleting the output one, when aborting in cleanUpAndFail(). * Wrapper scripts (with manpages): bzdiff, bzgrep, bzmore. * Spelling changes and minor enhancements in bzip2.1. * Avoid race condition between creating the output file and setting its interim permissions safely, by using fopen_output_safely(). * do not print senseless report with -v when compressing an empty file. * bzcat -f works on non-bzip2 files. * do not try to escape shell meta-characters on unix (the shell takes care of these). * added --fast and --best aliases for -1 -9 for gzip compatibility. @ text @d1 1 a1 1 $NetBSD$ d24 1 a24 1 +CFLAGS+=-Wall -Winline -fomit-frame-pointer -fno-strength-reduce $(BIGFILES) @ 1.4 log @Honor CFLAGS passed in from environment during build. @ text @d3 4 a6 3 --- Makefile.orig Fri Jun 23 16:34:47 2000 +++ Makefile Fri Jul 13 23:48:52 2001 @@@@ -1,8 +1,9 @@@@ d8 1 a8 1 SHELL=/bin/sh d12 6 d20 4 d28 1 a28 1 @@@@ -12,22 +13,18 @@@@ d36 1 a36 1 - $(CC) $(CFLAGS) -o bzip2 bzip2.o -L. -lbz2 d38 1 a38 1 + $(CC) $(CFLAGS) -static -o bzip2 bzip2.o libbz2.la d41 2 a42 2 - $(CC) $(CFLAGS) -o bzip2recover bzip2recover.o + $(CC) $(CFLAGS) -static -o bzip2recover bzip2recover.o d46 5 a50 5 - ar cq libbz2.a $(OBJS) - @@if ( test -f /usr/bin/ranlib -o -f /bin/ranlib -o \ - -f /usr/ccs/bin/ranlib ) ; then \ - echo ranlib libbz2.a ; \ - ranlib libbz2.a ; \ d54 1 a54 1 + $(LD) $(LDFLAGS) -o libbz2.la $(OBJS:.o=.lo) -version-info 0:0 \ d57 1 a58 10 @@cat words1 @@@@ -44,8 +41,6 @@@@ cmp sample2.tst sample2.ref cmp sample3.tst sample3.ref @@cat words3 - -PREFIX=/usr install: bzip2 bzip2recover if ( test ! -d $(PREFIX)/bin ) ; then mkdir $(PREFIX)/bin ; fi @ 1.3 log @Install the headers and libraries for bzip2, and add a buildlink.mk file for use by other package Makefiles. @ text @d4 2 a5 2 +++ Makefile @@@@ -1,6 +1,7 @@@@ d12 2 a13 1 CFLAGS=-Wall -Winline -O2 -fomit-frame-pointer -fno-strength-reduce $(BIGFILES) d15 2 @ 1.2 log @Update to 1.0.1. @ text @d3 1 a3 1 --- Makefile.orig Fri Jun 23 22:34:47 2000 d5 1 a5 2 @@@@ -15,10 +15,10 @@@@ all: libbz2.a bzip2 bzip2recover test d7 15 a21 1 bzip2: libbz2.a bzip2.o d23 2 a24 1 + $(CC) $(CFLAGS) -static -o bzip2 bzip2.o -L. -lbz2 d30 24 a53 2 libbz2.a: $(OBJS) rm -f libbz2.a @ 1.1 log @Update for bzip2 package to version 0.9.0b created by Geoff C. Wing. @ text @d3 4 a6 3 --- Makefile.orig Wed Sep 9 13:30:41 1998 +++ Makefile Wed Oct 14 23:36:32 1998 @@@@ -14,12 +14,13 @@@@ d8 1 a8 2 bzip2: lib $(CC) $(CFLAGS) -c bzip2.c a9 1 - $(CC) $(CFLAGS) -o bzip2recover bzip2recover.c a10 1 + $(CC) $(CFLAGS) -static -o bzip2recover bzip2recover.c d12 5 a16 1 lib: $(OBJS) a17 15 ar clq libbz2.a $(OBJS) + ranlib libbz2.a test: bzip2 @@cat words1 @@@@ -37,9 +38,6 @@@@ clean: rm -f *.o libbz2.a bzip2 bzip2recover sample1.rb2 sample2.rb2 sample1.tst sample2.tst - -.c.o: $*.o bzlib.h bzlib_private.h - $(CC) $(CFLAGS) -c $*.c -o $*.o tarfile: tar cvf interim.tar *.c *.h Makefile manual.texi manual.ps LICENSE bzip2.1 bzip2.1.preformatted bzip2.txt words1 words2 words3 sample1.ref sample2.ref sample1.bz2 sample2.bz2 *.html README libbz2.def libbz2.dsp dlltest.dsp @