Diff for /embedaddon/iperf/LICENSE between versions 1.1.1.1 and 1.1.1.3

version 1.1.1.1, 2016/10/18 13:28:17 version 1.1.1.3, 2023/09/27 11:14:54
Line 1 Line 1
"iperf, Copyright (c) 2014-2016, The Regents of the University of California,"iperf, Copyright (c) 2014-2023, The Regents of the University of California,
through Lawrence Berkeley National Laboratory (subject to receipt of any through Lawrence Berkeley National Laboratory (subject to receipt of any
 required approvals from the U.S. Dept. of Energy).  All rights reserved."  required approvals from the U.S. Dept. of Energy).  All rights reserved."
   
 Redistribution and use in source and binary forms, with or without  Redistribution and use in source and binary forms, with or without
Line 42  such enhancements or derivative works thereof, in bina Line 42  such enhancements or derivative works thereof, in bina
   
 This software contains source code (src/cjson.{c,h}) that is:  This software contains source code (src/cjson.{c,h}) that is:
   
  Copyright (c) 2009 Dave Gamble  Copyright (c) 2009-2017 Dave Gamble and cJSON contributors
   
   Permission is hereby granted, free of charge, to any person obtaining a copy    Permission is hereby granted, free of charge, to any person obtaining a copy
   of this software and associated documentation files (the "Software"), to deal    of this software and associated documentation files (the "Software"), to deal
Line 110  This software contains source code (src/net.{c,h}) tha Line 110  This software contains source code (src/net.{c,h}) tha
   
 =====  =====
   
   This software contains source code (src/net.c) that is:
   
   /*
    * Copyright (c) 2001 Eric Jackson <ericj@monkey.org>
    *
    * 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. 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
    * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
    * IN NO EVENT SHALL THE AUTHOR 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.
    */
   
   =====
   
 This software contains source code (src/queue.h) that is:  This software contains source code (src/queue.h) that is:
   
   /*    /*
Line 142  This software contains source code (src/queue.h) that  Line 173  This software contains source code (src/queue.h) that 
    *     *
    *      @(#)queue.h     8.5 (Berkeley) 8/20/94     *      @(#)queue.h     8.5 (Berkeley) 8/20/94
    */     */
   
 =====  
   
 This software contains source code (src/tcp_window_size.{c,h}) that is:  
   
   /*---------------------------------------------------------------  
    * Copyright (c) 1999,2000,2001,2002,2003  
    * The Board of Trustees of the University of Illinois  
    * All Rights Reserved.  
    *---------------------------------------------------------------  
    * Permission is hereby granted, free of charge, to any person  
    * obtaining a copy of this software (Iperf) and associated  
    * documentation files (the "Software"), to deal in the Software  
    * without restriction, including without limitation the  
    * rights to use, copy, modify, merge, publish, distribute,  
    * sublicense, and/or sell copies of the Software, and to permit  
    * persons to whom the Software is furnished to do  
    * so, subject to the following conditions:  
    *  
    *  
    * Redistributions of source code must retain the above  
    * copyright notice, this list of conditions and  
    * the following disclaimers.  
    *  
    *  
    * Redistributions in binary form must reproduce the above  
    * copyright notice, this list of conditions and the following  
    * disclaimers in the documentation and/or other materials  
    * provided with the distribution.  
    *  
    *  
    * Neither the names of the University of Illinois, NCSA,  
    * nor the names of its contributors may be used to endorse  
    * or promote products derived from this Software without  
    * specific prior written permission.  
    *  
    * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,  
    * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES  
    * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND  
    * NONINFRINGEMENT. IN NO EVENT SHALL THE CONTIBUTORS OR COPYRIGHT  
    * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,  
    * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,  
    * ARISING FROM, OUT OF OR IN CONNECTION WITH THE  
    * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  
    * ________________________________________________________________  
    * National Laboratory for Applied Network Research  
    * National Center for Supercomputing Applications  
    * University of Illinois at Urbana-Champaign  
    * http://www.ncsa.uiuc.edu  
    * ________________________________________________________________  
    *  
    * tcp_window_size.c  
    * by Mark Gates <mgates@nlanr.net>  
    * -------------------------------------------------------------------  
    * set/getsockopt  
    * ------------------------------------------------------------------- */  
   
 =====  =====
   

Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.3


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>