Remove advertising clauses in accordance with

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

diff --git a/coreutils/cal.c b/coreutils/cal.c
index 3ccd3fff57af74c66e1051e12344b44a2abf784c..ab631576a9f9e7436b3afb09621d639fdff50a36 100644 (file)
--- 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 681af5c45cf812713169f13347cd870e1eb81613..a29ed758e0986282054749f1cbca7be399aaf595 100644 (file)
--- 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 10d5a8d63159790ec3bccc9c08961b922b146fe1..8bd683f4487ef8f868066b8d1689eacf7012075a 100644 (file)
--- 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 e05a50fbc528b3cbe7ea62b98a67431c891851aa..c939a984dfabbbdcaf8ded18663330b0a7223dbb 100644 (file)
--- 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 4510a5e66915a923e316e66bbe26c2b8d92c5ff3..33648f9182f181dc0dcd5420ff75526b04dbe320 100644 (file)
--- 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.
  *