From owner-svn-src-head@FreeBSD.ORG Fri Nov 26 20:34:43 2010 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C90E81065670; Fri, 26 Nov 2010 20:34:43 +0000 (UTC) (envelope-from uqs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9D5498FC08; Fri, 26 Nov 2010 20:34:43 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oAQKYhra075017; Fri, 26 Nov 2010 20:34:43 GMT (envelope-from uqs@svn.freebsd.org) Received: (from uqs@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oAQKYh1S075014; Fri, 26 Nov 2010 20:34:43 GMT (envelope-from uqs@svn.freebsd.org) Message-Id: <201011262034.oAQKYh1S075014@svn.freebsd.org> From: Ulrich Spoerlein Date: Fri, 26 Nov 2010 20:34:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r215880 - head/contrib/traceroute X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 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: Fri, 26 Nov 2010 20:34:43 -0000 Author: uqs Date: Fri Nov 26 20:34:43 2010 New Revision: 215880 URL: http://svn.freebsd.org/changeset/base/215880 Log: Remove clause 3 and 4 from TNF licenses. Obtained from: NetBSD Approved by: core Modified: head/contrib/traceroute/as.c head/contrib/traceroute/as.h Modified: head/contrib/traceroute/as.c ============================================================================== --- head/contrib/traceroute/as.c Fri Nov 26 19:48:27 2010 (r215879) +++ head/contrib/traceroute/as.c Fri Nov 26 20:34:43 2010 (r215880) @@ -16,13 +16,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 Modified: head/contrib/traceroute/as.h ============================================================================== --- head/contrib/traceroute/as.h Fri Nov 26 19:48:27 2010 (r215879) +++ head/contrib/traceroute/as.h Fri Nov 26 20:34:43 2010 (r215880) @@ -16,13 +16,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