svn commit: r313760 - in head: contrib/libpcap/pcap sys/net

[Xin LI]

Author: delphij
Date: Wed Feb 15 07:22:47 2017
New Revision: 313760
URL: https://svnweb.freebsd.org/changeset/base/313760

Log:
  MFV r313759: license change for a few headers (4 clause BSD to 3 clause BSD).
  
  MFC after:	28 days
  X-MFC-with:	r313695

Modified:
  head/contrib/libpcap/pcap/bpf.h
  head/contrib/libpcap/pcap/dlt.h
  head/sys/net/dlt.h
Directory Properties:
  head/contrib/libpcap/   (props changed)

Modified: head/contrib/libpcap/pcap/bpf.h
==============================================================================
--- head/contrib/libpcap/pcap/bpf.h	Wed Feb 15 07:19:23 2017	(r313759)
+++ head/contrib/libpcap/pcap/bpf.h	Wed Feb 15 07:22:47 2017	(r313760)
@@ -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: head/contrib/libpcap/pcap/dlt.h
==============================================================================
--- head/contrib/libpcap/pcap/dlt.h	Wed Feb 15 07:19:23 2017	(r313759)
+++ head/contrib/libpcap/pcap/dlt.h	Wed Feb 15 07:22:47 2017	(r313760)
@@ -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: head/sys/net/dlt.h
==============================================================================
--- head/sys/net/dlt.h	Wed Feb 15 07:19:23 2017	(r313759)
+++ head/sys/net/dlt.h	Wed Feb 15 07:22:47 2017	(r313760)
@@ -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.
  *