Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Move Keith Muller's code from a 4-clause to a 3-clause licen...
details: https://anonhg.NetBSD.org/src/rev/bdfd9a4467da
branches: trunk
changeset: 553253:bdfd9a4467da
user: agc <agc%NetBSD.org@localhost>
date: Mon Oct 13 07:41:22 2003 +0000
description:
Move Keith Muller's code from a 4-clause to a 3-clause licence by removing
the advertising clause. Diffs provided in PR 22397 by Joel Baker, confirmed
to the board by Keith Muller.
diffstat:
bin/pax/ar_io.c | 40 +++-------------------------------------
bin/pax/ar_subs.c | 40 +++-------------------------------------
bin/pax/buf_subs.c | 40 +++-------------------------------------
bin/pax/cpio.c | 40 +++-------------------------------------
bin/pax/cpio.h | 40 ++--------------------------------------
bin/pax/extern.h | 40 ++--------------------------------------
bin/pax/file_subs.c | 40 +++-------------------------------------
bin/pax/ftree.c | 40 +++-------------------------------------
bin/pax/ftree.h | 40 ++--------------------------------------
bin/pax/gen_subs.c | 40 +++-------------------------------------
bin/pax/options.c | 40 +++-------------------------------------
bin/pax/options.h | 40 ++--------------------------------------
bin/pax/pat_rep.c | 40 +++-------------------------------------
bin/pax/pat_rep.h | 40 ++--------------------------------------
bin/pax/pax.1 | 36 ++----------------------------------
bin/pax/pax.c | 40 +++-------------------------------------
bin/pax/pax.h | 40 ++--------------------------------------
bin/pax/sel_subs.c | 40 +++-------------------------------------
bin/pax/sel_subs.h | 40 ++--------------------------------------
bin/pax/tables.c | 40 +++-------------------------------------
bin/pax/tables.h | 40 ++--------------------------------------
bin/pax/tar.c | 40 +++-------------------------------------
bin/pax/tar.h | 40 ++--------------------------------------
bin/pax/tty_subs.c | 40 +++-------------------------------------
lib/libc/gen/devname.c | 40 +++-------------------------------------
lib/libc/gen/pwcache.c | 40 +++-------------------------------------
lib/libc/gen/pwcache.h | 46 +++-------------------------------------------
usr.bin/pr/egetopt.c | 40 +++-------------------------------------
usr.bin/pr/extern.h | 43 +++----------------------------------------
usr.bin/pr/pr.1 | 38 +++-----------------------------------
usr.bin/pr/pr.c | 40 +++-------------------------------------
usr.bin/pr/pr.h | 43 +++----------------------------------------
32 files changed, 86 insertions(+), 1200 deletions(-)
diffs (truncated from 1900 to 300 lines):
diff -r 4ebeb2d3d8d4 -r bdfd9a4467da bin/pax/ar_io.c
--- a/bin/pax/ar_io.c Mon Oct 13 07:29:28 2003 +0000
+++ b/bin/pax/ar_io.c Mon Oct 13 07:41:22 2003 +0000
@@ -1,6 +1,7 @@
-/* $NetBSD: ar_io.c,v 1.37 2003/09/18 09:18:24 grant Exp $ */
+/* $NetBSD: ar_io.c,v 1.38 2003/10/13 07:41:22 agc Exp $ */
/*-
+ * Copyright (c) 1992 Keith Muller.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
@@ -32,47 +33,12 @@
* SUCH DAMAGE.
*/
-/*-
- * Copyright (c) 1992 Keith Muller.
- *
- * This code is derived from software contributed to Berkeley by
- * Keith Muller of the University of California, San Diego.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 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
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(lint)
#if 0
static char sccsid[] = "@(#)ar_io.c 8.2 (Berkeley) 4/18/94";
#else
-__RCSID("$NetBSD: ar_io.c,v 1.37 2003/09/18 09:18:24 grant Exp $");
+__RCSID("$NetBSD: ar_io.c,v 1.38 2003/10/13 07:41:22 agc Exp $");
#endif
#endif /* not lint */
diff -r 4ebeb2d3d8d4 -r bdfd9a4467da bin/pax/ar_subs.c
--- a/bin/pax/ar_subs.c Mon Oct 13 07:29:28 2003 +0000
+++ b/bin/pax/ar_subs.c Mon Oct 13 07:41:22 2003 +0000
@@ -1,6 +1,7 @@
-/* $NetBSD: ar_subs.c,v 1.27 2003/08/07 09:05:19 agc Exp $ */
+/* $NetBSD: ar_subs.c,v 1.28 2003/10/13 07:41:22 agc Exp $ */
/*-
+ * Copyright (c) 1992 Keith Muller.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
@@ -32,47 +33,12 @@
* SUCH DAMAGE.
*/
-/*-
- * Copyright (c) 1992 Keith Muller.
- *
- * This code is derived from software contributed to Berkeley by
- * Keith Muller of the University of California, San Diego.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 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
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(lint)
#if 0
static char sccsid[] = "@(#)ar_subs.c 8.2 (Berkeley) 4/18/94";
#else
-__RCSID("$NetBSD: ar_subs.c,v 1.27 2003/08/07 09:05:19 agc Exp $");
+__RCSID("$NetBSD: ar_subs.c,v 1.28 2003/10/13 07:41:22 agc Exp $");
#endif
#endif /* not lint */
diff -r 4ebeb2d3d8d4 -r bdfd9a4467da bin/pax/buf_subs.c
--- a/bin/pax/buf_subs.c Mon Oct 13 07:29:28 2003 +0000
+++ b/bin/pax/buf_subs.c Mon Oct 13 07:41:22 2003 +0000
@@ -1,6 +1,7 @@
-/* $NetBSD: buf_subs.c,v 1.21 2003/08/07 09:05:19 agc Exp $ */
+/* $NetBSD: buf_subs.c,v 1.22 2003/10/13 07:41:22 agc Exp $ */
/*-
+ * Copyright (c) 1992 Keith Muller.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
@@ -32,47 +33,12 @@
* SUCH DAMAGE.
*/
-/*-
- * Copyright (c) 1992 Keith Muller.
- *
- * This code is derived from software contributed to Berkeley by
- * Keith Muller of the University of California, San Diego.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 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
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(lint)
#if 0
static char sccsid[] = "@(#)buf_subs.c 8.2 (Berkeley) 4/18/94";
#else
-__RCSID("$NetBSD: buf_subs.c,v 1.21 2003/08/07 09:05:19 agc Exp $");
+__RCSID("$NetBSD: buf_subs.c,v 1.22 2003/10/13 07:41:22 agc Exp $");
#endif
#endif /* not lint */
diff -r 4ebeb2d3d8d4 -r bdfd9a4467da bin/pax/cpio.c
--- a/bin/pax/cpio.c Mon Oct 13 07:29:28 2003 +0000
+++ b/bin/pax/cpio.c Mon Oct 13 07:41:22 2003 +0000
@@ -1,6 +1,7 @@
-/* $NetBSD: cpio.c,v 1.15 2003/08/07 09:05:20 agc Exp $ */
+/* $NetBSD: cpio.c,v 1.16 2003/10/13 07:41:22 agc Exp $ */
/*-
+ * Copyright (c) 1992 Keith Muller.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
@@ -32,47 +33,12 @@
* SUCH DAMAGE.
*/
-/*-
- * Copyright (c) 1992 Keith Muller.
- *
- * This code is derived from software contributed to Berkeley by
- * Keith Muller of the University of California, San Diego.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 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
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(lint)
#if 0
static char sccsid[] = "@(#)cpio.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: cpio.c,v 1.15 2003/08/07 09:05:20 agc Exp $");
+__RCSID("$NetBSD: cpio.c,v 1.16 2003/10/13 07:41:22 agc Exp $");
#endif
#endif /* not lint */
diff -r 4ebeb2d3d8d4 -r bdfd9a4467da bin/pax/cpio.h
--- a/bin/pax/cpio.h Mon Oct 13 07:29:28 2003 +0000
+++ b/bin/pax/cpio.h Mon Oct 13 07:41:22 2003 +0000
@@ -1,6 +1,7 @@
-/* $NetBSD: cpio.h,v 1.5 2003/08/07 09:05:20 agc Exp $ */
+/* $NetBSD: cpio.h,v 1.6 2003/10/13 07:41:22 agc Exp $ */
/*-
+ * Copyright (c) 1992 Keith Muller.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
@@ -34,43 +35,6 @@
* @(#)cpio.h 8.1 (Berkeley) 5/31/93
*/
-/*-
- * Copyright (c) 1992 Keith Muller.
- *
- * This code is derived from software contributed to Berkeley by
- * Keith Muller of the University of California, San Diego.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 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
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * @(#)cpio.h 8.1 (Berkeley) 5/31/93
- */
-
/*
* Defines common to all versions of cpio
*/
Home |
Main Index |
Thread Index |
Old Index