Reword copyright notices on code in third_party for clarity.

diff --git a/third_party/chunk.cc b/third_party/chunk.cc
index 170030f..417d728 100644 (file)
--- a/third_party/chunk.cc
+++ b/third_party/chunk.cc
@@ -1,10 +1,14 @@
-/* Cumulus: Smart Filesystem Backup to Dumb Servers
- *
+/* Cumulus: Efficient Filesystem Backup to the Cloud
+ * Copyright (C) 1998, 1999 David Mazieres (dm@uun.org)
  * Copyright (C) 2006-2008  The Regents of the University of California
- * Written by Michael Vrable <mvrable@cs.ucsd.edu>
  *
- * Much of the code in this file is taken from LBFS, which is
- * Copyright (C) 1998, 1999 David Mazieres (dm@uun.org)
+ * This code is largely taken from LBFS, primarily the files:
+ *   liblbfs/fingerprint.C  (fingerprint.C,v 1.1 2001/01/29 22:49:13 benjie Exp)
+ *   liblbfs/rabinpoly.h  (rabinpoly.h,v 1.4 2002/01/07 21:30:21 athicha Exp)
+ *   liblbfs/rabinpoly.C  (rabinpoly.C,v 1.1 2001/01/29 22:49:13 benjie Exp)
+ *   async/msb.h  (msb.h,v 1.6 1998/12/26 18:21:51 dm Exp)
+ *   async/msb.C  (msb.C,v 1.4 1998/12/26 18:21:51 dm Exp)
+ * but adapted and slimmed down to fit within Cumulus.
  *
  * 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
@@ -22,14 +26,8 @@
  */
 
 /* Compute incremental backups at a sub-file level by chopping files up into
- * blocks in a content-sensitive manner (using Rabin fingerprints).  This code
- * is largely taken from LBFS, primarily the files:
- *   liblbfs/fingerprint.C  (fingerprint.C,v 1.1 2001/01/29 22:49:13 benjie Exp)
- *   liblbfs/rabinpoly.h  (rabinpoly.h,v 1.4 2002/01/07 21:30:21 athicha Exp)
- *   liblbfs/rabinpoly.C  (rabinpoly.C,v 1.1 2001/01/29 22:49:13 benjie Exp)
- *   async/msb.h  (msb.h,v 1.6 1998/12/26 18:21:51 dm Exp)
- *   async/msb.C  (msb.C,v 1.4 1998/12/26 18:21:51 dm Exp)
- * but adapted and slimmed down to fit within Cumulus. */
+ * blocks in a content-sensitive manner (using Rabin fingerprints).
+ */
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/third_party/chunk.h b/third_party/chunk.h
index 6cc7392..a0a025b 100644 (file)
--- a/third_party/chunk.h
+++ b/third_party/chunk.h
@@ -1,5 +1,4 @@
-/* Cumulus: Smart Filesystem Backup to Dumb Servers
- *
+/* Cumulus: Efficient Filesystem Backup to the Cloud
  * Copyright (C) 2006-2008  The Regents of the University of California
  * Written by Michael Vrable <mvrable@cs.ucsd.edu>
  *

diff --git a/third_party/sha1.cc b/third_party/sha1.cc
index 32a6429..9e9e74b 100644 (file)
--- a/third_party/sha1.cc
+++ b/third_party/sha1.cc
@@ -1,9 +1,12 @@
 /* sha1.cc - Functions to compute SHA1 message digest of data streams
  * according to the NIST specification FIPS-180-1.
- * part of Cumulus: Smart Filesystem Backup to Dumb Servers
+ * part of Cumulus: Efficient Filesystem Backup to the Cloud
  *
  * Copyright (C) 2000, 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
  * Copyright (C) 2006-2007  The Regents of the University of California
+ * Copyright (C) 2012 The Cumulus Developers
+ * See the AUTHORS file for a list of Cumulus contributors.
+ *
  * Written by Scott G. Miller
  * Additional Credits:
  *    Robert Klep <robert@ilse.nl>  -- Expansion function fix

diff --git a/third_party/sha1.h b/third_party/sha1.h
index 1eb8d8d..f815b62 100644 (file)
--- a/third_party/sha1.h
+++ b/third_party/sha1.h
@@ -1,6 +1,6 @@
 /* Declarations of functions and data types used for SHA1 sum library
  * functions.
- * part of Cumulus: Smart Filesystem Backup to Dumb Servers
+ * part of Cumulus: Efficient Filesystem Backup to the Cloud
  *
  * Copyright (C) 2000, 2001, 2003, 2005 Free Software Foundation, Inc.
  * Copyright (C) 2006-2007  The Regents of the University of California

diff --git a/third_party/sha256.cc b/third_party/sha256.cc
index 968b63b..9e249be 100644 (file)
--- a/third_party/sha256.cc
+++ b/third_party/sha256.cc
@@ -1,24 +1,30 @@
-/* sha256.cc - Message digests for Cumulus using SHA256
- *
- * This code is adapted from crypto/sha256_generic.c and include/crypto/sha.n
- * from the Linux kernel version 3.4.
- */
-
 /* SHA-256, as specified in
  * http://csrc.nist.gov/groups/STM/cavp/documents/shs/sha256-384-512.pdf
- *
- * SHA-256 code by Jean-Luc Cooke <jlcooke@certainkey.com>.
+ * part of Cumulus: Efficient Filesystem Backup to the Cloud
  *
  * Copyright (c) Jean-Luc Cooke <jlcooke@certainkey.com>
  * Copyright (c) Andrew McDonald <andrew@mcdonald.org.uk>
  * Copyright (c) 2002 James Morris <jmorris@intercode.com.au>
  * SHA224 Support Copyright 2007 Intel Corporation <jonathan.lynch@intel.com>
+ * Copyright (C) 2012 The Cumulus Developers
+ * See the AUTHORS file for a list of Cumulus contributors.
+ *
+ * This code is adapted from crypto/sha256_generic.c and include/crypto/sha.h
+ * from the Linux kernel version 3.4, and reworked to fit within Cumulus.
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
- * 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 the Free
- * Software Foundation; either version 2 of the License, or (at your option) 
- * any later version.
+ * This program is distributed in the hope that it will be useful,
+ * 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.
  *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #define _BSD_SOURCE