Add exception allowing maintainers to distribute binary cryptsetup

linked to OpenSSL library.
(Agreed by all copyright holders.)

git-svn-id: https://cryptsetup.googlecode.com/svn/trunk@431 36d66b0a-2a48-0410-832c-cd162a569da5

diff --git a/COPYING b/COPYING
index d60c31a..e834c50 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -338,3 +338,18 @@ proprietary programs.  If your program is a subroutine library, you may
 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
 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.

diff --git a/ChangeLog b/ChangeLog
index f7c9282..ea47405 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2011-04-05  Milan Broz  <mbroz@redhat.com>
+       * Add exception to COPYING for binary distribution linked with OpenSSL library.
+
 2011-01-29  Milan Broz  <mbroz@redhat.com>
        * Fix mapping removal if device disappeared but node still exists.
        * Fix luksAddKey return code if master key is used.