Copy head@r302406 to stable/11 as part of the 11.0-RELEASE cycle.
Prune svn:mergeinfo from the new branch, as nothing has been merged
here.

Additional commits post-branch will follow.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

Modernize my email address

Change use of perror() to warn()

Submitted by: bde

Fix insecure tempfile handling.

Reviewed by: audit@freebsd.org

$Id$ -> $FreeBSD$

Use err(3). Use An/Aq for author name.

Revert $FreeBSD$ to $Id$

Make the long-awaited change from $Id$ to $FreeBSD$

This will make a number of things easier in the future, as well as (finally!)
avoiding the Id-smashing problem which has plagued developers for so long.

Boy, I'm glad we're not using sup anymore. This update would have been
insane otherwise.

Some new options, useful for restoring single files or subtrees from the
deltas.

Submitted by: A JOSEPH KOSHY <koshy@fakir.india.hp.com>

Support for "-u" which sets the timestamp from the delta on the file.
Intended for sup mirrors etc. Not well tested yet.

Reviewed by: phk
Submitted by: Giles Lean <giles@nemeton.com.au>
Submitted by: John Hay <jhay@mikom.csir.co.za>

Add support for local modifications to the tree, by using FOO.ctm instead
of FOO if present. Various other tweaks.

Submitted by: Christian Haury <Christian.Haury@sagem.fr>

Remove trailing whitespace.

Fixed a bug so that a delta#0 can be applied.
Fixed a typo in the generation of temp filenames.
"Blame" Joerg for the man-pages (and clarify a couple of minor points).
Most appreceiated Joerg!

Finally applying my own fix. :-)

>Description:

ctm(1) sometimes did not free up all used resources (open pipes and
processes, heap memory). This happened whenever one of the passes
ended prematurely, and it became very apparent when running it on
a bunch of already applied deltas, resulting in a ``gunzip: resource
temporarily unavailable'' due to the maxproc # exhausted.

Look at the .ctm_status file and ignores all patches already applied.

Reviewed by: phk
Submitted by: J Wunsch <j@uriah.heep.sax.de>

Fixed a typo. Poited out by Bruce & Phillipe.

Stefan Esser proved that I couldn't program, and Ollivier Robert that I
couldn't spell :-)
Submitted by: Stefan Esser, Ollivier Robert

These patches fix some lesser problems:

1) malloc.h doesn't exits in 2.0.
2) Makefile.inc wasn't picked up so one of the build steps (install?)
failed.
3) LIBMD wasn't depended on.
4) "ctm foo" dumped core because "foo" doesn't have a '.' in it.

Bruce

I updated the mkCTM stuff while I was at it anyway. /phk

Reviewed by: phk
Submitted by: bde

Various cleanup and fixes.

The next batch of refinements. Now it no longer needs to call on ed(1) to
fix our files, it has a builtin "diff -n" editor.

A bunch of improvements. Still far to go.

This commit was generated by cvs2svn to compensate for changes in r2886,
which included commits to RCS files with non-trunk default branches.

This is the present state of CTM version 2. Please do not ask for
subscriptions yet. Wait for the announcement.

CTM is my humble attempt to get -current out to people beyond TCP/IP
connections. This is for people with dial-up connections and such.

CTM can make a delta from one version to another of a source-tree, in
a efficient and verified way. Even if there are binary files in the
tree. It will even try to make the delta as small as possible.

It is OK with me if you yell "Bloating!" but I'll just forward your email
to some of the happy customers from CTM version 1, and let them tell you
what they think.

I will not put ctm into "make world" yet. For now it is just the logical
way to get the sources out to people who helps me test this.

Poul-Henning