From owner-svn-src-head@freebsd.org Sat Dec 30 01:37:10 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0BCD9E89D10; Sat, 30 Dec 2017 01:37:10 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B241366311; Sat, 30 Dec 2017 01:37:09 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBU1b8eL038581; Sat, 30 Dec 2017 01:37:08 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBU1b8fR038580; Sat, 30 Dec 2017 01:37:08 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201712300137.vBU1b8fR038580@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Sat, 30 Dec 2017 01:37:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r327372 - head/sys/geom X-SVN-Group: head X-SVN-Commit-Author: pfg X-SVN-Commit-Paths: head/sys/geom X-SVN-Commit-Revision: 327372 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Dec 2017 01:37:10 -0000 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