Changeset 2362 for vidalia/trunk/LICENSE

Timestamp:

02/28/08 23:30:11 (9 months ago)

Author:

edmanm

Message:

r145@lysithea: edmanm | 2008-02-28 23:28:40 -0500
Add an OpenSSL license exception and change the copyright block at the top of
each source file to the shorter, more easily maintained format suggested by
Aaron. Also include the GPLv3 and OpenSSL licenses in the tarball, in addition
to the GPLv2.

Files:

• vidalia/trunk/LICENSE (modified) (3 diffs)

vidalia/trunk/LICENSE

@@ -1 @@
-===================================================================
-
-Vidalia is distributed under the following license:
-
-Copyright (C) 2006-2007,  Matt Edman, Justin Hipple
-Copyright (C) 2008, Matt Edman
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program 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.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  
-02110-1301, USA.
+=======
+LICENSE
+=======
+
+This program is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License (GPL) as published by
+the Free Software Foundation; either version 2 of the License, or (at
+your option) any later version. The full text of versions 2 and 3 of
+the GPL can be found respectively in the files LICENSE-GPLV2 and
+LICENSE-GPLV3.
+
+EXCEPTION: This distribution of Vidalia may be linked against OpenSSL
+according to the terms of the section below entitled "OpenSSL Exception."
+
+This program 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. See the GNU General
+Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+                       
+                       _OpenSSL Exception_
+
+0. Definitions
+
+"Vidalia" means Vidalia software licensed under version 2 or any later
+version of the GNU General Public License (collectively, "GPL"), or a
+work based on such software and licensed under the GPL.
+
+"OpenSSL" means OpenSSL toolkit software distributed by the OpenSSL
+Project and licensed under the OpenSSL Licenses, or a work based on such
+software and licensed under the OpenSSL Licenses.
+
+"OpenSSL Licenses" means the OpenSSL License and Original SSLeay License
+under which the OpenSSL Project distributes the OpenSSL toolkit software,
+as those licenses appear in the file LICENSE-OPENSSL.
+
+1. Exception
+
+You have permission to copy, modify, propagate, and distribute a work
+formed by combining OpenSSL with Vidalia, or a work derivative of such a
+combination, even if such copying, modification, propagation, or
+distribution would otherwise violate the terms of the GPL. You must
+comply with the GPL in all respects for all of the code used other than
+OpenSSL.
+
+You may include this OpenSSL Exception and its grant of permissions when
+you distribute Vidalia.  Inclusion of this notice with such a
+distribution constitutes a grant of such permission.  If you do not wish
+to grant these permissions, remove this section entitled "OpenSSL
+Exception" from your distribution.
+
 
 ===================================================================
@@ -138 +172 @@
 http://maxmind.com. It is licensed as follows:
 
-OPEN DATA LICENSE (GeoIP Free Databases)
-
-Copyright (c) 2002 MaxMind.com.  All Rights Reserved.
+OPEN DATA LICENSE (GeoLite Country and GeoLite City databases)
+
+Copyright (c) 2007 MaxMind LLC.  All Rights Reserved.
 
 All advertising materials and documentation mentioning features or use of
 this database must display the following acknowledgment:
-"This product includes GeoIP data created by MaxMind, available from
+"This product includes GeoLite data created by MaxMind, available from
 http://maxmind.com/"
 
@@ -154 +188 @@
 2. All advertising materials and documentation mentioning features or use of
 this database must display the following acknowledgement:
-"This product includes GeoIP data created by MaxMind, available from
+"This product includes GeoLite data created by MaxMind, available from
 http://maxmind.com/"
 3. "MaxMind" may not be used to endorse or promote products derived from this
 database without specific prior written permission.
 
-THIS DATABASE IS PROVIDED BY MAXMIND.COM ``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 MAXMIND.COM 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 DATABASE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-
-Some parts of this software distribution are derived from the APNIC, ARIN and
-RIPE databases (copyright details below). The author of this module makes no
-claims of ownership on those parts.
-
-APNIC conditions of use:
-
-The files are freely available for download and use on the condition that
-APNIC will not be held responsible for any loss or damage arising from the
-application of the information contained in these reports.
-
-APNIC endeavours to the best of its ability to ensure the accuracy of these
-reports; however, APNIC makes no guarantee in this regard.
-
-In particular, it should be noted that these reports seek to indicate the
-country where resources were first allocated or assigned. It is not intended
-that these reports be considered as an authoritative statement of the location
-in which any specific resource may currently be in use.
-
-ARIN database copyright:
-
-Copyright (c) American Registry for Internet Numbers. All rights reserved.
-
-RIPE database copyright:
-
-The information in the RIPE Database is available to the public for agreed
-Internet operation purposes, but is under copyright. The copyright statement
-is:
-
-"Except for agreed Internet operational purposes, no part of this publication
-may be reproduced, stored in a retrieval system, or transmitted, in any form
-or by any means, electronic, mechanical, recording, or otherwise, without
-prior permission of the RIPE NCC on behalf of the copyright holders. Any use
-of this material to target advertising or similar activities is explicitly
-forbidden and may be prosecuted. The RIPE NCC requests to be notified of any
-such activities or suspicions thereof."
-
+THIS DATABASE IS PROVIDED BY MAXMIND.COM ``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 MAXMIND.COM 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 
+DATABASE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+