svn commit: r327372 - head/sys/geom

Pedro F. Giffuni pfg at FreeBSD.org
Sat Dec 30 01:37:10 UTC 2017


Author: pfg
Date: Sat Dec 30 01:37:08 2017
New Revision: 327372
URL: https://svnweb.freebsd.org/changeset/base/327372

Log:
  geom_ccd.c: Update the license with changes from upstream.
  
  Part of this file originated in NetBSD, with the original file
  carrying two versions of 4-clause BSD licenses. r109471 attempted to
  simplify the situation by putting both licenses together.
  
  Meanwhile, NetBSD dropped Clauses 3 and 4 from their own license, and
  eventually NetBSD got permission from the University of Utah to drop the
  3rd clause.
  
  Keep the license "simple" by dropping the third clause since both TNF,
  Utah/Berkeley and phk agree in principle that it can be dropped.
  
  Obtained from:	NetBSD (ccd.c CVS 1.128, 1.138)

Modified:
  head/sys/geom/geom_ccd.c

Modified: head/sys/geom/geom_ccd.c
==============================================================================
--- head/sys/geom/geom_ccd.c	Sat Dec 30 00:40:34 2017	(r327371)
+++ head/sys/geom/geom_ccd.c	Sat Dec 30 01:37:08 2017	(r327372)
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-4-Clause
+ * SPDX-License-Identifier: BSD-3-Clause
  *
  * Copyright (c) 2003 Poul-Henning Kamp.
  * Copyright (c) 1995 Jason R. Thorpe.
@@ -20,11 +20,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed for the NetBSD Project
- *	by Jason R. Thorpe.
- * 4. The names of the authors may not be used to endorse or promote products
+ * 3. The names of the authors may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR


More information about the svn-src-all mailing list