diff --git a/AUTHORS b/AUTHORS index 2cd38abc0..8e4b0ecbc 100644 --- a/AUTHORS +++ b/AUTHORS @@ -12,6 +12,11 @@ Code from other projects: copyright: Malte Starostik license: LGPL +GeoIP database author: +* files: src/geoip/GeoIP.dat + copyright: MaxMind, Inc (http://maxmind.com/) + license: Open Data License (see src/geoip/LICENSE.txt) + Images Authors: * files: src/Icons/*.png copyright: Gnome Icon Theme diff --git a/README b/README index 3576c70e5..97406cb5c 100644 --- a/README +++ b/README @@ -10,6 +10,9 @@ It aims to be a good alternative to all other bittorrent clients out there. qBittorrent is fast, stable and provides unicode support as well as many features. +This product includes GeoLite data created by MaxMind, available from +http://maxmind.com/ + Installation: ******************************** For installation, follow the instructions from INSTALL file, but simple: diff --git a/src/geoip/LICENSE.txt b/src/geoip/LICENSE.txt new file mode 100644 index 000000000..01c2910fe --- /dev/null +++ b/src/geoip/LICENSE.txt @@ -0,0 +1,39 @@ +There are two licenses, one for the C library software, and one for +the database. + +SOFTWARE LICENSE (C library) + +The GeoIP C Library is licensed under the LGPL. For details see +the COPYING file. + +OPEN DATA LICENSE (GeoLite Country and GeoLite City databases) + +Copyright (c) 2008 MaxMind, Inc. All Rights Reserved. + +All advertising materials and documentation mentioning features or use of +this database must display the following acknowledgment: +"This product includes GeoLite data created by MaxMind, available from +http://maxmind.com/" + +Redistribution and use with or without modification, are permitted provided +that the following conditions are met: +1. Redistributions must retain the above copyright notice, this list of +conditions and the following disclaimer in the documentation and/or other +materials provided with the distribution. +2. All advertising materials and documentation mentioning features or use of +this database must display the following acknowledgement: +"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, INC ``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 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.