Remove advertising clauses in accordance with

ftp://ftp.cs.berkeley.edu/ucb/4bsd/README.Impt.License.Change

5 files changed, 5 insertions, 25 deletions

diff --git a/coreutils/cal.c b/coreutils/cal.c
index 3ccd3fff5..ab631576a 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 681af5c45..a29ed758e 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 10d5a8d63..8bd683f44 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 e05a50fbc..c939a984d 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 4510a5e66..33648f918 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.
  *