pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/archivers/pax/files sync with -current:
details: https://anonhg.NetBSD.org/pkgsrc/rev/c8982fd766d2
branches: trunk
changeset: 465054:c8982fd766d2
user: grant <grant%pkgsrc.org@localhost>
date: Sat Dec 20 04:45:04 2003 +0000
description:
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.
diffstat:
archivers/pax/files/ar_io.c | 40 +++-------------------------------------
archivers/pax/files/ar_subs.c | 40 +++-------------------------------------
archivers/pax/files/buf_subs.c | 40 +++-------------------------------------
archivers/pax/files/cpio.c | 40 +++-------------------------------------
archivers/pax/files/cpio.h | 40 ++--------------------------------------
archivers/pax/files/extern.h | 40 ++--------------------------------------
archivers/pax/files/file_subs.c | 40 +++-------------------------------------
archivers/pax/files/ftree.c | 40 +++-------------------------------------
archivers/pax/files/ftree.h | 40 ++--------------------------------------
archivers/pax/files/gen_subs.c | 40 +++-------------------------------------
archivers/pax/files/options.c | 40 +++-------------------------------------
archivers/pax/files/options.h | 40 ++--------------------------------------
archivers/pax/files/pat_rep.c | 40 +++-------------------------------------
archivers/pax/files/pat_rep.h | 40 ++--------------------------------------
archivers/pax/files/pax.1 | 36 ++----------------------------------
archivers/pax/files/pax.c | 40 +++-------------------------------------
archivers/pax/files/pax.h | 40 ++--------------------------------------
archivers/pax/files/sel_subs.c | 40 +++-------------------------------------
archivers/pax/files/sel_subs.h | 40 ++--------------------------------------
archivers/pax/files/tables.c | 40 +++-------------------------------------
archivers/pax/files/tables.h | 40 ++--------------------------------------
archivers/pax/files/tar.c | 40 +++-------------------------------------
archivers/pax/files/tar.h | 40 ++--------------------------------------
archivers/pax/files/tty_subs.c | 40 +++-------------------------------------
24 files changed, 62 insertions(+), 894 deletions(-)
diffs (truncated from 1437 to 300 lines):
diff -r 960a00fffc99 -r c8982fd766d2 archivers/pax/files/ar_io.c
--- a/archivers/pax/files/ar_io.c Sat Dec 20 04:24:24 2003 +0000
+++ b/archivers/pax/files/ar_io.c Sat Dec 20 04:45:04 2003 +0000
@@ -1,6 +1,7 @@
-/* $NetBSD: ar_io.c,v 1.4 2003/12/05 16:35:54 erh Exp $ */
+/* $NetBSD: ar_io.c,v 1.5 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[] = "@(#)ar_io.c 8.2 (Berkeley) 4/18/94";
#else
-__RCSID("$NetBSD: ar_io.c,v 1.4 2003/12/05 16:35:54 erh Exp $");
+__RCSID("$NetBSD: ar_io.c,v 1.5 2003/12/20 04:45:04 grant Exp $");
#endif
#endif /* not lint */
diff -r 960a00fffc99 -r c8982fd766d2 archivers/pax/files/ar_subs.c
--- a/archivers/pax/files/ar_subs.c Sat Dec 20 04:24:24 2003 +0000
+++ b/archivers/pax/files/ar_subs.c Sat Dec 20 04:45:04 2003 +0000
@@ -1,6 +1,7 @@
-/* $NetBSD: ar_subs.c,v 1.4 2003/09/05 18:40:50 jlam Exp $ */
+/* $NetBSD: ar_subs.c,v 1.5 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[] = "@(#)ar_subs.c 8.2 (Berkeley) 4/18/94";
#else
-__RCSID("$NetBSD: ar_subs.c,v 1.4 2003/09/05 18:40:50 jlam Exp $");
+__RCSID("$NetBSD: ar_subs.c,v 1.5 2003/12/20 04:45:04 grant Exp $");
#endif
#endif /* not lint */
diff -r 960a00fffc99 -r c8982fd766d2 archivers/pax/files/buf_subs.c
--- a/archivers/pax/files/buf_subs.c Sat Dec 20 04:24:24 2003 +0000
+++ b/archivers/pax/files/buf_subs.c Sat Dec 20 04:45:04 2003 +0000
@@ -1,6 +1,7 @@
-/* $NetBSD: buf_subs.c,v 1.2 2003/09/05 18:40:50 jlam Exp $ */
+/* $NetBSD: buf_subs.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[] = "@(#)buf_subs.c 8.2 (Berkeley) 4/18/94";
#else
-__RCSID("$NetBSD: buf_subs.c,v 1.2 2003/09/05 18:40:50 jlam Exp $");
+__RCSID("$NetBSD: buf_subs.c,v 1.3 2003/12/20 04:45:04 grant Exp $");
#endif
#endif /* not lint */
diff -r 960a00fffc99 -r c8982fd766d2 archivers/pax/files/cpio.c
--- a/archivers/pax/files/cpio.c Sat Dec 20 04:24:24 2003 +0000
+++ b/archivers/pax/files/cpio.c Sat Dec 20 04:45:04 2003 +0000
@@ -1,6 +1,7 @@
-/* $NetBSD: cpio.c,v 1.2 2003/09/05 18:40:50 jlam Exp $ */
+/* $NetBSD: cpio.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[] = "@(#)cpio.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: cpio.c,v 1.2 2003/09/05 18:40:50 jlam Exp $");
+__RCSID("$NetBSD: cpio.c,v 1.3 2003/12/20 04:45:04 grant Exp $");
#endif
#endif /* not lint */
diff -r 960a00fffc99 -r c8982fd766d2 archivers/pax/files/cpio.h
--- a/archivers/pax/files/cpio.h Sat Dec 20 04:24:24 2003 +0000
+++ b/archivers/pax/files/cpio.h Sat Dec 20 04:45:04 2003 +0000
@@ -1,6 +1,7 @@
-/* $NetBSD: cpio.h,v 1.2 2003/09/05 18:40:51 jlam Exp $ */
+/* $NetBSD: cpio.h,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.
*
@@ -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
Home |
Main Index |
Thread Index |
Old Index