Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Follow upstream's lead and remove third and fourth clauses (...
details: https://anonhg.NetBSD.org/src/rev/514945ec5d3f
branches: trunk
changeset: 748308:514945ec5d3f
user: snj <snj%NetBSD.org@localhost>
date: Tue Oct 20 00:51:13 2009 +0000
description:
Follow upstream's lead and remove third and fourth clauses (except on
from usr.sbin/mopd/common/pf.c, where only the ad clause is removed,
because it has a shared UCB copyright) on Mats O Jansson's files.
thorpej OK'd usr.sbin/rpc.yppasswdd/yppasswdd_mkpw.c, where he shares
copyright.
diffstat:
sys/kern/subr_userconf.c | 10 ++--------
usr.sbin/mopd/common/cmp.c | 9 ++-------
usr.sbin/mopd/common/cmp.h | 9 ++-------
usr.sbin/mopd/common/common.h | 9 ++-------
usr.sbin/mopd/common/device.c | 9 ++-------
usr.sbin/mopd/common/device.h | 9 ++-------
usr.sbin/mopd/common/dl.c | 9 ++-------
usr.sbin/mopd/common/dl.h | 9 ++-------
usr.sbin/mopd/common/file.c | 9 ++-------
usr.sbin/mopd/common/file.h | 9 ++-------
usr.sbin/mopd/common/get.c | 9 ++-------
usr.sbin/mopd/common/get.h | 9 ++-------
usr.sbin/mopd/common/loop-bsd.c | 9 ++-------
usr.sbin/mopd/common/mopdef.c | 9 ++-------
usr.sbin/mopd/common/mopdef.h | 9 ++-------
usr.sbin/mopd/common/nma.c | 9 ++-------
usr.sbin/mopd/common/nma.h | 9 ++-------
usr.sbin/mopd/common/nmadef.h | 9 ++-------
usr.sbin/mopd/common/os.h | 9 ++-------
usr.sbin/mopd/common/pf.c | 9 +++------
usr.sbin/mopd/common/pf.h | 9 ++-------
usr.sbin/mopd/common/print.c | 9 ++-------
usr.sbin/mopd/common/print.h | 9 ++-------
usr.sbin/mopd/common/put.c | 9 ++-------
usr.sbin/mopd/common/put.h | 9 ++-------
usr.sbin/mopd/common/rc.c | 9 ++-------
usr.sbin/mopd/common/rc.h | 9 ++-------
usr.sbin/mopd/mopchk/mopchk.1 | 7 +------
usr.sbin/mopd/mopchk/mopchk.c | 9 ++-------
usr.sbin/mopd/mopcopy/mopcopy.1 | 7 +------
usr.sbin/mopd/mopd/mopd.8 | 7 +------
usr.sbin/mopd/mopd/mopd.c | 9 ++-------
usr.sbin/mopd/mopd/process.c | 9 ++-------
usr.sbin/mopd/mopd/process.h | 9 ++-------
usr.sbin/mopd/mopprobe/mopprobe.1 | 7 +------
usr.sbin/mopd/mopprobe/mopprobe.c | 9 ++-------
usr.sbin/mopd/moptrace/moptrace.1 | 9 ++-------
usr.sbin/mopd/moptrace/moptrace.c | 9 ++-------
usr.sbin/rpc.yppasswdd/extern.h | 7 +------
usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8 | 7 +------
usr.sbin/rpc.yppasswdd/rpc.yppasswdd.c | 9 ++-------
usr.sbin/rpc.yppasswdd/yppasswdd_mkpw.c | 9 ++-------
usr.sbin/ypserv/common/ypdef.h | 7 +------
usr.sbin/ypserv/makedbm/makedbm.8 | 7 +------
usr.sbin/ypserv/makedbm/makedbm.c | 9 ++-------
usr.sbin/ypserv/mkalias/mkalias.8 | 7 +------
usr.sbin/ypserv/mkalias/mkalias.c | 9 ++-------
usr.sbin/ypserv/mknetid/mknetid.8 | 7 +------
usr.sbin/ypserv/mknetid/mknetid.c | 9 ++-------
usr.sbin/ypserv/mknetid/netid.5 | 7 +------
usr.sbin/ypserv/stdethers/stdethers.8 | 7 +------
usr.sbin/ypserv/stdethers/stdethers.c | 9 ++-------
usr.sbin/ypserv/stdhosts/stdhosts.8 | 7 +------
usr.sbin/ypserv/stdhosts/stdhosts.c | 9 ++-------
usr.sbin/ypserv/yppush/yppush.8 | 7 +------
usr.sbin/ypserv/yppush/yppush.h | 7 +------
usr.sbin/ypserv/yppush/yppush_err.c | 9 ++-------
usr.sbin/ypserv/yppush/yppush_proc.c | 9 ++-------
usr.sbin/ypserv/ypserv/ypserv.8 | 7 +------
usr.sbin/ypserv/ypserv/ypserv.c | 9 ++-------
usr.sbin/ypserv/ypserv/ypserv_proc.c | 9 ++-------
usr.sbin/ypserv/yptest/yptest.8 | 7 +------
usr.sbin/ypserv/yptest/yptest.c | 9 ++-------
usr.sbin/ypserv/ypxfr/ypxfr.8 | 7 +------
usr.sbin/ypserv/ypxfr/ypxfr.c | 9 ++-------
65 files changed, 113 insertions(+), 437 deletions(-)
diffs (truncated from 1789 to 300 lines):
diff -r 44ab90dc246d -r 514945ec5d3f sys/kern/subr_userconf.c
--- a/sys/kern/subr_userconf.c Tue Oct 20 00:32:11 2009 +0000
+++ b/sys/kern/subr_userconf.c Tue Oct 20 00:51:13 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_userconf.c,v 1.18 2005/12/11 12:24:30 christos Exp $ */
+/* $NetBSD: subr_userconf.c,v 1.19 2009/10/20 00:51:13 snj Exp $ */
/*
* Copyright (c) 1996 Mats O Jansson <moj%stacken.kth.se@localhost>
@@ -12,12 +12,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 by Mats O Jansson.
- * 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
@@ -35,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_userconf.c,v 1.18 2005/12/11 12:24:30 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_userconf.c,v 1.19 2009/10/20 00:51:13 snj Exp $");
#include "opt_userconf.h"
diff -r 44ab90dc246d -r 514945ec5d3f usr.sbin/mopd/common/cmp.c
--- a/usr.sbin/mopd/common/cmp.c Tue Oct 20 00:32:11 2009 +0000
+++ b/usr.sbin/mopd/common/cmp.c Tue Oct 20 00:51:13 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cmp.c,v 1.3 1997/10/16 23:24:21 lukem Exp $ */
+/* $NetBSD: cmp.c,v 1.4 2009/10/20 00:51:13 snj Exp $ */
/*
* Copyright (c) 1993-95 Mats O Jansson. All rights reserved.
@@ -11,11 +11,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 by Mats O Jansson.
- * 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
@@ -31,7 +26,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: cmp.c,v 1.3 1997/10/16 23:24:21 lukem Exp $");
+__RCSID("$NetBSD: cmp.c,v 1.4 2009/10/20 00:51:13 snj Exp $");
#endif
#include "os.h"
diff -r 44ab90dc246d -r 514945ec5d3f usr.sbin/mopd/common/cmp.h
--- a/usr.sbin/mopd/common/cmp.h Tue Oct 20 00:32:11 2009 +0000
+++ b/usr.sbin/mopd/common/cmp.h Tue Oct 20 00:51:13 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cmp.h,v 1.4 2001/01/16 02:50:31 cgd Exp $ */
+/* $NetBSD: cmp.h,v 1.5 2009/10/20 00:51:13 snj Exp $ */
/*
* Copyright (c) 1993-95 Mats O Jansson. All rights reserved.
@@ -11,11 +11,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 by Mats O Jansson.
- * 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
@@ -28,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $NetBSD: cmp.h,v 1.4 2001/01/16 02:50:31 cgd Exp $
+ * $NetBSD: cmp.h,v 1.5 2009/10/20 00:51:13 snj Exp $
*
*/
diff -r 44ab90dc246d -r 514945ec5d3f usr.sbin/mopd/common/common.h
--- a/usr.sbin/mopd/common/common.h Tue Oct 20 00:32:11 2009 +0000
+++ b/usr.sbin/mopd/common/common.h Tue Oct 20 00:51:13 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: common.h,v 1.6 2002/06/06 22:52:25 thorpej Exp $ */
+/* $NetBSD: common.h,v 1.7 2009/10/20 00:51:13 snj Exp $ */
/*
* Copyright (c) 1993-95 Mats O Jansson. All rights reserved.
@@ -11,11 +11,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 by Mats O Jansson.
- * 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
@@ -28,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $NetBSD: common.h,v 1.6 2002/06/06 22:52:25 thorpej Exp $
+ * $NetBSD: common.h,v 1.7 2009/10/20 00:51:13 snj Exp $
*
*/
diff -r 44ab90dc246d -r 514945ec5d3f usr.sbin/mopd/common/device.c
--- a/usr.sbin/mopd/common/device.c Tue Oct 20 00:32:11 2009 +0000
+++ b/usr.sbin/mopd/common/device.c Tue Oct 20 00:51:13 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: device.c,v 1.9 2003/11/10 08:51:52 wiz Exp $ */
+/* $NetBSD: device.c,v 1.10 2009/10/20 00:51:13 snj Exp $ */
/*
* Copyright (c) 1993-95 Mats O Jansson. All rights reserved.
@@ -11,11 +11,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 by Mats O Jansson.
- * 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
@@ -31,7 +26,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: device.c,v 1.9 2003/11/10 08:51:52 wiz Exp $");
+__RCSID("$NetBSD: device.c,v 1.10 2009/10/20 00:51:13 snj Exp $");
#endif
#include "os.h"
diff -r 44ab90dc246d -r 514945ec5d3f usr.sbin/mopd/common/device.h
--- a/usr.sbin/mopd/common/device.h Tue Oct 20 00:32:11 2009 +0000
+++ b/usr.sbin/mopd/common/device.h Tue Oct 20 00:51:13 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: device.h,v 1.4 2001/01/16 02:50:31 cgd Exp $ */
+/* $NetBSD: device.h,v 1.5 2009/10/20 00:51:13 snj Exp $ */
/*
* Copyright (c) 1993-95 Mats O Jansson. All rights reserved.
@@ -11,11 +11,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 by Mats O Jansson.
- * 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
@@ -28,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $NetBSD: device.h,v 1.4 2001/01/16 02:50:31 cgd Exp $
+ * $NetBSD: device.h,v 1.5 2009/10/20 00:51:13 snj Exp $
*
*/
diff -r 44ab90dc246d -r 514945ec5d3f usr.sbin/mopd/common/dl.c
--- a/usr.sbin/mopd/common/dl.c Tue Oct 20 00:32:11 2009 +0000
+++ b/usr.sbin/mopd/common/dl.c Tue Oct 20 00:51:13 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dl.c,v 1.5 2009/04/17 04:16:57 lukem Exp $ */
+/* $NetBSD: dl.c,v 1.6 2009/10/20 00:51:13 snj Exp $ */
/*
* Copyright (c) 1993-95 Mats O Jansson. All rights reserved.
@@ -11,11 +11,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 by Mats O Jansson.
- * 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
@@ -31,7 +26,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: dl.c,v 1.5 2009/04/17 04:16:57 lukem Exp $");
+__RCSID("$NetBSD: dl.c,v 1.6 2009/10/20 00:51:13 snj Exp $");
#endif
#include "os.h"
diff -r 44ab90dc246d -r 514945ec5d3f usr.sbin/mopd/common/dl.h
--- a/usr.sbin/mopd/common/dl.h Tue Oct 20 00:32:11 2009 +0000
+++ b/usr.sbin/mopd/common/dl.h Tue Oct 20 00:51:13 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dl.h,v 1.4 2001/01/16 02:50:31 cgd Exp $ */
+/* $NetBSD: dl.h,v 1.5 2009/10/20 00:51:13 snj Exp $ */
/*
* Copyright (c) 1993-95 Mats O Jansson. All rights reserved.
@@ -11,11 +11,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 by Mats O Jansson.
- * 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
@@ -28,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $NetBSD: dl.h,v 1.4 2001/01/16 02:50:31 cgd Exp $
+ * $NetBSD: dl.h,v 1.5 2009/10/20 00:51:13 snj Exp $
*
*/
diff -r 44ab90dc246d -r 514945ec5d3f usr.sbin/mopd/common/file.c
--- a/usr.sbin/mopd/common/file.c Tue Oct 20 00:32:11 2009 +0000
+++ b/usr.sbin/mopd/common/file.c Tue Oct 20 00:51:13 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: file.c,v 1.11 2009/04/17 04:16:57 lukem Exp $ */
+/* $NetBSD: file.c,v 1.12 2009/10/20 00:51:13 snj Exp $ */
/*
* Copyright (c) 1995-96 Mats O Jansson. All rights reserved.
@@ -11,11 +11,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 by Mats O Jansson.
- * 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
@@ -31,7 +26,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: file.c,v 1.11 2009/04/17 04:16:57 lukem Exp $");
+__RCSID("$NetBSD: file.c,v 1.12 2009/10/20 00:51:13 snj Exp $");
#endif
#include "os.h"
diff -r 44ab90dc246d -r 514945ec5d3f usr.sbin/mopd/common/file.h
--- a/usr.sbin/mopd/common/file.h Tue Oct 20 00:32:11 2009 +0000
+++ b/usr.sbin/mopd/common/file.h Tue Oct 20 00:51:13 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: file.h,v 1.5 2002/06/06 22:52:25 thorpej Exp $ */
+/* $NetBSD: file.h,v 1.6 2009/10/20 00:51:13 snj Exp $ */
/*
* Copyright (c) 1993-95 Mats O Jansson. All rights reserved.
@@ -11,11 +11,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 by Mats O Jansson.
- * 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
@@ -28,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $NetBSD: file.h,v 1.5 2002/06/06 22:52:25 thorpej Exp $
+ * $NetBSD: file.h,v 1.6 2009/10/20 00:51:13 snj Exp $
*
*/
Home |
Main Index |
Thread Index |
Old Index