You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2010/05/14 01:17:34 UTC
svn commit: r944053 - in /trafficserver/traffic/trunk: LICENSE NOTICE
Author: jplevyak
Date: Thu May 13 23:17:34 2010
New Revision: 944053
URL: http://svn.apache.org/viewvc?rev=944053&view=rev
Log:
Fixup as per IRC discussions. Update BIND license, add fastlz license,
remove non-notices from NOTICE.
Modified:
trafficserver/traffic/trunk/LICENSE
trafficserver/traffic/trunk/NOTICE
Modified: trafficserver/traffic/trunk/LICENSE
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/LICENSE?rev=944053&r1=944052&r2=944053&view=diff
==============================================================================
--- trafficserver/traffic/trunk/LICENSE (original)
+++ trafficserver/traffic/trunk/LICENSE Thu May 13 23:17:34 2010
@@ -295,7 +295,7 @@ terms specified in this license.
~~~
-BIND-9.5.2 license
+BIND license
Copyright (c) 1985, 1989, 1993
The Regents of the University of California. All rights reserved.
@@ -308,11 +308,7 @@ are met:
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 University of
- California, Berkeley and its contributors.
-4. Neither the name of the University nor the names of its contributors
+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.
@@ -364,3 +360,27 @@ ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQ
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+~~~
+
+Copyright (C) 2007 Ariya Hidayat (ariya@kde.org)
+Copyright (C) 2006 Ariya Hidayat (ariya@kde.org)
+Copyright (C) 2005 Ariya Hidayat (ariya@kde.org)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software 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:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+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
+AUTHORS 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.
Modified: trafficserver/traffic/trunk/NOTICE
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/NOTICE?rev=944053&r1=944052&r2=944053&view=diff
==============================================================================
--- trafficserver/traffic/trunk/NOTICE (original)
+++ trafficserver/traffic/trunk/NOTICE Thu May 13 23:17:34 2010
@@ -4,36 +4,3 @@ Copyright 2010 The Apache Software Found
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-~~~
-
-Copyright (C) 2009, Yahoo! Inc. All rights reserved.
-
-~~~
-
-Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura,
-All rights reserved.
-
-See libinktomi++/ink_rand.cc, libinktomi++/ink_rand.h
-
-~~~
-
-Copyright (c) 1985, 1989, 1993
-The Regents of the University of California. All rights reserved.
-
-Portions Copyright (c) 1993 by Digital Equipment Corporation.
-
-Portions Copyright (c) 1996-1999 by Internet Software Consortium.
-
-See libinktomi++/ink_res_init.cc, libinktomi++/ink_res_mkquery.cc
-
-~~~
-
-Copyright (c) 1997-1998 Sun Microsystems, Inc.
-
-See proxy/mgmt2/cli2/hashtable.cc, m4/tcl.m4
-
-~~~
-
- Copyright (C) 2005,2006,2007 Ariya Hidayat (ariya@kde.org)
-
-See libinktomi++/fastlz.h,c