From cd6d1bcf87237e68111ec08d38d7bc20e3df834d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= Date: Wed, 2 Mar 2005 22:57:46 +0000 Subject: [PATCH] In 1997, the University of California, Berkeley issued a statement retroactively relicensing all code held under their copyright from a 4-clause 'traditional' BSD license to a new 3-clause 'revised' BSD license, which removed the advertising clause. From NetBSD, via Joel Baker, and Alistair G. Crooks git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@14612 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/roken/daemon.c | 6 +----- lib/roken/fnmatch.c | 6 +----- lib/roken/fnmatch.hin | 6 +----- lib/roken/getcap.c | 6 +----- lib/roken/getopt.c | 6 +----- lib/roken/getusershell.c | 6 +----- lib/roken/glob.c | 6 +----- lib/roken/glob.hin | 6 +----- lib/roken/iruserok.c | 6 +----- lib/roken/unvis.c | 6 +----- lib/roken/vis.hin | 6 +----- 11 files changed, 11 insertions(+), 55 deletions(-) diff --git a/lib/roken/daemon.c b/lib/roken/daemon.c index 119ff00f6..4af7a7396 100644 --- a/lib/roken/daemon.c +++ b/lib/roken/daemon.c @@ -10,11 +10,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/roken/fnmatch.c b/lib/roken/fnmatch.c index dc01d6ea6..e8bb44c87 100644 --- a/lib/roken/fnmatch.c +++ b/lib/roken/fnmatch.c @@ -15,11 +15,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/roken/fnmatch.hin b/lib/roken/fnmatch.hin index 95c91d600..41df392c2 100644 --- a/lib/roken/fnmatch.hin +++ b/lib/roken/fnmatch.hin @@ -12,11 +12,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/roken/getcap.c b/lib/roken/getcap.c index bef811450..13509be8e 100644 --- a/lib/roken/getcap.c +++ b/lib/roken/getcap.c @@ -15,11 +15,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/roken/getopt.c b/lib/roken/getopt.c index 45fc35023..d935c6555 100644 --- a/lib/roken/getopt.c +++ b/lib/roken/getopt.c @@ -10,11 +10,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/roken/getusershell.c b/lib/roken/getusershell.c index c8251fad6..6ef9cfcb1 100644 --- a/lib/roken/getusershell.c +++ b/lib/roken/getusershell.c @@ -10,11 +10,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/roken/glob.c b/lib/roken/glob.c index 295aa2de8..55767ce78 100644 --- a/lib/roken/glob.c +++ b/lib/roken/glob.c @@ -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/roken/glob.hin b/lib/roken/glob.hin index 17fff1f6b..a86fc69f5 100644 --- a/lib/roken/glob.hin +++ b/lib/roken/glob.hin @@ -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/roken/iruserok.c b/lib/roken/iruserok.c index b47abb909..8e6468fd5 100644 --- a/lib/roken/iruserok.c +++ b/lib/roken/iruserok.c @@ -10,11 +10,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/roken/unvis.c b/lib/roken/unvis.c index 3142bb3da..f4275b7e6 100644 --- a/lib/roken/unvis.c +++ b/lib/roken/unvis.c @@ -12,11 +12,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/roken/vis.hin b/lib/roken/vis.hin index 3038b2177..fe8b69ab7 100644 --- a/lib/roken/vis.hin +++ b/lib/roken/vis.hin @@ -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. *