summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/libc/time/strftime.c8
-rw-r--r--lib/libcurses/tinfo/read_termcap.c12
-rw-r--r--share/man/man4/man4.sparc/cgsix.48
-rw-r--r--sys/arch/mvme88k/stand/libsa/config.h7
-rw-r--r--sys/arch/sparc64/sparc64/disksubr.c7
-rw-r--r--sys/kern/vnode_if.c6
-rw-r--r--sys/sys/vnode_if.h6
-rw-r--r--usr.bin/spell/spell.18
-rw-r--r--usr.bin/ssh/LICENCE12
-rw-r--r--usr.sbin/httpd/src/os/tpf/cgetop.c6
10 files changed, 17 insertions, 63 deletions
diff --git a/lib/libc/time/strftime.c b/lib/libc/time/strftime.c
index e92740a58d3..9be6718fedd 100644
--- a/lib/libc/time/strftime.c
+++ b/lib/libc/time/strftime.c
@@ -1,6 +1,6 @@
#if defined(LIBC_SCCS) && !defined(lint) && !defined(NOID)
static char elsieid[] = "@(#)strftime.c 7.64";
-static char *rcsid = "$OpenBSD: strftime.c,v 1.12 2003/03/13 15:47:34 deraadt Exp $";
+static char *rcsid = "$OpenBSD: strftime.c,v 1.13 2003/06/04 21:47:58 deraadt Exp $";
#endif /* LIBC_SCCS and not lint */
#include "private.h"
@@ -20,11 +20,7 @@ static char *rcsid = "$OpenBSD: strftime.c,v 1.12 2003/03/13 15:47:34 deraadt Ex
** 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/libcurses/tinfo/read_termcap.c b/lib/libcurses/tinfo/read_termcap.c
index 7270233b71d..a11f04ec350 100644
--- a/lib/libcurses/tinfo/read_termcap.c
+++ b/lib/libcurses/tinfo/read_termcap.c
@@ -100,11 +100,7 @@ static int _nc_nfcmp(const char *, char *);
* 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 acknowledgment:
- * 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.
*
@@ -665,11 +661,7 @@ _nc_nfcmp(const char *nf, char *rec)
* 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 acknowledgment:
- * 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/share/man/man4/man4.sparc/cgsix.4 b/share/man/man4/man4.sparc/cgsix.4
index b188e71a9f1..1cc1cabcd51 100644
--- a/share/man/man4/man4.sparc/cgsix.4
+++ b/share/man/man4/man4.sparc/cgsix.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: cgsix.4,v 1.23 2003/05/14 06:48:14 miod Exp $
+.\" $OpenBSD: cgsix.4,v 1.24 2003/06/04 21:47:59 deraadt Exp $
.\" $NetBSD: cgsix.4,v 1.4 1998/06/11 08:32:20 fair Exp $
.\"
.\" Copyright 1994
@@ -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/sys/arch/mvme88k/stand/libsa/config.h b/sys/arch/mvme88k/stand/libsa/config.h
index 17a8d38bc7e..f39a1e97f5c 100644
--- a/sys/arch/mvme88k/stand/libsa/config.h
+++ b/sys/arch/mvme88k/stand/libsa/config.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: config.h,v 1.3 2001/07/04 08:09:29 niklas Exp $ */
+/* $OpenBSD: config.h,v 1.4 2003/06/04 21:47:59 deraadt Exp $ */
/*
@@ -13,11 +13,6 @@
* 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 Theo de Raadt
- * 4. The name of the Author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
* OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
diff --git a/sys/arch/sparc64/sparc64/disksubr.c b/sys/arch/sparc64/sparc64/disksubr.c
index 7746630555c..7e69da12e9a 100644
--- a/sys/arch/sparc64/sparc64/disksubr.c
+++ b/sys/arch/sparc64/sparc64/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.9 2002/06/15 17:23:31 art Exp $ */
+/* $OpenBSD: disksubr.c,v 1.10 2003/06/04 21:47:59 deraadt Exp $ */
/* $NetBSD: disksubr.c,v 1.13 2000/12/17 22:39:18 pk Exp $ */
/*
@@ -14,10 +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 Theo de Raadt.
- * 4. The name of the author may not be used to endorse or promote products
+ * 3. The name of the author may not be used to endorse or promote products
* derived from this software without specific prior written permission
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
diff --git a/sys/kern/vnode_if.c b/sys/kern/vnode_if.c
index d6feac3199e..89f1ed41708 100644
--- a/sys/kern/vnode_if.c
+++ b/sys/kern/vnode_if.c
@@ -20,11 +20,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/sys/sys/vnode_if.h b/sys/sys/vnode_if.h
index d4b341a3df2..f0828739c11 100644
--- a/sys/sys/vnode_if.h
+++ b/sys/sys/vnode_if.h
@@ -20,11 +20,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/usr.bin/spell/spell.1 b/usr.bin/spell/spell.1
index 01a6c5fcb84..74fec9cbbe9 100644
--- a/usr.bin/spell/spell.1
+++ b/usr.bin/spell/spell.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: spell.1,v 1.4 2003/03/11 08:11:08 jmc Exp $
+.\" $OpenBSD: spell.1,v 1.5 2003/06/04 21:48:02 deraadt Exp $
.\"
.\" Copyright (C) 1985, 1993, 1994
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,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/usr.bin/ssh/LICENCE b/usr.bin/ssh/LICENCE
index 011baf22cbd..60e885775a5 100644
--- a/usr.bin/ssh/LICENCE
+++ b/usr.bin/ssh/LICENCE
@@ -134,11 +134,9 @@ OpenSSH contains no GPL code.
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
5)
- One component of the ssh source code is under a 4-clause BSD license,
+ One component of the ssh source code is under a 3-clause BSD license,
held by the University of California, since we pulled these parts from
- original Berkeley code. The Regents of the University of California
- have declared that term 3 is no longer enforceable on their source code,
- but we retain that license as is.
+ original Berkeley code.
* Copyright (c) 1983, 1990, 1992, 1993, 1995
* The Regents of the University of California. All rights reserved.
@@ -151,11 +149,7 @@ OpenSSH contains no GPL code.
* 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/usr.sbin/httpd/src/os/tpf/cgetop.c b/usr.sbin/httpd/src/os/tpf/cgetop.c
index 90ffbce5f45..21f01653be3 100644
--- a/usr.sbin/httpd/src/os/tpf/cgetop.c
+++ b/usr.sbin/httpd/src/os/tpf/cgetop.c
@@ -13,11 +13,7 @@
/* 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 */
+/* 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. */
/* */
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 04:59:41 +0000