From owner-svn-src-head@freebsd.org Thu Dec 28 20:10:11 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 CCB29EB17C8; Thu, 28 Dec 2017 20:10:11 +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 7EA7F68B3B; Thu, 28 Dec 2017 20:10:11 +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 vBSKAAc2090558; Thu, 28 Dec 2017 20:10:10 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBSKAAgw090557; Thu, 28 Dec 2017 20:10:10 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201712282010.vBSKAAgw090557@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Thu, 28 Dec 2017 20:10:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r327294 - head/sys/netinet6 X-SVN-Group: head X-SVN-Commit-Author: pfg X-SVN-Commit-Paths: head/sys/netinet6 X-SVN-Commit-Revision: 327294 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: Thu, 28 Dec 2017 20:10:11 -0000 Author: pfg Date: Thu Dec 28 20:10:10 2017 New Revision: 327294 URL: https://svnweb.freebsd.org/changeset/base/327294 Log: Revert r327293 netinet6/ip6_id.c: niels kindly dropped clause 3/4 from the license. I was looking at the wrong file. There is an important merge that must be done before I can bring this change. Modified: head/sys/netinet6/ip6_id.c Modified: head/sys/netinet6/ip6_id.c ============================================================================== --- head/sys/netinet6/ip6_id.c Thu Dec 28 19:42:53 2017 (r327293) +++ head/sys/netinet6/ip6_id.c Thu Dec 28 20:10:10 2017 (r327294) @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: (BSD-3-Clause AND BSD-2-Clause) + * SPDX-License-Identifier: (BSD-3-Clause AND BSD-4-Clause) * * Copyright (C) 2003 WIDE Project. * All rights reserved. @@ -48,6 +48,11 @@ * 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