Clarify the copyright situation: most sources are 2-clause BSD,

a few sources are still 3-clause, build files vary.

SVN-Revision: 92

diff --git a/COPYING b/COPYING
index 6128d175fdeb19b4b9eb0f260f96b2bb89b49b04..ec7d6c43603763607cd33982baa950fda0a9d35e 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -1,7 +1,41 @@
-All of the C source code and documentation in this package is subject
-to the following:
+The libarchive distribution as a whole is Copyright by Tim Kientzle
+and is subject to the copyright notice reproduced at the bottom of
+this file.
 
-Copyright (c) 2003-2006 Tim Kientzle
+Each individual file in this distribution should have a clear
+copyright/licensing statement at the beginning of the file.  If any do
+not, please let me know and I will rectify it.  The following is
+intended to summarize the copyright status of the individual files;
+the actual statements in the files are controlling.
+
+* Except as listed below, all C sources (including .c and .h files)
+  and documentation files are subject to the copyright notice reproduced
+  at the bottom of this file.
+
+* The following source files are also subject in whole or in part to
+  a 3-clause UC Regents copyright; please read the individual source
+  files for details:
+   libarchive/archive_entry.c
+   libarchive/archive_read_support_compression_compress.c
+   libarchive/archive_write_set_compression_compress.c
+   libarchive/mtree.5
+   tar/matching.c
+
+* The following source files are in the public domain:
+   tar/getdate.y
+
+* The build files---including Makefiles, configure scripts,
+  and auxiliary scripts used as part of the compile process---have
+  widely varying licensing terms.  Please check individual files before
+  distributing them to see if those restrictions apply to you.
+
+I intend for all new source code to use the license below and hope over
+time to replace code with other licenses with new implementations that
+do use the license below.  The varying licensing of the build scripts
+seems to be an unavoidable mess.
+
+
+Copyright (c) 2003-2008 <author(s)>
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without