Date: Thu, 28 Dec 2017 20:35:21 +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: r327296 - head/sys/netinet6 Message-ID: <201712282035.vBSKZLdO003025@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pfg Date: Thu Dec 28 20:35:21 2017 New Revision: 327296 URL: https://svnweb.freebsd.org/changeset/base/327296 Log: netinet6/ip6_id.c: niels kindly dropped clause 3/4 from the license. This bring back r327293 from OpenBSD, with the important difference that we are now getting it from their ip6_id.c file. Obtained from: OpenBSD (CVS v1.3) Modified: head/sys/netinet6/ip6_id.c Modified: head/sys/netinet6/ip6_id.c ============================================================================== --- head/sys/netinet6/ip6_id.c Thu Dec 28 20:26:51 2017 (r327295) +++ head/sys/netinet6/ip6_id.c Thu Dec 28 20:35:21 2017 (r327296) @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: (BSD-3-Clause AND BSD-4-Clause) + * SPDX-License-Identifier: (BSD-3-Clause AND BSD-2-Clause) * * Copyright (C) 2003 WIDE Project. * All rights reserved. @@ -48,11 +48,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 Niels Provos. - * 4. The name of the author 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 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -65,7 +60,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $OpenBSD: ip6_id.c,v 1.2 2003/12/10 07:21:01 itojun Exp $ + * $OpenBSD: ip6_id.c,v 1.3 2003/12/12 06:57:12 itojun Exp $ */ #include <sys/cdefs.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201712282035.vBSKZLdO003025>