svn commit: r203972 - in head/usr.sbin: eeprom makefs makefs/compat rpcbind usbdevs yppoll

Tue Feb 16 21:47:06 UTC 2010

Author: imp
Date: Tue Feb 16 21:47:05 2010
New Revision: 203972
URL: http://svn.freebsd.org/changeset/base/203972

Log:
  The NetBSD Foundation has given permission to remove clause 3 and 4
  from their liceense.
  
  Obtained from:	NetBSD

Modified:
  head/usr.sbin/eeprom/eeprom.8
  head/usr.sbin/eeprom/eeprom.c
  head/usr.sbin/makefs/compat/pwcache.c
  head/usr.sbin/makefs/compat/strsuftoll.c
  head/usr.sbin/makefs/getid.c
  head/usr.sbin/rpcbind/util.c
  head/usr.sbin/usbdevs/usbdevs.8
  head/usr.sbin/usbdevs/usbdevs.c
  head/usr.sbin/yppoll/yppoll.8

Modified: head/usr.sbin/eeprom/eeprom.8
==============================================================================

--- head/usr.sbin/eeprom/eeprom.8	Tue Feb 16 21:43:57 2010	(r203971)
+++ head/usr.sbin/eeprom/eeprom.8	Tue Feb 16 21:47:05 2010	(r203972)
@@ -13,13 +13,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 the NetBSD
-.\"        Foundation, Inc. and its contributors.
-.\" 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS
 .\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED

Modified: head/usr.sbin/eeprom/eeprom.c
==============================================================================
--- head/usr.sbin/eeprom/eeprom.c	Tue Feb 16 21:43:57 2010	(r203971)
+++ head/usr.sbin/eeprom/eeprom.c	Tue Feb 16 21:47:05 2010	(r203972)
@@ -13,13 +13,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 the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED

Modified: head/usr.sbin/makefs/compat/pwcache.c
==============================================================================
--- head/usr.sbin/makefs/compat/pwcache.c	Tue Feb 16 21:43:57 2010	(r203971)
+++ head/usr.sbin/makefs/compat/pwcache.c	Tue Feb 16 21:47:05 2010	(r203972)
@@ -45,13 +45,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 the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED

Modified: head/usr.sbin/makefs/compat/strsuftoll.c
==============================================================================
--- head/usr.sbin/makefs/compat/strsuftoll.c	Tue Feb 16 21:43:57 2010	(r203971)
+++ head/usr.sbin/makefs/compat/strsuftoll.c	Tue Feb 16 21:47:05 2010	(r203972)
@@ -14,13 +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 the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED

Modified: head/usr.sbin/makefs/getid.c
==============================================================================
--- head/usr.sbin/makefs/getid.c	Tue Feb 16 21:43:57 2010	(r203971)
+++ head/usr.sbin/makefs/getid.c	Tue Feb 16 21:47:05 2010	(r203972)
@@ -46,13 +46,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 the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED

Modified: head/usr.sbin/rpcbind/util.c
==============================================================================
--- head/usr.sbin/rpcbind/util.c	Tue Feb 16 21:43:57 2010	(r203971)
+++ head/usr.sbin/rpcbind/util.c	Tue Feb 16 21:47:05 2010	(r203972)
@@ -18,13 +18,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 the NetBSD
- *	Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -185,6 +178,8 @@ addrmerge(struct netbuf *caller, char *s
 		if (ifsa == NULL || ifsa->sa_family != hint_sa->sa_family ||
 		    !(ifap->ifa_flags & IFF_UP))
 			continue;
+		if (!addr_is_bound(ifsa))
+			continue;
 
 		if (!(ifap->ifa_flags & IFF_LOOPBACK) && !listen_addr(ifsa))
 			continue;

Modified: head/usr.sbin/usbdevs/usbdevs.8
==============================================================================
--- head/usr.sbin/usbdevs/usbdevs.8	Tue Feb 16 21:43:57 2010	(r203971)
+++ head/usr.sbin/usbdevs/usbdevs.8	Tue Feb 16 21:47:05 2010	(r203972)
@@ -12,13 +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 the NetBSD
-.\"        Foundation, Inc. and its contributors.
-.\" 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS
 .\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED

Modified: head/usr.sbin/usbdevs/usbdevs.c
==============================================================================
--- head/usr.sbin/usbdevs/usbdevs.c	Tue Feb 16 21:43:57 2010	(r203971)
+++ head/usr.sbin/usbdevs/usbdevs.c	Tue Feb 16 21:47:05 2010	(r203972)
@@ -16,13 +16,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 the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED

Modified: head/usr.sbin/yppoll/yppoll.8
==============================================================================
--- head/usr.sbin/yppoll/yppoll.8	Tue Feb 16 21:43:57 2010	(r203971)
+++ head/usr.sbin/yppoll/yppoll.8	Tue Feb 16 21:47:05 2010	(r203972)
@@ -12,13 +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 the NetBSD
-.\"        Foundation, Inc. and its contributors.
-.\" 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS
 .\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
