Remove the advertising clause in the UCB license which Berkeley

rescinded 22 July 1999.  Proofed by myself and Theo.

4 files changed, 7 insertions, 23 deletions

diff --git a/lib/libevent/compat/err.h b/lib/libevent/compat/err.h
index c78389a43e1..5ddc73c5973 100644
--- a/lib/libevent/compat/err.h
+++ b/lib/libevent/compat/err.h
@@ -16,11 +16,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/lib/libevent/compat/sys/queue.h b/lib/libevent/compat/sys/queue.h
index 8892afbbb87..1851ade4660 100644
--- a/lib/libevent/compat/sys/queue.h
+++ b/lib/libevent/compat/sys/queue.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: queue.h,v 1.1 2002/06/15 18:01:47 provos Exp $	*/
+/*	$OpenBSD: queue.h,v 1.2 2003/06/02 20:18:40 millert Exp $	*/
 /*	$NetBSD: queue.h,v 1.11 1996/05/16 05:17:14 mycroft Exp $	*/
 
 /*
@@ -13,11 +13,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/lib/libevent/compat/sys/time.h b/lib/libevent/compat/sys/time.h
index b68af045f23..0a66cd40bf4 100644
--- a/lib/libevent/compat/sys/time.h
+++ b/lib/libevent/compat/sys/time.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: time.h,v 1.1 2002/06/15 18:01:48 provos Exp $	*/
+/*	$OpenBSD: time.h,v 1.2 2003/06/02 20:18:40 millert Exp $	*/
 /*	$NetBSD: time.h,v 1.18 1996/04/23 10:29:33 mycroft Exp $	*/
 
 /*
@@ -13,11 +13,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/lib/libevent/err.c b/lib/libevent/err.c
index 4e12f9a9a6d..4d8b75e51c5 100644
--- a/lib/libevent/err.c
+++ b/lib/libevent/err.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: err.c,v 1.2 2002/06/25 15:50:15 mickey Exp $	*/
+/*	$OpenBSD: err.c,v 1.3 2003/06/02 20:18:40 millert Exp $	*/
 
 /*
  * err.c
@@ -18,11 +18,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.
  *