sync with -current:

Move Keith Muller's code from a 4-clause to a 3-clause licence by removing
the advertising clause. confirmed to the board by Keith Muller.

1 files changed, 3 insertions, 37 deletions

diff --git a/archivers/pax/files/tables.c b/archivers/pax/files/tables.c
index a4f44ef9e01..070415b4a3c 100644
--- a/archivers/pax/files/tables.c
+++ b/archivers/pax/files/tables.c
@@ -1,6 +1,7 @@
-/*	$NetBSD: tables.c,v 1.2 2003/09/05 18:40:55 jlam Exp $	*/
+/*	$NetBSD: tables.c,v 1.3 2003/12/20 04:45:04 grant Exp $	*/
 
 /*-
+ * Copyright (c) 1992 Keith Muller.
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -32,41 +33,6 @@
  * 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.
- */
-
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -78,7 +44,7 @@
 #if 0
 static char sccsid[] = "@(#)tables.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: tables.c,v 1.2 2003/09/05 18:40:55 jlam Exp $");
+__RCSID("$NetBSD: tables.c,v 1.3 2003/12/20 04:45:04 grant Exp $");
 #endif
 #endif /* not lint */