PERFORCE change 138324 for review

Peter Wemm peter at FreeBSD.org
Sun Mar 23 03:42:53 UTC 2008


http://perforce.freebsd.org/chv.cgi?CH=138324

Change 138324 by peter at peter_overcee on 2008/03/23 03:42:26

	IFC @138323

Affected files ...

.. //depot/projects/hammer/bin/sh/options.c#7 integrate
.. //depot/projects/hammer/contrib/bzip2/CHANGES#4 integrate
.. //depot/projects/hammer/contrib/bzip2/FREEBSD-upgrade#4 integrate
.. //depot/projects/hammer/contrib/bzip2/FREEBSD-vendor#1 branch
.. //depot/projects/hammer/contrib/bzip2/LICENSE#4 integrate
.. //depot/projects/hammer/contrib/bzip2/Makefile#4 integrate
.. //depot/projects/hammer/contrib/bzip2/Makefile-libbz2_so#4 integrate
.. //depot/projects/hammer/contrib/bzip2/README#4 integrate
.. //depot/projects/hammer/contrib/bzip2/README.COMPILATION.PROBLEMS#4 integrate
.. //depot/projects/hammer/contrib/bzip2/blocksort.c#4 integrate
.. //depot/projects/hammer/contrib/bzip2/bzip2.c#5 integrate
.. //depot/projects/hammer/contrib/bzip2/bzip2recover.c#4 integrate
.. //depot/projects/hammer/contrib/bzip2/bzlib.c#5 integrate
.. //depot/projects/hammer/contrib/bzip2/bzlib.h#4 integrate
.. //depot/projects/hammer/contrib/bzip2/bzlib_private.h#4 integrate
.. //depot/projects/hammer/contrib/bzip2/compress.c#4 integrate
.. //depot/projects/hammer/contrib/bzip2/crctable.c#4 integrate
.. //depot/projects/hammer/contrib/bzip2/decompress.c#4 integrate
.. //depot/projects/hammer/contrib/bzip2/huffman.c#4 integrate
.. //depot/projects/hammer/contrib/bzip2/randtable.c#4 integrate
.. //depot/projects/hammer/contrib/bzip2/spewG.c#3 integrate
.. //depot/projects/hammer/contrib/bzip2/unzcrash.c#3 integrate
.. //depot/projects/hammer/contrib/cvs/ChangeLog#7 integrate
.. //depot/projects/hammer/contrib/cvs/FAQ#5 integrate
.. //depot/projects/hammer/contrib/cvs/HACKING#5 integrate
.. //depot/projects/hammer/contrib/cvs/INSTALL#7 integrate
.. //depot/projects/hammer/contrib/cvs/Makefile.in#7 integrate
.. //depot/projects/hammer/contrib/cvs/NEWS#7 integrate
.. //depot/projects/hammer/contrib/cvs/README#5 integrate
.. //depot/projects/hammer/contrib/cvs/TODO#6 integrate
.. //depot/projects/hammer/contrib/cvs/aclocal.m4#7 integrate
.. //depot/projects/hammer/contrib/cvs/config.h.in#7 integrate
.. //depot/projects/hammer/contrib/cvs/configure#7 integrate
.. //depot/projects/hammer/contrib/cvs/configure.in#7 integrate
.. //depot/projects/hammer/contrib/cvs/contrib/Makefile.in#6 integrate
.. //depot/projects/hammer/contrib/cvs/depcomp#4 integrate
.. //depot/projects/hammer/contrib/cvs/diff/Makefile.in#7 integrate
.. //depot/projects/hammer/contrib/cvs/doc/ChangeLog#7 integrate
.. //depot/projects/hammer/contrib/cvs/doc/HACKING.DOCS#1 branch
.. //depot/projects/hammer/contrib/cvs/doc/Makefile.in#7 integrate
.. //depot/projects/hammer/contrib/cvs/doc/cvs.1#3 integrate
.. //depot/projects/hammer/contrib/cvs/doc/cvs.texinfo#7 integrate
.. //depot/projects/hammer/contrib/cvs/doc/cvsclient.texi#5 integrate
.. //depot/projects/hammer/contrib/cvs/doc/mdate-sh#2 integrate
.. //depot/projects/hammer/contrib/cvs/doc/mkman.pl#2 integrate
.. //depot/projects/hammer/contrib/cvs/doc/stamp-1#6 integrate
.. //depot/projects/hammer/contrib/cvs/doc/stamp-vti#6 integrate
.. //depot/projects/hammer/contrib/cvs/doc/version-client.texi#6 integrate
.. //depot/projects/hammer/contrib/cvs/doc/version.texi#6 integrate
.. //depot/projects/hammer/contrib/cvs/install-sh#2 integrate
.. //depot/projects/hammer/contrib/cvs/lib/ChangeLog#7 integrate
.. //depot/projects/hammer/contrib/cvs/lib/Makefile.in#7 integrate
.. //depot/projects/hammer/contrib/cvs/lib/xsize.h#2 integrate
.. //depot/projects/hammer/contrib/cvs/man/Makefile.in#7 integrate
.. //depot/projects/hammer/contrib/cvs/missing#2 integrate
.. //depot/projects/hammer/contrib/cvs/mkinstalldirs#2 integrate
.. //depot/projects/hammer/contrib/cvs/src/ChangeLog#7 integrate
.. //depot/projects/hammer/contrib/cvs/src/Makefile.in#6 integrate
.. //depot/projects/hammer/contrib/cvs/src/add.c#6 integrate
.. //depot/projects/hammer/contrib/cvs/src/classify.c#5 integrate
.. //depot/projects/hammer/contrib/cvs/src/client.c#7 integrate
.. //depot/projects/hammer/contrib/cvs/src/client.h#5 integrate
.. //depot/projects/hammer/contrib/cvs/src/cvs.h#7 integrate
.. //depot/projects/hammer/contrib/cvs/src/edit.c#5 integrate
.. //depot/projects/hammer/contrib/cvs/src/edit.h#3 integrate
.. //depot/projects/hammer/contrib/cvs/src/hash.h#4 integrate
.. //depot/projects/hammer/contrib/cvs/src/import.c#6 integrate
.. //depot/projects/hammer/contrib/cvs/src/lock.c#6 integrate
.. //depot/projects/hammer/contrib/cvs/src/log.c#9 integrate
.. //depot/projects/hammer/contrib/cvs/src/login.c#7 integrate
.. //depot/projects/hammer/contrib/cvs/src/main.c#8 integrate
.. //depot/projects/hammer/contrib/cvs/src/mkmodules.c#5 integrate
.. //depot/projects/hammer/contrib/cvs/src/modules.c#6 integrate
.. //depot/projects/hammer/contrib/cvs/src/parseinfo.c#9 integrate
.. //depot/projects/hammer/contrib/cvs/src/rcs.c#8 integrate
.. //depot/projects/hammer/contrib/cvs/src/recurse.c#6 integrate
.. //depot/projects/hammer/contrib/cvs/src/root.c#6 integrate
.. //depot/projects/hammer/contrib/cvs/src/root.h#4 integrate
.. //depot/projects/hammer/contrib/cvs/src/sanity.sh#7 integrate
.. //depot/projects/hammer/contrib/cvs/src/server.c#10 integrate
.. //depot/projects/hammer/contrib/cvs/src/update.c#7 integrate
.. //depot/projects/hammer/contrib/cvs/src/vers_ts.c#7 integrate
.. //depot/projects/hammer/contrib/cvs/tools/Makefile.in#6 integrate
.. //depot/projects/hammer/etc/rc.d/zfs#3 integrate
.. //depot/projects/hammer/gnu/usr.bin/Makefile#18 integrate
.. //depot/projects/hammer/gnu/usr.bin/cvs/lib/Makefile#10 integrate
.. //depot/projects/hammer/gnu/usr.bin/cvs/lib/config.h.proto#3 integrate
.. //depot/projects/hammer/include/pthread.h#14 integrate
.. //depot/projects/hammer/include/time.h#7 integrate
.. //depot/projects/hammer/lib/libarchive/Makefile#48 integrate
.. //depot/projects/hammer/lib/libelf/elf_update.3#4 integrate
.. //depot/projects/hammer/lib/libelf/elf_update.c#4 integrate
.. //depot/projects/hammer/lib/libfetch/common.c#12 integrate
.. //depot/projects/hammer/lib/libsdp/sdp.h#7 integrate
.. //depot/projects/hammer/lib/libthr/pthread.map#19 integrate
.. //depot/projects/hammer/lib/libthr/thread/Makefile.inc#16 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_affinity.c#2 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_create.c#26 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_getcpuclockid.c#1 branch
.. //depot/projects/hammer/lib/libthr/thread/thr_mutexattr.c#8 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_rtld.c#4 integrate
.. //depot/projects/hammer/lib/libthread_db/libc_r_db.c#4 integrate
.. //depot/projects/hammer/lib/libthread_db/libpthread_db.c#9 integrate
.. //depot/projects/hammer/lib/libthread_db/libthr_db.c#9 integrate
.. //depot/projects/hammer/lib/libthread_db/thread_db.c#5 integrate
.. //depot/projects/hammer/sbin/devd/token.l#6 integrate
.. //depot/projects/hammer/sbin/dhclient/dhclient.c#14 integrate
.. //depot/projects/hammer/sbin/newfs/newfs.8#15 integrate
.. //depot/projects/hammer/sbin/route/route.c#14 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/streams.4#5 integrate
.. //depot/projects/hammer/share/mk/bsd.cpu.mk#35 integrate
.. //depot/projects/hammer/sys/amd64/amd64/nexus.c#45 integrate
.. //depot/projects/hammer/sys/amd64/isa/atpic.c#60 integrate
.. //depot/projects/hammer/sys/arm/arm/elf_trampoline.c#10 integrate
.. //depot/projects/hammer/sys/arm/conf/AVILA#9 integrate
.. //depot/projects/hammer/sys/arm/conf/AVILA.hints#2 integrate
.. //depot/projects/hammer/sys/arm/xscale/ixp425/if_npe.c#7 integrate
.. //depot/projects/hammer/sys/arm/xscale/ixp425/ixdp425_pci.c#2 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_futex.c#6 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_futex.h#3 integrate
.. //depot/projects/hammer/sys/conf/NOTES#139 integrate
.. //depot/projects/hammer/sys/conf/files#176 integrate
.. //depot/projects/hammer/sys/conf/options#125 integrate
.. //depot/projects/hammer/sys/dev/aac/aac.c#45 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-raid.c#41 integrate
.. //depot/projects/hammer/sys/dev/ath/if_ath.c#57 integrate
.. //depot/projects/hammer/sys/dev/cxgb/cxgb_main.c#18 integrate
.. //depot/projects/hammer/sys/dev/cxgb/cxgb_offload.h#8 integrate
.. //depot/projects/hammer/sys/dev/cxgb/cxgb_sge.c#18 integrate
.. //depot/projects/hammer/sys/dev/drm/drm_pciids.h#8 integrate
.. //depot/projects/hammer/sys/dev/drm/i915_dma.c#7 integrate
.. //depot/projects/hammer/sys/dev/fxp/if_fxp.c#65 integrate
.. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_amd.c#11 integrate
.. //depot/projects/hammer/sys/dev/mfi/mfi.c#12 integrate
.. //depot/projects/hammer/sys/dev/syscons/syscons.c#45 integrate
.. //depot/projects/hammer/sys/dev/usb/ehci.c#33 integrate
.. //depot/projects/hammer/sys/dev/usb/if_rum.c#7 integrate
.. //depot/projects/hammer/sys/dev/usb/ohci.c#28 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdevs#97 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdi.c#19 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdi.h#15 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdivar.h#11 integrate
.. //depot/projects/hammer/sys/fs/devfs/devfs_rule.c#14 integrate
.. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vfsops.c#52 integrate
.. //depot/projects/hammer/sys/geom/geom.h#39 integrate
.. //depot/projects/hammer/sys/geom/geom_subr.c#38 integrate
.. //depot/projects/hammer/sys/geom/part/g_part.c#11 integrate
.. //depot/projects/hammer/sys/geom/part/g_part.h#7 integrate
.. //depot/projects/hammer/sys/geom/part/g_part_apm.c#5 integrate
.. //depot/projects/hammer/sys/geom/part/g_part_bsd.c#4 integrate
.. //depot/projects/hammer/sys/geom/part/g_part_gpt.c#6 integrate
.. //depot/projects/hammer/sys/geom/part/g_part_mbr.c#3 integrate
.. //depot/projects/hammer/sys/geom/part/g_part_vtoc8.c#2 integrate
.. //depot/projects/hammer/sys/geom/vinum/geom_vinum_drive.c#19 integrate
.. //depot/projects/hammer/sys/i386/i386/nexus.c#25 integrate
.. //depot/projects/hammer/sys/i386/include/nexusvar.h#4 branch
.. //depot/projects/hammer/sys/i386/isa/atpic.c#22 integrate
.. //depot/projects/hammer/sys/kern/bus_if.m#11 integrate
.. //depot/projects/hammer/sys/kern/kern_cpuset.c#2 integrate
.. //depot/projects/hammer/sys/kern/kern_descrip.c#78 integrate
.. //depot/projects/hammer/sys/kern/kern_exit.c#72 integrate
.. //depot/projects/hammer/sys/kern/kern_fork.c#70 integrate
.. //depot/projects/hammer/sys/kern/kern_kthread.c#16 integrate
.. //depot/projects/hammer/sys/kern/kern_lockf.c#17 integrate
.. //depot/projects/hammer/sys/kern/kern_proc.c#67 integrate
.. //depot/projects/hammer/sys/kern/kern_resource.c#40 integrate
.. //depot/projects/hammer/sys/kern/kern_sig.c#89 integrate
.. //depot/projects/hammer/sys/kern/kern_switch.c#61 integrate
.. //depot/projects/hammer/sys/kern/kern_thr.c#41 integrate
.. //depot/projects/hammer/sys/kern/kern_thread.c#106 integrate
.. //depot/projects/hammer/sys/kern/kern_timeout.c#29 integrate
.. //depot/projects/hammer/sys/kern/sched_4bsd.c#59 integrate
.. //depot/projects/hammer/sys/kern/sched_ule.c#94 integrate
.. //depot/projects/hammer/sys/kern/subr_bus.c#59 integrate
.. //depot/projects/hammer/sys/kern/subr_sleepqueue.c#29 integrate
.. //depot/projects/hammer/sys/kern/subr_trap.c#43 integrate
.. //depot/projects/hammer/sys/kern/sys_generic.c#39 integrate
.. //depot/projects/hammer/sys/kern/sys_process.c#44 integrate
.. //depot/projects/hammer/sys/kern/tty.c#57 integrate
.. //depot/projects/hammer/sys/kern/uipc_socket.c#79 integrate
.. //depot/projects/hammer/sys/kern/vfs_bio.c#87 integrate
.. //depot/projects/hammer/sys/kern/vfs_cluster.c#36 integrate
.. //depot/projects/hammer/sys/kern/vfs_default.c#54 integrate
.. //depot/projects/hammer/sys/kern/vfs_subr.c#127 integrate
.. //depot/projects/hammer/sys/modules/geom/geom_part/Makefile#2 integrate
.. //depot/projects/hammer/sys/modules/geom/geom_part/geom_part_apm/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/geom/geom_part/geom_part_bsd/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/geom/geom_part/geom_part_gpt/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/geom/geom_part/geom_part_mbr/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/geom/geom_part/geom_part_vtoc8/Makefile#1 branch
.. //depot/projects/hammer/sys/net/if_ethersubr.c#71 integrate
.. //depot/projects/hammer/sys/net/if_gre.c#35 integrate
.. //depot/projects/hammer/sys/netgraph/ng_tee.c#11 integrate
.. //depot/projects/hammer/sys/netinet/libalias/alias_irc.c#8 integrate
.. //depot/projects/hammer/sys/netipsec/xform_tcp.c#5 integrate
.. //depot/projects/hammer/sys/nfs4client/nfs4_vfsops.c#26 integrate
.. //depot/projects/hammer/sys/nfs4client/nfs4_vnops.c#30 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_subs.c#34 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_vfsops.c#55 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_vnops.c#58 integrate
.. //depot/projects/hammer/sys/nfsserver/nfs_serv.c#40 integrate
.. //depot/projects/hammer/sys/nfsserver/nfs_srvsock.c#24 integrate
.. //depot/projects/hammer/sys/sparc64/include/atomic.h#7 integrate
.. //depot/projects/hammer/sys/sun4v/include/atomic.h#3 integrate
.. //depot/projects/hammer/sys/sun4v/sun4v/intr_machdep.c#6 integrate
.. //depot/projects/hammer/sys/sys/aac_ioctl.h#2 integrate
.. //depot/projects/hammer/sys/sys/buf.h#36 integrate
.. //depot/projects/hammer/sys/sys/bufobj.h#11 integrate
.. //depot/projects/hammer/sys/sys/bus.h#27 integrate
.. //depot/projects/hammer/sys/sys/eventhandler.h#13 integrate
.. //depot/projects/hammer/sys/sys/proc.h#117 integrate
.. //depot/projects/hammer/sys/sys/runq.h#6 integrate
.. //depot/projects/hammer/sys/sys/sched.h#26 integrate
.. //depot/projects/hammer/sys/sys/sysctl.h#40 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_inode.c#20 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_rawread.c#23 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_snapshot.c#53 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_softdep.c#52 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#73 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_vnops.c#50 integrate
.. //depot/projects/hammer/sys/vm/vm_glue.c#51 integrate
.. //depot/projects/hammer/sys/vm/vm_meter.c#25 integrate
.. //depot/projects/hammer/sys/vm/vm_mmap.c#51 integrate
.. //depot/projects/hammer/sys/vm/vm_page.c#70 integrate
.. //depot/projects/hammer/sys/vm/vm_page.h#32 integrate
.. //depot/projects/hammer/sys/vm/vm_pageout.c#49 integrate
.. //depot/projects/hammer/tools/regression/bin/sh/builtins/getopts1.0#1 branch
.. //depot/projects/hammer/tools/regression/bin/sh/builtins/getopts1.0.stdout#1 branch
.. //depot/projects/hammer/tools/tools/README#26 integrate
.. //depot/projects/hammer/tools/tools/mctest/mctest.cc#1 branch
.. //depot/projects/hammer/tools/tools/mctest/mctest.h#1 branch
.. //depot/projects/hammer/tools/tools/net80211/wlanwatch/wlanwatch.c#4 integrate
.. //depot/projects/hammer/tools/tools/tinybsd/tinybsd#4 integrate
.. //depot/projects/hammer/tools/tools/track/Makefile#1 branch
.. //depot/projects/hammer/tools/tools/track/track.sh#1 branch
.. //depot/projects/hammer/usr.bin/ktrace/ktrace.c#5 integrate
.. //depot/projects/hammer/usr.bin/netstat/inet6.c#10 integrate
.. //depot/projects/hammer/usr.sbin/arp/arp.8#8 integrate
.. //depot/projects/hammer/usr.sbin/arp/arp.c#18 integrate
.. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/gn.c#2 integrate
.. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/lan.c#2 integrate
.. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/nap.c#2 integrate
.. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/panu.c#2 integrate
.. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/profile.c#4 integrate
.. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/profile.h#3 integrate
.. //depot/projects/hammer/usr.sbin/fifolog/lib/fifolog_int.c#2 integrate
.. //depot/projects/hammer/usr.sbin/fifolog/lib/fifolog_write_poll.c#2 integrate

Differences ...

==== //depot/projects/hammer/bin/sh/options.c#7 (text+ko) ====

@@ -36,7 +36,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/options.c,v 1.25 2006/04/09 12:20:42 stefanf Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/options.c,v 1.26 2008/03/22 14:06:01 stefanf Exp $");
 
 #include <signal.h>
 #include <unistd.h>
@@ -383,7 +383,7 @@
 	}
 	ap2 = shellparam.p;
 	while ((*ap2++ = *ap1++) != NULL);
-	shellparam.optnext = NULL;
+	shellparam.reset = 1;
 	INTON;
 	return 0;
 }
@@ -405,6 +405,7 @@
 	if (*argptr != NULL) {
 		setparam(argptr);
 	}
+	shellparam.reset = 1;
 	INTON;
 	return 0;
 }
@@ -414,7 +415,6 @@
 getoptsreset(const char *value)
 {
 	if (number(value) == 1) {
-		shellparam.optnext = NULL;
 		shellparam.reset = 1;
 	}
 }

==== //depot/projects/hammer/contrib/bzip2/CHANGES#4 (text+ko) ====

@@ -2,8 +2,8 @@
  This file is part of bzip2/libbzip2, a program and library for
  lossless, block-sorting data compression.
 
- bzip2/libbzip2 version 1.0.4 of 20 December 2006
- Copyright (C) 1996-2006 Julian Seward <jseward at bzip.org>
+ bzip2/libbzip2 version 1.0.5 of 10 December 2007
+ Copyright (C) 1996-2007 Julian Seward <jseward at bzip.org>
 
  Please read the WARNING, DISCLAIMER and PATENTS sections in the 
  README file.
@@ -312,3 +312,8 @@
 
 * Fix minor doc/comment bugs.
 
+
+1.0.5 (10 Dec 07)
+~~~~~~~~~~~~~~~~~
+Security fix only.  Fixes CERT-FI 20469 as it applies to bzip2.
+

==== //depot/projects/hammer/contrib/bzip2/FREEBSD-upgrade#4 (text+ko) ====

@@ -1,12 +1,12 @@
-$FreeBSD: src/contrib/bzip2/FREEBSD-upgrade,v 1.4 2007/03/30 16:33:05 delphij Exp $
+$FreeBSD: src/contrib/bzip2/FREEBSD-upgrade,v 1.5 2008/03/20 02:45:32 delphij Exp $
 
 Julian Seward's bzip2
 	originals can be found at: 	http://www.bzip.org/downloads.html
 
 Imported by:
 
-	cvs import -m "Virgin import (trimmed) of Bzip2 version 1.0.4." \
-		src/contrib/bzip2 BZIP2 v1_0_4
+	cvs import -m "Virgin import (trimmed) of Bzip2 version 1.0.5." \
+		src/contrib/bzip2 BZIP2 v1_0_5
 
 Notes:
 	The following log shows details of trimming:

==== //depot/projects/hammer/contrib/bzip2/LICENSE#4 (text+ko) ====

@@ -2,7 +2,7 @@
 --------------------------------------------------------------------------
 
 This program, "bzip2", the associated library "libbzip2", and all
-documentation, are copyright (C) 1996-2006 Julian R Seward.  All
+documentation, are copyright (C) 1996-2007 Julian R Seward.  All
 rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -36,8 +36,7 @@
 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-Julian Seward, Cambridge, UK.
-jseward at bzip.org
-bzip2/libbzip2 version 1.0.4 of 20 December 2006
+Julian Seward, jseward at bzip.org
+bzip2/libbzip2 version 1.0.5 of 10 December 2007
 
 --------------------------------------------------------------------------

==== //depot/projects/hammer/contrib/bzip2/Makefile#4 (text+ko) ====

@@ -2,8 +2,8 @@
 # This file is part of bzip2/libbzip2, a program and library for
 # lossless, block-sorting data compression.
 #
-# bzip2/libbzip2 version 1.0.4 of 20 December 2006
-# Copyright (C) 1996-2006 Julian Seward <jseward at bzip.org>
+# bzip2/libbzip2 version 1.0.5 of 10 December 2007
+# Copyright (C) 1996-2007 Julian Seward <jseward at bzip.org>
 #
 # Please read the WARNING, DISCLAIMER and PATENTS sections in the 
 # README file.
@@ -137,7 +137,7 @@
 distclean: clean
 	rm -f manual.ps manual.html manual.pdf
 
-DISTNAME=bzip2-1.0.4
+DISTNAME=bzip2-1.0.5
 dist: check manual
 	rm -f $(DISTNAME)
 	ln -s -f . $(DISTNAME)

==== //depot/projects/hammer/contrib/bzip2/Makefile-libbz2_so#4 (text+ko) ====

@@ -10,8 +10,8 @@
 # This file is part of bzip2/libbzip2, a program and library for
 # lossless, block-sorting data compression.
 #
-# bzip2/libbzip2 version 1.0.4 of 20 December 2006
-# Copyright (C) 1996-2006 Julian Seward <jseward at bzip.org>
+# bzip2/libbzip2 version 1.0.5 of 10 December 2007
+# Copyright (C) 1996-2007 Julian Seward <jseward at bzip.org>
 #
 # Please read the WARNING, DISCLAIMER and PATENTS sections in the 
 # README file.

==== //depot/projects/hammer/contrib/bzip2/README#4 (text+ko) ====

@@ -6,8 +6,8 @@
 This file is part of bzip2/libbzip2, a program and library for
 lossless, block-sorting data compression.
 
-bzip2/libbzip2 version 1.0.4 of 20 December 2006
-Copyright (C) 1996-2006 Julian Seward <jseward at bzip.org>
+bzip2/libbzip2 version 1.0.5 of 10 December 2007
+Copyright (C) 1996-2007 Julian Seward <jseward at bzip.org>
 
 Please read the WARNING, DISCLAIMER and PATENTS sections in this file.
 
@@ -177,7 +177,11 @@
 
    See the CHANGES file.
 
+WHAT'S NEW IN 1.0.5 ?
 
+   See the CHANGES file.
+
+
 I hope you find bzip2 useful.  Feel free to contact me at
    jseward at bzip.org
 if you have any suggestions or queries.  Many people mailed me with
@@ -203,3 +207,4 @@
 30 December 2001 (bzip2, version 1.0.2pre1)
 15 February 2005 (bzip2, version 1.0.3)
 20 December 2006 (bzip2, version 1.0.4)
+10 December 2007 (bzip2, version 1.0.5)

==== //depot/projects/hammer/contrib/bzip2/README.COMPILATION.PROBLEMS#4 (text+ko) ====

@@ -2,8 +2,8 @@
 This file is part of bzip2/libbzip2, a program and library for
 lossless, block-sorting data compression.
 
-bzip2/libbzip2 version 1.0.4 of 20 December 2006
-Copyright (C) 1996-2006 Julian Seward <jseward at bzip.org>
+bzip2/libbzip2 version 1.0.5 of 10 December 2007
+Copyright (C) 1996-2007 Julian Seward <jseward at bzip.org>
 
 Please read the WARNING, DISCLAIMER and PATENTS sections in the 
 README file.
@@ -12,7 +12,7 @@
 in the file LICENSE.
 ------------------------------------------------------------------
 
-bzip2-1.0.4 should compile without problems on the vast majority of
+bzip2-1.0.5 should compile without problems on the vast majority of
 platforms.  Using the supplied Makefile, I've built and tested it
 myself for x86-linux and amd64-linux.  With makefile.msc, Visual C++
 6.0 and nmake, you can build a native Win32 version too.  Large file

==== //depot/projects/hammer/contrib/bzip2/blocksort.c#4 (text+ko) ====

@@ -8,8 +8,8 @@
    This file is part of bzip2/libbzip2, a program and library for
    lossless, block-sorting data compression.
 
-   bzip2/libbzip2 version 1.0.4 of 20 December 2006
-   Copyright (C) 1996-2006 Julian Seward <jseward at bzip.org>
+   bzip2/libbzip2 version 1.0.5 of 10 December 2007
+   Copyright (C) 1996-2007 Julian Seward <jseward at bzip.org>
 
    Please read the WARNING, DISCLAIMER and PATENTS sections in the 
    README file.

==== //depot/projects/hammer/contrib/bzip2/bzip2.c#5 (text+ko) ====

@@ -7,8 +7,8 @@
    This file is part of bzip2/libbzip2, a program and library for
    lossless, block-sorting data compression.
 
-   bzip2/libbzip2 version 1.0.4 of 20 December 2006
-   Copyright (C) 1996-2006 Julian Seward <jseward at bzip.org>
+   bzip2/libbzip2 version 1.0.5 of 10 December 2007
+   Copyright (C) 1996-2007 Julian Seward <jseward at bzip.org>
 
    Please read the WARNING, DISCLAIMER and PATENTS sections in the 
    README file.
@@ -1605,11 +1605,11 @@
     "bzip2, a block-sorting file compressor.  "
     "Version %s.\n"
     "   \n"
-    "   Copyright (C) 1996-2006 by Julian Seward.\n"
+    "   Copyright (C) 1996-2007 by Julian Seward.\n"
     "   \n"
     "   This program is free software; you can redistribute it and/or modify\n"
     "   it under the terms set out in the LICENSE file, which is included\n"
-    "   in the bzip2-1.0.4 source distribution.\n"
+    "   in the bzip2-1.0.5 source distribution.\n"
     "   \n"
     "   This program is distributed in the hope that it will be useful,\n"
     "   but WITHOUT ANY WARRANTY; without even the implied warranty of\n"

==== //depot/projects/hammer/contrib/bzip2/bzip2recover.c#4 (text+ko) ====

@@ -7,8 +7,8 @@
    This file is part of bzip2/libbzip2, a program and library for
    lossless, block-sorting data compression.
 
-   bzip2/libbzip2 version 1.0.4 of 20 December 2006
-   Copyright (C) 1996-2006 Julian Seward <jseward at bzip.org>
+   bzip2/libbzip2 version 1.0.5 of 10 December 2007
+   Copyright (C) 1996-2007 Julian Seward <jseward at bzip.org>
 
    Please read the WARNING, DISCLAIMER and PATENTS sections in the 
    README file.
@@ -313,7 +313,7 @@
    inFileName[0] = outFileName[0] = 0;
 
    fprintf ( stderr, 
-             "bzip2recover 1.0.4: extracts blocks from damaged .bz2 files.\n" );
+             "bzip2recover 1.0.5: extracts blocks from damaged .bz2 files.\n" );
 
    if (argc != 2) {
       fprintf ( stderr, "%s: usage is `%s damaged_file_name'.\n",

==== //depot/projects/hammer/contrib/bzip2/bzlib.c#5 (text+ko) ====

@@ -8,8 +8,8 @@
    This file is part of bzip2/libbzip2, a program and library for
    lossless, block-sorting data compression.
 
-   bzip2/libbzip2 version 1.0.4 of 20 December 2006
-   Copyright (C) 1996-2006 Julian Seward <jseward at bzip.org>
+   bzip2/libbzip2 version 1.0.5 of 10 December 2007
+   Copyright (C) 1996-2007 Julian Seward <jseward at bzip.org>
 
    Please read the WARNING, DISCLAIMER and PATENTS sections in the 
    README file.
@@ -29,7 +29,7 @@
 */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/contrib/bzip2/bzlib.c,v 1.3 2007/03/28 07:46:20 delphij Exp $");
+__FBSDID("$FreeBSD: src/contrib/bzip2/bzlib.c,v 1.4 2008/03/20 02:56:24 delphij Exp $");
 
 #include "bzlib_private.h"
 
@@ -52,7 +52,7 @@
       "component, you should also report this bug to the author(s)\n"
       "of that program.  Please make an effort to report this bug;\n"
       "timely and accurate bug reports eventually lead to higher\n"
-      "quality software.  Thanks.  Julian Seward, 15 February 2005.\n\n",
+      "quality software.  Thanks.  Julian Seward, 10 December 2007.\n\n",
       errcode,
       BZ2_bzlibVersion()
    );
@@ -605,6 +605,7 @@
       UInt32        c_tPos               = s->tPos;
       char*         cs_next_out          = s->strm->next_out;
       unsigned int  cs_avail_out         = s->strm->avail_out;
+      Int32         ro_blockSize100k     = s->blockSize100k;
       /* end restore */
 
       UInt32       avail_out_INIT = cs_avail_out;

==== //depot/projects/hammer/contrib/bzip2/bzlib.h#4 (text+ko) ====

@@ -8,8 +8,8 @@
    This file is part of bzip2/libbzip2, a program and library for
    lossless, block-sorting data compression.
 
-   bzip2/libbzip2 version 1.0.4 of 20 December 2006
-   Copyright (C) 1996-2006 Julian Seward <jseward at bzip.org>
+   bzip2/libbzip2 version 1.0.5 of 10 December 2007
+   Copyright (C) 1996-2007 Julian Seward <jseward at bzip.org>
 
    Please read the WARNING, DISCLAIMER and PATENTS sections in the 
    README file.

==== //depot/projects/hammer/contrib/bzip2/bzlib_private.h#4 (text+ko) ====

@@ -8,8 +8,8 @@
    This file is part of bzip2/libbzip2, a program and library for
    lossless, block-sorting data compression.
 
-   bzip2/libbzip2 version 1.0.4 of 20 December 2006
-   Copyright (C) 1996-2006 Julian Seward <jseward at bzip.org>
+   bzip2/libbzip2 version 1.0.5 of 10 December 2007
+   Copyright (C) 1996-2007 Julian Seward <jseward at bzip.org>
 
    Please read the WARNING, DISCLAIMER and PATENTS sections in the 
    README file.
@@ -36,7 +36,7 @@
 
 /*-- General stuff. --*/
 
-#define BZ_VERSION  "1.0.4, 20-Dec-2006"
+#define BZ_VERSION  "1.0.5, 10-Dec-2007"
 
 typedef char            Char;
 typedef unsigned char   Bool;
@@ -442,11 +442,15 @@
 /*-- Macros for decompression. --*/
 
 #define BZ_GET_FAST(cccc)                     \
+    /* c_tPos is unsigned, hence test < 0 is pointless. */ \
+    if (s->tPos >= (UInt32)100000 * (UInt32)s->blockSize100k) return True; \
     s->tPos = s->tt[s->tPos];                 \
     cccc = (UChar)(s->tPos & 0xff);           \
     s->tPos >>= 8;
 
 #define BZ_GET_FAST_C(cccc)                   \
+    /* c_tPos is unsigned, hence test < 0 is pointless. */ \
+    if (c_tPos >= (UInt32)100000 * (UInt32)ro_blockSize100k) return True; \
     c_tPos = c_tt[c_tPos];                    \
     cccc = (UChar)(c_tPos & 0xff);            \
     c_tPos >>= 8;
@@ -469,8 +473,10 @@
    (((UInt32)s->ll16[i]) | (GET_LL4(i) << 16))
 
 #define BZ_GET_SMALL(cccc)                            \
-      cccc = BZ2_indexIntoF ( s->tPos, s->cftab );    \
-      s->tPos = GET_LL(s->tPos);
+    /* c_tPos is unsigned, hence test < 0 is pointless. */ \
+    if (s->tPos >= (UInt32)100000 * (UInt32)s->blockSize100k) return True; \
+    cccc = BZ2_indexIntoF ( s->tPos, s->cftab );    \
+    s->tPos = GET_LL(s->tPos);
 
 
 /*-- externs for decompression. --*/

==== //depot/projects/hammer/contrib/bzip2/compress.c#4 (text+ko) ====

@@ -8,8 +8,8 @@
    This file is part of bzip2/libbzip2, a program and library for
    lossless, block-sorting data compression.
 
-   bzip2/libbzip2 version 1.0.4 of 20 December 2006
-   Copyright (C) 1996-2006 Julian Seward <jseward at bzip.org>
+   bzip2/libbzip2 version 1.0.5 of 10 December 2007
+   Copyright (C) 1996-2007 Julian Seward <jseward at bzip.org>
 
    Please read the WARNING, DISCLAIMER and PATENTS sections in the 
    README file.

==== //depot/projects/hammer/contrib/bzip2/crctable.c#4 (text+ko) ====

@@ -8,8 +8,8 @@
    This file is part of bzip2/libbzip2, a program and library for
    lossless, block-sorting data compression.
 
-   bzip2/libbzip2 version 1.0.4 of 20 December 2006
-   Copyright (C) 1996-2006 Julian Seward <jseward at bzip.org>
+   bzip2/libbzip2 version 1.0.5 of 10 December 2007
+   Copyright (C) 1996-2007 Julian Seward <jseward at bzip.org>
 
    Please read the WARNING, DISCLAIMER and PATENTS sections in the 
    README file.

==== //depot/projects/hammer/contrib/bzip2/decompress.c#4 (text+ko) ====

@@ -8,8 +8,8 @@
    This file is part of bzip2/libbzip2, a program and library for
    lossless, block-sorting data compression.
 
-   bzip2/libbzip2 version 1.0.4 of 20 December 2006
-   Copyright (C) 1996-2006 Julian Seward <jseward at bzip.org>
+   bzip2/libbzip2 version 1.0.5 of 10 December 2007
+   Copyright (C) 1996-2007 Julian Seward <jseward at bzip.org>
 
    Please read the WARNING, DISCLAIMER and PATENTS sections in the 
    README file.

==== //depot/projects/hammer/contrib/bzip2/huffman.c#4 (text+ko) ====

@@ -8,8 +8,8 @@
    This file is part of bzip2/libbzip2, a program and library for
    lossless, block-sorting data compression.
 
-   bzip2/libbzip2 version 1.0.4 of 20 December 2006
-   Copyright (C) 1996-2006 Julian Seward <jseward at bzip.org>
+   bzip2/libbzip2 version 1.0.5 of 10 December 2007
+   Copyright (C) 1996-2007 Julian Seward <jseward at bzip.org>
 
    Please read the WARNING, DISCLAIMER and PATENTS sections in the 
    README file.

==== //depot/projects/hammer/contrib/bzip2/randtable.c#4 (text+ko) ====

@@ -8,8 +8,8 @@
    This file is part of bzip2/libbzip2, a program and library for
    lossless, block-sorting data compression.
 
-   bzip2/libbzip2 version 1.0.4 of 20 December 2006
-   Copyright (C) 1996-2006 Julian Seward <jseward at bzip.org>
+   bzip2/libbzip2 version 1.0.5 of 10 December 2007
+   Copyright (C) 1996-2007 Julian Seward <jseward at bzip.org>
 
    Please read the WARNING, DISCLAIMER and PATENTS sections in the 
    README file.

==== //depot/projects/hammer/contrib/bzip2/spewG.c#3 (text+ko) ====

@@ -13,8 +13,8 @@
    This file is part of bzip2/libbzip2, a program and library for
    lossless, block-sorting data compression.
 
-   bzip2/libbzip2 version 1.0.4 of 20 December 2006
-   Copyright (C) 1996-2006 Julian Seward <jseward at bzip.org>
+   bzip2/libbzip2 version 1.0.5 of 10 December 2007
+   Copyright (C) 1996-2007 Julian Seward <jseward at bzip.org>
 
    Please read the WARNING, DISCLAIMER and PATENTS sections in the 
    README file.

==== //depot/projects/hammer/contrib/bzip2/unzcrash.c#3 (text+ko) ====

@@ -17,8 +17,8 @@
    This file is part of bzip2/libbzip2, a program and library for
    lossless, block-sorting data compression.
 
-   bzip2/libbzip2 version 1.0.4 of 20 December 2006
-   Copyright (C) 1996-2006 Julian Seward <jseward at bzip.org>
+   bzip2/libbzip2 version 1.0.5 of 10 December 2007
+   Copyright (C) 1996-2007 Julian Seward <jseward at bzip.org>
 
    Please read the WARNING, DISCLAIMER and PATENTS sections in the 
    README file.

==== //depot/projects/hammer/contrib/cvs/ChangeLog#7 (text+ko) ====

@@ -1,3 +1,96 @@
+2008-03-10  Mark D. Baushke  <mdb at gnu.org>
+
+	* NEWS: Note new IgnoreUnknownConfigKeys CVSROOT/config option.
+
+2008-01-30  Derek Price  <derek at ximbiot.com>
+
+	* NEWS: Note improved join of removals.
+
+2008-01-27  Mark D. Baushke  <mdb at gnu.org>
+
+	* configure.in: Look for lshc rather than lsh to avoid problems
+	under Debian GNU/Linux.
+	* configure: Regenerated.
+
+	* configure.in: Add support for --with-ssh and CVS_SSH.
+	* NEWS: Note that :extssh: looks to CVS_SSH rather tha CVS_RSH.
+	* Makefile.in, config.h.in, configure: Regenerated.
+
+2008-01-24  Mark D. Baushke  <mdb at gnu.org>
+
+	* NEWS: Note that :extssh: method was fixed. New `cvs blame' as an
+	alias for `cvs annotate' command. New `cvs log -n' switch to undo
+	a `log -N' entry in a .cvsrc file.
+
+2007-12-14  Larry Jones  <lawrence.jones at siemens.com>
+
+	* configure.in: Add --disable-mmap.
+	* configure: Regenerated.
+
+2007-10-19  Derek Price  <derek at ximbiot.com>
+
+	* cvs.texinfo: Update Ximbiot's address and Copyright dates.
+
+2007-08-22  Derek Price  <derek at ximbiot.com>
+
+	* NEWS: Note `cvs server' accepts `--allow-root=PATH'.  Note further
+	`cvs add' stops for `CVS' dirs.
+
+	* HACKING, NEWS: Note new Autotool versions.
+
+2007-08-16  Derek Price  <derek at ximbiot.com>
+
+	* NEWS: Note backport of `cvs --allow-root=PATH server'.
+
+2007-06-18  Derek Price  <derek at ximbiot.com>
+
+	* NEWS: Note import now keeps metadata to itself.
+
+2007-06-15  Derek Price  <derek at ximbiot.com>
+
+	* NEWS: Note `cvs import CVS-/CVS' fix.
+
+2007-05-07  Derek Price  <derek at ximbiot.com>
+
+	* NEWS: Note removal of remote `cvs init'.
+
+2006-09-06  Derek Price  <derek at ximbiot.com>
+
+	* NEWS: Note apply_rcs_diff speedup.
+
+2006-08-28  Derek Price  <derek at ximbiot.com>
+
+	* NEWS: Note strstr ("/./") assertion fix.
+
+2006-08-25  Derek Price  <derek at ximbiot.com>
+
+	* TODO (216): Removed.
+
+2006-08-24  Derek Price  <derek at ximbiot.com>
+
+	[bug #17032]
+	* NEWS: Note patch w/Name keyword fix.
+
+2006-07-17  Derek Price  <derek at ximbiot.com>
+
+	* FAQ, INSTALL, README: Update Copyright notice.
+	* HACKING: Ditto. Update Savannah URLs.
+
+2006-06-29  Derek Price  <derek at ximbiot.com>
+
+	* NEWS: Note trailing slash fix.
+
+2006-06-28  Larry Jones  <lawrence.jones at ugs.com>
+
+	* HACKING, NEWS: Note new Autoconf version.
+	* configure.in (AC_PREREQ): Require Autoconf 2.60.
+	* config.h.in, configure, **/Makefile.in: Regenerated.
+
+2006-06-28  Derek Price  <derek at ximbiot.com>
+
+	[bug #16961]
+	* NEWS: Note double-free fix.
+
 2006-06-09  Derek Price  <derek at ximbiot.com>
 
 	* NEWS: Note client/server conflict fix.

==== //depot/projects/hammer/contrib/cvs/FAQ#5 (text+ko) ====

@@ -1,6 +1,6 @@
 -------------------------------------------------------------------------------
 
-   CVS is Copyright (C) 1989-2005 The Free Software Foundation, Inc.
+   CVS is Copyright (C) 1986-2006 The Free Software Foundation, Inc.
 
    CVS is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

==== //depot/projects/hammer/contrib/cvs/HACKING#5 (text+ko) ====

@@ -2,7 +2,7 @@
 
 * License of CVS
 
-    CVS is Copyright (C) 1989-2005 The Free Software Foundation, Inc.
+    CVS is Copyright (C) 1986-2006 The Free Software Foundation, Inc.
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -23,7 +23,10 @@
 
 Patches against the development version of CVS are most likely to be accepted:
 
-    $ CVS_RSH=ssh cvs -d:ext:anoncvs at savannah.nongnu.org:/cvsroot/cvs co ccvs
+	$ cvs -z3 -d:pserver:anonymous at cvs.sv.nongnu.org:/sources/cvs co ccvs
+
+See the Savannah sources page <http://savannah.nongnu.org/cvs/?group=cvs> for
+more information.
 
 * Compiler options
 
@@ -145,8 +148,8 @@
 automatically aren't included in the generated Makefiles unless you run
 configure with the --enable-maintainer-mode option.
 
-The CVS Makefiles and configure script were built using Automake 1.9.6 and
-Autoconf 2.59, respectively.
+The CVS Makefiles and configure script were built using Automake 1.10 and
+Autoconf 2.61, respectively.
 
 There is a known bug in Autoconf 2.57 that will prevent the configure
 scripts it generates from working on some platforms.  Other combinations of

==== //depot/projects/hammer/contrib/cvs/INSTALL#7 (text+ko) ====

@@ -1,6 +1,6 @@
 -------------------------------------------------------------------------------
 
-CVS is Copyright (C) 1989-2005 The Free Software Foundation, Inc.
+CVS is Copyright (C) 1986-2006 The Free Software Foundation, Inc.
 
 CVS is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

==== //depot/projects/hammer/contrib/cvs/Makefile.in#7 (text+ko) ====

@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -28,15 +28,11 @@
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -62,7 +58,7 @@
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
+ configure.lineno config.status.lineno
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES = cvs.spec emx/Makefile os2/Makefile zlib/Makefile
@@ -70,10 +66,13 @@
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -89,8 +88,6 @@
 distuninstallcheck_listfiles = find . -type f -print
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -111,6 +108,8 @@
 EDITOR = @EDITOR@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+GREP = @GREP@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -122,11 +121,8 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
-MAKE_TARGETS_IN_VPATH_FALSE = @MAKE_TARGETS_IN_VPATH_FALSE@
-MAKE_TARGETS_IN_VPATH_TRUE = @MAKE_TARGETS_IN_VPATH_TRUE@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
@@ -148,12 +144,13 @@
 TEXI2DVI = @TEXI2DVI@
 VERSION = @VERSION@
 YACC = @YACC@
+YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
 ac_prefix_program = @ac_prefix_program@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -161,26 +158,38 @@
 am__untar = @am__untar@
 bindir = @bindir@
 build_alias = @build_alias@
+builddir = @builddir@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host_alias = @host_alias@
+htmldir = @htmldir@
 includedir = @includedir@
 includeopt = @includeopt@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@

>>> TRUNCATED FOR MAIL (1000 lines) <<<


More information about the p4-projects mailing list