Remove the advertising clause in the UCB license which Berkeley

rescinded 22 July 1999.  Proofed by myself and Theo.

4 files changed, 8 insertions, 24 deletions

diff --git a/lib/libc/arch/m68k/net/htonl.S b/lib/libc/arch/m68k/net/htonl.S
index 5b631d1a4c0..ee7acb4404f 100644
--- a/lib/libc/arch/m68k/net/htonl.S
+++ b/lib/libc/arch/m68k/net/htonl.S
@@ -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.
  *
@@ -37,7 +33,7 @@
 
 #if defined(LIBC_SCCS)
 	.text
-	.asciz "$OpenBSD: htonl.S,v 1.2 1996/08/19 08:14:58 tholo Exp $"
+	.asciz "$OpenBSD: htonl.S,v 1.3 2003/06/02 20:18:31 millert Exp $"
 #endif /* LIBC_SCCS */
 
 /* netorder = htonl(hostorder) */
diff --git a/lib/libc/arch/m68k/net/htons.S b/lib/libc/arch/m68k/net/htons.S
index 7f5ffcc468c..16a33319710 100644
--- a/lib/libc/arch/m68k/net/htons.S
+++ b/lib/libc/arch/m68k/net/htons.S
@@ -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.
  *
@@ -37,7 +33,7 @@
 
 #if defined(LIBC_SCCS)
 	.text
-	.asciz "$OpenBSD: htons.S,v 1.2 1996/08/19 08:14:59 tholo Exp $"
+	.asciz "$OpenBSD: htons.S,v 1.3 2003/06/02 20:18:31 millert Exp $"
 #endif /* LIBC_SCCS */
 
 /* hostorder = htons(netorder) */
diff --git a/lib/libc/arch/m68k/net/ntohl.S b/lib/libc/arch/m68k/net/ntohl.S
index 956b4870d32..1766c4c1716 100644
--- a/lib/libc/arch/m68k/net/ntohl.S
+++ b/lib/libc/arch/m68k/net/ntohl.S
@@ -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.
  *
@@ -37,7 +33,7 @@
 
 #if defined(LIBC_SCCS)
 	.text
-	.asciz "$OpenBSD: ntohl.S,v 1.2 1996/08/19 08:15:00 tholo Exp $"
+	.asciz "$OpenBSD: ntohl.S,v 1.3 2003/06/02 20:18:31 millert Exp $"
 #endif /* LIBC_SCCS */
 
 /* hostorder = ntohl(netorder) */
diff --git a/lib/libc/arch/m68k/net/ntohs.S b/lib/libc/arch/m68k/net/ntohs.S
index b62b6c191b2..a7cc26a1947 100644
--- a/lib/libc/arch/m68k/net/ntohs.S
+++ b/lib/libc/arch/m68k/net/ntohs.S
@@ -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.
  *
@@ -37,7 +33,7 @@
 
 #if defined(LIBC_SCCS)
 	.text
-	.asciz "$OpenBSD: ntohs.S,v 1.2 1996/08/19 08:15:01 tholo Exp $"
+	.asciz "$OpenBSD: ntohs.S,v 1.3 2003/06/02 20:18:31 millert Exp $"
 #endif /* LIBC_SCCS */
 
 /* hostorder = ntohs(netorder) */