Merge pull request #115 from spaetz/opensslexception

Add the OpenSSL exception
This commit is contained in:
Sebastian Spaeth 2014-10-03 13:26:10 +02:00
commit f88fe13c17
3 changed files with 19 additions and 4 deletions

14
COPYING
View File

@ -348,3 +348,17 @@ proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the consider it more useful to permit linking proprietary applications with the
library. If this is what you want to do, use the GNU Library General library. If this is what you want to do, use the GNU Library General
Public License instead of this License. Public License instead of this License.
----------------------------------------------------------------
In addition, as a special exception, the copyright holders give
permission to link the code of portions of this program with the OpenSSL
library under certain conditions as described in each individual source
file, and distribute linked combinations including the two.
You must obey the GNU General Public License in all respects for all of
the code used other than OpenSSL. If you modify file(s) with this
exception, you may extend this exception to your version of the file(s),
but you are not obligated to do so. If you do not wish to do so, delete
this exception statement from your version. If you delete this exception
statement from all source files in the program, then also delete it
here.

View File

@ -17,9 +17,10 @@ documentation.
OfflineIMAP does not require additional python dependencies beyond python >=2.6 OfflineIMAP does not require additional python dependencies beyond python >=2.6
(although python-sqlite is strongly recommended). (although python-sqlite is strongly recommended).
OfflineIMAP is a Free Software project licensed under the GNU General Public OfflineIMAP is a Free Software project licensed under the GNU General
License version 2 (or later). You can download it for free, and you can modify Public License version 2 (or later) with a special exception that allows
it. In fact, you are encouraged to contribute to OfflineIMAP. the OpenSSL library to be used. You can download it for free, and you
can modify it. In fact, you are encouraged to contribute to OfflineIMAP.
Documentation Documentation
------------- -------------

View File

@ -8,7 +8,7 @@ __copyright__ = "Copyright 2002-2013 John Goerzen & contributors"
__author__ = "John Goerzen" __author__ = "John Goerzen"
__author_email__= "john@complete.org" __author_email__= "john@complete.org"
__description__ = "Disconnected Universal IMAP Mail Synchronization/Reader Support" __description__ = "Disconnected Universal IMAP Mail Synchronization/Reader Support"
__license__ = "Licensed under the GNU GPL v2+ (v2 or any later version)" __license__ = "Licensed under the GNU GPL v2 or any later version (with an openssl exception)"
__bigcopyright__ = """%(__productname__)s %(__bigversion__)s __bigcopyright__ = """%(__productname__)s %(__bigversion__)s
%(__license__)s""" % locals() %(__license__)s""" % locals()
__homepage__ = "http://offlineimap.org" __homepage__ = "http://offlineimap.org"