From owner-svn-src-all@freebsd.org Wed Feb 15 07:19:24 2017 Return-Path: Delivered-To: svn-src-all@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 CF796CDF42C; Wed, 15 Feb 2017 07:19:24 +0000 (UTC) (envelope-from delphij@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 824CE12FC; Wed, 15 Feb 2017 07:19:24 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1F7JNOD097714; Wed, 15 Feb 2017 07:19:23 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1F7JNmP097712; Wed, 15 Feb 2017 07:19:23 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201702150719.v1F7JNmP097712@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Wed, 15 Feb 2017 07:19:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r313759 - vendor/libpcap/dist/pcap X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Feb 2017 07:19:24 -0000 Author: delphij Date: Wed Feb 15 07:19:23 2017 New Revision: 313759 URL: https://svnweb.freebsd.org/changeset/base/313759 Log: Import license changes from upstream 5c5039637f2be0e3167ff6806b4c2741ebab2181. Modified: vendor/libpcap/dist/pcap/bpf.h vendor/libpcap/dist/pcap/dlt.h Modified: vendor/libpcap/dist/pcap/bpf.h ============================================================================== --- vendor/libpcap/dist/pcap/bpf.h Wed Feb 15 06:07:01 2017 (r313758) +++ vendor/libpcap/dist/pcap/bpf.h Wed Feb 15 07:19:23 2017 (r313759) @@ -15,11 +15,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 by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: vendor/libpcap/dist/pcap/dlt.h ============================================================================== --- vendor/libpcap/dist/pcap/dlt.h Wed Feb 15 06:07:01 2017 (r313758) +++ vendor/libpcap/dist/pcap/dlt.h Wed Feb 15 07:19:23 2017 (r313759) @@ -15,11 +15,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 by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. *