16407060 Update license for privoxy package
authorSonam Gupta <sonam.x.gupta@oracle.com>
Wed, 27 Feb 2013 22:41:48 -0800
changeset 1183 05766af2b3f9
parent 1182 31281e52a94c
child 1184 69d5cf2d40e4
16407060 Update license for privoxy package
components/privoxy/privoxy.copyright
--- a/components/privoxy/privoxy.copyright	Wed Feb 27 15:46:51 2013 -0800
+++ b/components/privoxy/privoxy.copyright	Wed Feb 27 22:41:48 2013 -0800
@@ -1,12 +1,10 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified.  Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-====================================================================
+--------------------------
+- privoxy 3.0.17 -
+--------------------------
+
+Oracle Internal Tracking Number 9002
+-----------------------------------------------------------------------------
+				v.09232010
 
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
@@ -698,3 +696,27 @@
 library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.
 
+------------------------------------------------------------------------------
+
+           Copyright (c) 1997-2000 University of Cambridge
+
+-----------------------------------------------------------------------------
+Permission is granted to anyone to use this software for any purpose on any
+computer system, and to redistribute it freely, subject to the following
+restrictions:
+
+1. This software is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+2. The origin of this software must not be misrepresented, either by
+   explicit claim or by omission.
+
+3. Altered versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+
+4. If PCRE is embedded in any software that is released under the GNU
+   General Purpose Licence (GPL), then the terms of that licence shall
+   supersede any condition above with which it is incompatible.
+-----------------------------------------------------------------------------
+