Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 30 Dec 2017 00:22:47 +0000 (UTC)
From:      "Pedro F. Giffuni" <pfg@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r327368 - head/sbin/ccdconfig
Message-ID:  <201712300022.vBU0MlwL009457@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pfg
Date: Sat Dec 30 00:22:47 2017
New Revision: 327368
URL: https://svnweb.freebsd.org/changeset/base/327368

Log:
  ccdconfig: Update licensing terms to match NetBSD.
  
  The code originated in NetBSD which has since removed Clauses 3 and 4.
  
  Approved by:	phk (concerning his own copyright)
  Obtained from:	NetBSD (CVS ccdconfig.c 1.47, ccdconfig.8 1.24)

Modified:
  head/sbin/ccdconfig/ccdconfig.8
  head/sbin/ccdconfig/ccdconfig.c

Modified: head/sbin/ccdconfig/ccdconfig.8
==============================================================================
--- head/sbin/ccdconfig/ccdconfig.8	Sat Dec 30 00:20:49 2017	(r327367)
+++ head/sbin/ccdconfig/ccdconfig.8	Sat Dec 30 00:22:47 2017	(r327368)
@@ -14,13 +14,6 @@
 .\" 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 by the NetBSD
-.\"        Foundation, Inc. and its contributors.
-.\" 4. Neither the name of The NetBSD Foundation nor the names of its
-.\"    contributors may 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
 .\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

Modified: head/sbin/ccdconfig/ccdconfig.c
==============================================================================
--- head/sbin/ccdconfig/ccdconfig.c	Sat Dec 30 00:20:49 2017	(r327367)
+++ head/sbin/ccdconfig/ccdconfig.c	Sat Dec 30 00:22:47 2017	(r327368)
@@ -18,13 +18,6 @@
  * 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 by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201712300022.vBU0MlwL009457>