svn commit: r313759 - vendor/libpcap/dist/pcap

[Xin LI]

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.
  *