summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Lehmann2002-06-23 22:25:24 +0000
committerAaron Lehmann2002-06-23 22:25:24 +0000
commit69d41787089e7270b92c61165fd52a59a43a60fe (patch)
treee78f864512e116f86653f9651cd43d69bedcd650
parent9031481ac34212cb81dd97035a1891418605d5ee (diff)
downloadbusybox-69d41787089e7270b92c61165fd52a59a43a60fe.zip
busybox-69d41787089e7270b92c61165fd52a59a43a60fe.tar.gz
Remove advertising clauses in accordance with
ftp://ftp.cs.berkeley.edu/ucb/4bsd/README.Impt.License.Change
-rw-r--r--coreutils/cal.c6
-rw-r--r--coreutils/od.c6
-rw-r--r--libbb/dump.c6
-rw-r--r--networking/traceroute.c6
-rw-r--r--util-linux/hexdump.c6
5 files changed, 5 insertions, 25 deletions
diff --git a/coreutils/cal.c b/coreutils/cal.c
index 3ccd3ff..ab63157 100644
--- a/coreutils/cal.c
+++ b/coreutils/cal.c
@@ -404,11 +404,7 @@ void center(char *str, int len, int separate)
* 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/coreutils/od.c b/coreutils/od.c
index 681af5c..a29ed75 100644
--- a/coreutils/od.c
+++ b/coreutils/od.c
@@ -248,11 +248,7 @@ int od_main(int argc, char **argv)
* 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/libbb/dump.c b/libbb/dump.c
index 10d5a8d..8bd683f 100644
--- a/libbb/dump.c
+++ b/libbb/dump.c
@@ -841,11 +841,7 @@ void add(char *fmt)
* 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/networking/traceroute.c b/networking/traceroute.c
index e05a50f..c939a98 100644
--- a/networking/traceroute.c
+++ b/networking/traceroute.c
@@ -14,11 +14,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/util-linux/hexdump.c b/util-linux/hexdump.c
index 4510a5e..33648f9 100644
--- a/util-linux/hexdump.c
+++ b/util-linux/hexdump.c
@@ -147,11 +147,7 @@ int hexdump_main(int argc, char **argv)
* 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.
*