aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin LI <delphij@FreeBSD.org>2017-02-15 07:22:47 +0000
committerXin LI <delphij@FreeBSD.org>2017-02-15 07:22:47 +0000
commitb86fcc147fe44af57df0835642aa9e033da4c1c5 (patch)
tree43d7d1a2bbdc328a48eaf41484f748071ebceeb4
parent28180eff9e5e96e397f945019e8ee4e6dc8f7027 (diff)
parent5ca946f041e6241d5cf55541828970a621f3e349 (diff)
downloadsrc-b86fcc147fe44af57df0835642aa9e033da4c1c5.tar.gz
src-b86fcc147fe44af57df0835642aa9e033da4c1c5.zip
MFV r313759: license change for a few headers (4 clause BSD to 3 clause BSD).
MFC after: 28 days X-MFC-with: r313695
Notes
Notes: svn path=/head/; revision=313760
-rw-r--r--contrib/libpcap/pcap/bpf.h6
-rw-r--r--contrib/libpcap/pcap/dlt.h6
-rw-r--r--sys/net/dlt.h6
3 files changed, 3 insertions, 15 deletions
diff --git a/contrib/libpcap/pcap/bpf.h b/contrib/libpcap/pcap/bpf.h
index 78ad8905d02d..1a63d603008c 100644
--- a/contrib/libpcap/pcap/bpf.h
+++ b/contrib/libpcap/pcap/bpf.h
@@ -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.
*
diff --git a/contrib/libpcap/pcap/dlt.h b/contrib/libpcap/pcap/dlt.h
index 2d74713e8ab7..b88303c149e2 100644
--- a/contrib/libpcap/pcap/dlt.h
+++ b/contrib/libpcap/pcap/dlt.h
@@ -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.
*
diff --git a/sys/net/dlt.h b/sys/net/dlt.h
index ee6c32bb1580..dc818521d669 100644
--- a/sys/net/dlt.h
+++ b/sys/net/dlt.h
@@ -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.
*