Update to 7.40.1

[platform/upstream/curl.git] / docs / LICENSE-MIXING

diff --git a/docs/LICENSE-MIXING b/docs/LICENSE-MIXING
index c5a1584..a53835c 100644 (file)
--- a/docs/LICENSE-MIXING
+++ b/docs/LICENSE-MIXING
@@ -16,19 +16,17 @@ clause). You may still build your own copies that use them all, but
 distributing them as binaries would be to violate the GPL license - unless you
 accompany your license with an exception[2]. This particular problem was
 addressed when the Modified BSD license was created, which does not have the
-annoncement clause that collides with GPL.
+announcement clause that collides with GPL.
 
 libcurl http://curl.haxx.se/docs/copyright.html
 
         Uses an MIT (or Modified BSD)-style license that is as liberal as
-        possible.  Some of the source files that deal with KRB4 have Original
-        BSD-style announce-clause licenses. You may not distribute binaries
-        with krb4-enabled libcurl that also link with GPL-licensed code!
+        possible.
 
 OpenSSL http://www.openssl.org/source/license.html
 
         (May be used for SSL/TLS support) Uses an Original BSD-style license
-        with an announement clause that makes it "incompatible" with GPL. You
+        with an announcement clause that makes it "incompatible" with GPL. You
         are not allowed to ship binaries that link with OpenSSL that includes
         GPL code (unless that specific GPL code includes an exception for
         OpenSSL - a habit that is growing more and more common). If OpenSSL's
@@ -55,6 +53,10 @@ NSS     http://www.mozilla.org/projects/security/pki/nss/
         grant you different permissions and impose different obligations. You
         should select the license that best meets your needs.
 
+axTLS   http://axtls.sourceforge.net/
+
+        (May be used for SSL/TLS support) Uses a Modified BSD-style license.
+
 c-ares  http://daniel.haxx.se/projects/c-ares/license.html
 
         (Used for asynchronous name resolves) Uses an MIT license that is very
@@ -66,14 +68,6 @@ zlib    http://www.gzip.org/zlib/zlib_license.html
         (Used for compressed Transfer-Encoding support) Uses an MIT-style
         license that shouldn't collide with any other library.
 
-krb4
-
-        While nothing in particular says that a Kerberos4 library must use any
-        particular license, the one I've tried and used successfully so far
-        (kth-krb4) is partly Original BSD-licensed with the announcement
-        clause. Some of the code in libcurl that is written to deal with
-        Kerberos4 is Modified BSD-licensed.
-
 MIT Kerberos http://web.mit.edu/kerberos/www/dist/
 
         (May be used for GSS support) MIT licensed, that shouldn't collide
@@ -90,16 +84,10 @@ GNU GSS http://www.gnu.org/software/gss/
         may not distribute binary curl packages that uses this if you build
         curl to also link and use any Original BSD licensed libraries!
 
-fbopenssl
-
-        (Used for SPNEGO support) Unclear license. Based on its name, I assume
-        that it uses the OpenSSL license and thus shares the same issues as
-        described for OpenSSL above.
-
-libidn  http://www.gnu.org/licenses/lgpl.html
+libidn  http://josefsson.org/libidn/
 
         (Used for IDNA support) Uses the GNU Lesser General Public
-        License. LGPL is a variation of GPL with slightly less aggressive
+        License [3]. LGPL is a variation of GPL with slightly less aggressive
         "copyleft". This license requires more requirements to be met when
         distributing binaries, see the license for details. Also note that if
         you distribute a binary that includes this library, you must also
@@ -112,6 +100,10 @@ OpenLDAP http://www.openldap.org/software/release/license.html
         libcurl uses OpenLDAP as a shared library only, I have not heard of
         anyone that ships OpenLDAP linked with libcurl in an app.
 
+libssh2 http://www.libssh2.org/
+
+        (Used for scp and sftp support) libssh2 uses a Modified BSD-style
+        license.
 
 [1] = GPL - GNU General Public License: http://www.gnu.org/licenses/gpl.html
 [2] = http://www.fsf.org/licenses/gpl-faq.html#GPLIncompatibleLibs details on