diff options
| author | Frederic Cambus <fcambus@cvs.openbsd.org> | 2017-08-23 09:15:34 +0000 |
|---|---|---|
| committer | Frederic Cambus <fcambus@cvs.openbsd.org> | 2017-08-23 09:15:34 +0000 |
| commit | d0978c28676437bf87fd5757ca436d30eeb8c3ff (patch) | |
| tree | 733e26ce37b3566aa85b8a49f92ebdb1dbe9c7c9 | |
| parent | 6d9aaea1613e9360a35ea4e9519665a1f9bfba05 (diff) | |
Switch from 4-clause to 2-clause BSD license.
Matthias Drochner rescinded the third and fourth clauses of wsconscfg(8)
and wsfontload(8) licenses in 2008 in NetBSD.
https://mail-index.netbsd.org/source-changes/2008/05/26/msg206199.html
OK deraadt@
| -rw-r--r-- | usr.sbin/wsconscfg/wsconscfg.c | 8 | ||||
| -rw-r--r-- | usr.sbin/wsfontload/wsfontload.c | 8 |
2 files changed, 2 insertions, 14 deletions
diff --git a/usr.sbin/wsconscfg/wsconscfg.c b/usr.sbin/wsconscfg/wsconscfg.c index 3c447cdd79e..280e71287f8 100644 --- a/usr.sbin/wsconscfg/wsconscfg.c +++ b/usr.sbin/wsconscfg/wsconscfg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wsconscfg.c,v 1.14 2015/02/09 23:00:15 deraadt Exp $ */ +/* $OpenBSD: wsconscfg.c,v 1.15 2017/08/23 09:15:33 fcambus Exp $ */ /* $NetBSD: wsconscfg.c,v 1.4 1999/07/29 18:24:10 augustss Exp $ */ /* @@ -13,12 +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 for the NetBSD Project - * by Matthias Drochner. - * 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 WARRANTIES diff --git a/usr.sbin/wsfontload/wsfontload.c b/usr.sbin/wsfontload/wsfontload.c index 7d73dc0c562..97f2242220e 100644 --- a/usr.sbin/wsfontload/wsfontload.c +++ b/usr.sbin/wsfontload/wsfontload.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wsfontload.c,v 1.19 2017/06/22 20:38:32 fcambus Exp $ */ +/* $OpenBSD: wsfontload.c,v 1.20 2017/08/23 09:15:33 fcambus Exp $ */ /* $NetBSD: wsfontload.c,v 1.2 2000/01/05 18:46:43 ad Exp $ */ /* @@ -13,12 +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 for the NetBSD Project - * by Matthias Drochner. - * 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 WARRANTIES |