Handle the Set Buffer Address command differently; this gets rid of the

macro with the "give credit" license, so back that out of COPYING.

svn path=/trunk/; revision=32798

1 files changed, 15 insertions, 44 deletions

diff --git a/COPYING b/COPYING
index 1e2cc2fcf1..e836c8dca8 100644
--- a/COPYING
+++ b/COPYING
@@ -28,7 +28,7 @@ Parts of Wireshark can be built and distributed as libraries. These
 parts are still covered by the GPL, and NOT by the Lesser General Public
 License or any other license.
 
-If you integrate all or part of Wireshark into your own application, then
+If you integrate all or part of Wireshark into your own application, then 
 that application must be released under a license compatible with the GPL.
 
 The full text of the GNU GPL and the other applicable licenses follows.
@@ -383,7 +383,7 @@ Parts of this software are licensed as follows
 
    Copyright (c) 1988, 1992, 1993
         The Regents of the University of California.  All rights reserved.
-
+  
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
    are met:
@@ -395,7 +395,7 @@ Parts of this software are licensed as follows
    3. 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
@@ -410,7 +410,7 @@ Parts of this software are licensed as follows
 
 
    Copyright (c) 2003 Markus Friedl.  All rights reserved.
-
+  
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
    are met:
@@ -419,7 +419,7 @@ Parts of this software are licensed as follows
    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.
-
+  
    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.
@@ -434,25 +434,25 @@ Parts of this software are licensed as follows
 
    Copyright (c) 2003 Endace Technology Ltd, Hamilton, New Zealand.
    All rights reserved.
-
+  
    This software and documentation has been developed by Endace Technology Ltd.
    along with the DAG PCI network capture cards. For further information please
    visit http://www.endace.com/.
-
+  
    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 Endace Technology Ltd may not be used to endorse or promote
     products derived from this software without specific prior written
     permission.
-
+  
    THIS SOFTWARE IS PROVIDED BY ENDACE TECHNOLOGY LTD ``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
@@ -467,7 +467,7 @@ Parts of this software are licensed as follows
 
    Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
    All rights reserved.
-
+  
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
    are met:
@@ -479,7 +479,7 @@ Parts of this software are licensed as follows
    3. Neither the name of the project 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 PROJECT 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
@@ -494,7 +494,7 @@ Parts of this software are licensed as follows
 
 
    Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved.
-
+  
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
    are met:
@@ -503,7 +503,7 @@ Parts of this software are licensed as follows
    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.
-
+  
    THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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
@@ -515,32 +515,3 @@ Parts of this software are licensed as follows
    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.
-
-   Copyright (c) 1993-2009, Paul Mattes.
-   Copyright (c) 1990, Jeff Sparkes.
-   Copyright (c) 1989, Georgia Tech Research Corporation (GTRC), Atlanta, GA
-     30332.
-   All rights reserved.
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions are met:
-       * Redistributions of source code must retain the above copyright
-         notice, this list of conditions and the following disclaimer.
-       * 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.
-       * Neither the names of Paul Mattes, Jeff Sparkes, GTRC nor the names of
-         their contributors may be used to endorse or promote products derived
-         from this software without specific prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY PAUL MATTES, JEFF SPARKES AND GTRC "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 PAUL MATTES, JEFF SPARKES OR GTRC 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.