Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src Drop 3rd and 4th clauses from David Young's license.



details:   https://anonhg.NetBSD.org/src/rev/1e8a1f259919
branches:  trunk
changeset: 748302:1e8a1f259919
user:      rmind <rmind%NetBSD.org@localhost>
date:      Mon Oct 19 23:19:37 2009 +0000

description:
Drop 3rd and 4th clauses from David Young's license.
Reviewed and approved by dyoung@ (copyright holder).

diffstat:

 dist/tcpdump/cpack.c                             |   5 +----
 dist/tcpdump/cpack.h                             |   5 +----
 dist/tcpdump/ieee802_11_radio.h                  |   5 +----
 dist/wpa/hostapd/radiotap.h                      |   5 +----
 share/man/man3/bits.3                            |   5 +----
 share/man/man4/atw.4                             |   7 ++-----
 share/man/man4/man4.i386/cmos.4                  |   5 +----
 share/man/man4/man4.i386/elanpar.4               |   5 +----
 share/man/man4/man4.i386/elanpex.4               |   5 +----
 share/man/man4/man4.i386/geodewdog.4             |   8 +-------
 share/man/man9/in_getifa.9                       |   5 +----
 share/man/man9/rssadapt.9                        |   5 +----
 sys/arch/i386/isa/cmos.c                         |   7 ++-----
 sys/arch/i386/pci/geode.c                        |  10 ++--------
 sys/arch/i386/pci/geodereg.h                     |   8 +-------
 sys/arch/i386/pci/geodewdg.c                     |  10 ++--------
 sys/arch/mips/adm5120/adm5120_extio_space.c      |   7 ++-----
 sys/arch/mips/adm5120/dev/admgpio.c              |   7 ++-----
 sys/arch/mips/adm5120/dev/admpci.c               |   7 ++-----
 sys/arch/mips/adm5120/dev/admwdog.c              |   7 ++-----
 sys/arch/mips/adm5120/dev/wdc_extio.c            |   7 ++-----
 sys/arch/mips/adm5120/include/adm5120_extiovar.h |   5 +----
 sys/arch/mips/adm5120/include/adm5120_pcivar.h   |   5 +----
 sys/dev/cardbus/if_rtw_cardbus.c                 |   7 ++-----
 sys/dev/ic/al2210reg.h                           |   5 +----
 sys/dev/ic/ath_netbsd.c                          |   6 ++----
 sys/dev/ic/ath_netbsd.h                          |   4 +---
 sys/dev/ic/hfa3861areg.h                         |   7 ++-----
 sys/dev/ic/max2820reg.h                          |   5 +----
 sys/dev/ic/rf3000reg.h                           |   5 +----
 sys/dev/ic/rtw.c                                 |   7 ++-----
 sys/dev/ic/rtwphy.c                              |   7 ++-----
 sys/dev/ic/rtwphy.h                              |   5 +----
 sys/dev/ic/rtwphyio.c                            |   7 ++-----
 sys/dev/ic/rtwphyio.h                            |   5 +----
 sys/dev/ic/rtwreg.h                              |   5 +----
 sys/dev/ic/rtwvar.h                              |   5 +----
 sys/dev/ic/sa2400reg.h                           |   5 +----
 sys/dev/ic/si4136reg.h                           |   5 +----
 sys/net80211/ieee80211_radiotap.h                |   5 +----
 sys/net80211/ieee80211_rssadapt.c                |   7 ++-----
 sys/net80211/ieee80211_rssadapt.h                |   5 +----
 sys/net80211/ieee80211_sysctl.h                  |   5 +----
 sys/netinet/in_selsrc.c                          |  10 ++--------
 44 files changed, 61 insertions(+), 206 deletions(-)

diffs (truncated from 997 to 300 lines):

diff -r c96746f5ae2a -r 1e8a1f259919 dist/tcpdump/cpack.c
--- a/dist/tcpdump/cpack.c      Mon Oct 19 22:49:44 2009 +0000
+++ b/dist/tcpdump/cpack.c      Mon Oct 19 23:19:37 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpack.c,v 1.2 2007/07/24 11:53:37 drochner Exp $       */
+/*     $NetBSD: cpack.c,v 1.3 2009/10/19 23:19:37 rmind Exp $  */
 
 /*-
  * Copyright (c) 2003, 2004 David Young.  All rights reserved.
@@ -11,9 +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. The name of David Young may not be used to endorse or promote
- *    products derived from this software without specific prior
- *    written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY DAVID YOUNG ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
diff -r c96746f5ae2a -r 1e8a1f259919 dist/tcpdump/cpack.h
--- a/dist/tcpdump/cpack.h      Mon Oct 19 22:49:44 2009 +0000
+++ b/dist/tcpdump/cpack.h      Mon Oct 19 23:19:37 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpack.h,v 1.2 2007/07/24 11:53:37 drochner Exp $       */
+/*     $NetBSD: cpack.h,v 1.3 2009/10/19 23:19:38 rmind Exp $  */
 
 /*-
  * Copyright (c) 2003, 2004 David Young.  All rights reserved.
@@ -11,9 +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. The name of David Young may not be used to endorse or promote
- *    products derived from this software without specific prior
- *    written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY DAVID YOUNG ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
diff -r c96746f5ae2a -r 1e8a1f259919 dist/tcpdump/ieee802_11_radio.h
--- a/dist/tcpdump/ieee802_11_radio.h   Mon Oct 19 22:49:44 2009 +0000
+++ b/dist/tcpdump/ieee802_11_radio.h   Mon Oct 19 23:19:37 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ieee802_11_radio.h,v 1.3 2007/07/24 11:53:39 drochner Exp $    */
+/*     $NetBSD: ieee802_11_radio.h,v 1.4 2009/10/19 23:19:38 rmind Exp $       */
 
 /* $FreeBSD: src/sys/net80211/ieee80211_radiotap.h,v 1.5 2005/01/22 20:12:05 sam Exp $ */
 /* NetBSD: ieee802_11_radio.h,v 1.2 2006/02/26 03:04:03 dyoung Exp */
@@ -15,9 +15,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. The name of David Young may not be used to endorse or promote
- *    products derived from this software without specific prior
- *    written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY DAVID YOUNG ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
diff -r c96746f5ae2a -r 1e8a1f259919 dist/wpa/hostapd/radiotap.h
--- a/dist/wpa/hostapd/radiotap.h       Mon Oct 19 22:49:44 2009 +0000
+++ b/dist/wpa/hostapd/radiotap.h       Mon Oct 19 23:19:37 2009 +0000
@@ -1,5 +1,5 @@
 /* $FreeBSD: src/sys/net80211/ieee80211_radiotap.h,v 1.5 2005/01/22 20:12:05 sam Exp $ */
-/* $NetBSD: radiotap.h,v 1.1.1.1 2008/08/30 07:27:11 christos Exp $ */
+/* $NetBSD: radiotap.h,v 1.2 2009/10/19 23:19:38 rmind Exp $ */
 
 /*-
  * Copyright (c) 2003, 2004 David Young.  All rights reserved.
@@ -12,9 +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. The name of David Young may not be used to endorse or promote
- *    products derived from this software without specific prior
- *    written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY DAVID YOUNG ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
diff -r c96746f5ae2a -r 1e8a1f259919 share/man/man3/bits.3
--- a/share/man/man3/bits.3     Mon Oct 19 22:49:44 2009 +0000
+++ b/share/man/man3/bits.3     Mon Oct 19 23:19:37 2009 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: bits.3,v 1.3 2008/08/19 22:54:53 jnemeth Exp $
+.\"    $NetBSD: bits.3,v 1.4 2009/10/19 23:19:38 rmind Exp $
 .\"
 .\" Copyright (c) 2006 David Young.  All rights reserved.
 .\"
@@ -11,9 +11,6 @@
 .\"    copyright notice, this list of conditions and the following
 .\"    disclaimer in the documentation and/or other materials
 .\"    provided with the distribution.
-.\" 3. The name of David Young may not be used to endorse or promote
-.\"    products derived from this software without specific prior
-.\"    written permission.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY DAVID YOUNG ``AS IS'' AND ANY
 .\" EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
diff -r c96746f5ae2a -r 1e8a1f259919 share/man/man4/atw.4
--- a/share/man/man4/atw.4      Mon Oct 19 22:49:44 2009 +0000
+++ b/share/man/man4/atw.4      Mon Oct 19 23:19:37 2009 +0000
@@ -1,4 +1,4 @@
-.\"     $NetBSD: atw.4,v 1.10 2005/06/23 12:47:38 peter Exp $
+.\"     $NetBSD: atw.4,v 1.11 2009/10/19 23:19:38 rmind Exp $
 .\"
 .\" Copyright (c) 2003
 .\"    David Young <dyoung%NetBSD.org@localhost>. All rights reserved.
@@ -11,9 +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. Neither the name of the author nor the names of any co-contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY David Young AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -27,7 +24,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"    $Id: atw.4,v 1.10 2005/06/23 12:47:38 peter Exp $
+.\"    $Id: atw.4,v 1.11 2009/10/19 23:19:38 rmind Exp $
 .\"
 .Dd June 5, 2004
 .Dt ATW 4
diff -r c96746f5ae2a -r 1e8a1f259919 share/man/man4/man4.i386/cmos.4
--- a/share/man/man4/man4.i386/cmos.4   Mon Oct 19 22:49:44 2009 +0000
+++ b/share/man/man4/man4.i386/cmos.4   Mon Oct 19 23:19:37 2009 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: cmos.4,v 1.5 2009/03/23 16:04:25 joerg Exp $
+.\" $NetBSD: cmos.4,v 1.6 2009/10/19 23:19:38 rmind Exp $
 .\"
 .\" Copyright (c) 2007 David Young.  All rights reserved.
 .\"
@@ -13,9 +13,6 @@
 .\"    copyright notice, this list of conditions and the following
 .\"    disclaimer in the documentation and/or other materials
 .\"    provided with the distribution.
-.\" 3. David Young's name may not be used to endorse or promote
-.\"    products derived from this software without specific prior
-.\"    written permission.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY DAVID YOUNG ``AS IS'' AND ANY
 .\" EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
diff -r c96746f5ae2a -r 1e8a1f259919 share/man/man4/man4.i386/elanpar.4
--- a/share/man/man4/man4.i386/elanpar.4        Mon Oct 19 22:49:44 2009 +0000
+++ b/share/man/man4/man4.i386/elanpar.4        Mon Oct 19 23:19:37 2009 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: elanpar.4,v 1.3 2008/04/08 20:30:16 dyoung Exp $
+.\"    $NetBSD: elanpar.4,v 1.4 2009/10/19 23:19:38 rmind Exp $
 .\"
 .\"
 .\" Copyright (c) 2008 David Young.  All rights reserved.
@@ -14,9 +14,6 @@
 .\"    copyright notice, this list of conditions and the following
 .\"    disclaimer in the documentation and/or other materials
 .\"    provided with the distribution.
-.\" 3. David Young's name may not be used to endorse or promote
-.\"    products derived from this software without specific prior
-.\"    written permission.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY DAVID YOUNG ``AS IS'' AND ANY
 .\" EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
diff -r c96746f5ae2a -r 1e8a1f259919 share/man/man4/man4.i386/elanpex.4
--- a/share/man/man4/man4.i386/elanpex.4        Mon Oct 19 22:49:44 2009 +0000
+++ b/share/man/man4/man4.i386/elanpex.4        Mon Oct 19 23:19:37 2009 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: elanpex.4,v 1.3 2008/04/08 20:30:16 dyoung Exp $
+.\"    $NetBSD: elanpex.4,v 1.4 2009/10/19 23:19:38 rmind Exp $
 .\"
 .\"
 .\" Copyright (c) 2008 David Young.  All rights reserved.
@@ -14,9 +14,6 @@
 .\"    copyright notice, this list of conditions and the following
 .\"    disclaimer in the documentation and/or other materials
 .\"    provided with the distribution.
-.\" 3. David Young's name may not be used to endorse or promote
-.\"    products derived from this software without specific prior
-.\"    written permission.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY DAVID YOUNG ``AS IS'' AND ANY
 .\" EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
diff -r c96746f5ae2a -r 1e8a1f259919 share/man/man4/man4.i386/geodewdog.4
--- a/share/man/man4/man4.i386/geodewdog.4      Mon Oct 19 22:49:44 2009 +0000
+++ b/share/man/man4/man4.i386/geodewdog.4      Mon Oct 19 23:19:37 2009 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: geodewdog.4,v 1.3 2006/06/24 12:20:19 kardel Exp $
+.\"    $NetBSD: geodewdog.4,v 1.4 2009/10/19 23:19:38 rmind Exp $
 .\"
 .\" Copyright (c) 2005 David Young.  All rights reserved.
 .\"
@@ -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 David Young..
-.\" 4. The name of David Young may not be used to endorse or promote
-.\"    products derived from this software without specific prior
-.\"    written permission.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY DAVID YOUNG ``AS IS'' AND ANY
 .\" EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
diff -r c96746f5ae2a -r 1e8a1f259919 share/man/man9/in_getifa.9
--- a/share/man/man9/in_getifa.9        Mon Oct 19 22:49:44 2009 +0000
+++ b/share/man/man9/in_getifa.9        Mon Oct 19 23:19:37 2009 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: in_getifa.9,v 1.5 2009/03/09 19:24:32 joerg Exp $
+.\" $NetBSD: in_getifa.9,v 1.6 2009/10/19 23:19:37 rmind Exp $
 .\"
 .\" Copyright (c) 2006 David Young.  All rights reserved.
 .\"
@@ -13,9 +13,6 @@
 .\"    copyright notice, this list of conditions and the following
 .\"    disclaimer in the documentation and/or other materials provided
 .\"    with the distribution.
-.\" 3. David Young's name may not be used to endorse or promote
-.\"    products derived from this software without specific prior
-.\"    written permission.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY DAVID YOUNG ``AS IS'' AND ANY
 .\" EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
diff -r c96746f5ae2a -r 1e8a1f259919 share/man/man9/rssadapt.9
--- a/share/man/man9/rssadapt.9 Mon Oct 19 22:49:44 2009 +0000
+++ b/share/man/man9/rssadapt.9 Mon Oct 19 23:19:37 2009 +0000
@@ -1,4 +1,4 @@
-.\"     $NetBSD: rssadapt.9,v 1.5 2006/02/25 01:04:26 wiz Exp $
+.\"     $NetBSD: rssadapt.9,v 1.6 2009/10/19 23:19:37 rmind Exp $
 .\"
 .\" Copyright (c) 2004 David Young.  All rights reserved.
 .\"
@@ -13,9 +13,6 @@
 .\"    copyright notice, this list of conditions and the following
 .\"    disclaimer in the documentation and/or other materials
 .\"    provided with the distribution.
-.\" 3. The name of David Young may not be used to endorse or promote
-.\"    products derived from this software without specific prior
-.\"    written permission.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY David Young ``AS IS'' AND ANY
 .\" EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
diff -r c96746f5ae2a -r 1e8a1f259919 sys/arch/i386/isa/cmos.c
--- a/sys/arch/i386/isa/cmos.c  Mon Oct 19 22:49:44 2009 +0000
+++ b/sys/arch/i386/isa/cmos.c  Mon Oct 19 23:19:37 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cmos.c,v 1.7 2009/04/15 20:44:26 elad Exp $    */
+/*     $NetBSD: cmos.c,v 1.8 2009/10/19 23:19:38 rmind Exp $   */
 
 /*
  * Copyright (C) 2003 JONE System Co., Inc.
@@ -43,9 +43,6 @@
  *    copyright notice, this list of conditions and the following
  *    disclaimer in the documentation and/or other materials provided
  *    with the distribution.
- * 3. The name of David Young 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
@@ -62,7 +59,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cmos.c,v 1.7 2009/04/15 20:44:26 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cmos.c,v 1.8 2009/10/19 23:19:38 rmind Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r c96746f5ae2a -r 1e8a1f259919 sys/arch/i386/pci/geode.c
--- a/sys/arch/i386/pci/geode.c Mon Oct 19 22:49:44 2009 +0000
+++ b/sys/arch/i386/pci/geode.c Mon Oct 19 23:19:37 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: geode.c,v 1.13 2008/05/10 13:38:34 jmcneill Exp $      */
+/*     $NetBSD: geode.c,v 1.14 2009/10/19 23:19:38 rmind Exp $ */
 
 /*-
  * Copyright (c) 2005 David Young.  All rights reserved.
@@ -14,12 +14,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 David Young.
- * 4. The name of David Young may not be used to endorse or promote
- *    products derived from this software without specific prior
- *    written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY DAVID YOUNG ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
@@ -70,7 +64,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: geode.c,v 1.13 2008/05/10 13:38:34 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: geode.c,v 1.14 2009/10/19 23:19:38 rmind Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>



Home | Main Index | Thread Index | Old Index