-
Notifications
You must be signed in to change notification settings - Fork 275
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2449 from xsuchy/2343
add markup change to cryptsetup-OpenSSL-exception
- Loading branch information
Showing
1 changed file
with
36 additions
and
30 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,30 +1,36 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <SPDXLicenseCollection xmlns="http://www.spdx.org/license"> | ||
| <exception licenseId="cryptsetup-OpenSSL-exception" | ||
| name="cryptsetup OpenSSL exception" listVersionAdded="3.21"> | ||
| <crossRefs> | ||
| <crossRef>https://gitlab.com/cryptsetup/cryptsetup/-/blob/main/COPYING</crossRef> | ||
| <crossRef>https://gitlab.nic.cz/datovka/datovka/-/blob/develop/COPYING</crossRef> | ||
| <crossRef>https://github.com/nbs-system/naxsi/blob/951123ad456bdf5ac94e8d8819342fe3d49bc002/naxsi_src/naxsi_raw.c</crossRef> | ||
| <crossRef>http://web.mit.edu/jgross/arch/amd64_deb60/bin/mosh</crossRef> | ||
| </crossRefs> | ||
| <text> | ||
| <p> | ||
| 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. | ||
| </p> | ||
| <p> | ||
| 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. | ||
| </p> | ||
| </text> | ||
| </exception> | ||
| </SPDXLicenseCollection> | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <SPDXLicenseCollection xmlns="http://www.spdx.org/license"> | ||
| <exception licenseId="cryptsetup-OpenSSL-exception" | ||
| name="cryptsetup OpenSSL exception" listVersionAdded="3.21"> | ||
| <crossRefs> | ||
| <crossRef>https://gitlab.com/cryptsetup/cryptsetup/-/blob/main/COPYING</crossRef> | ||
| <crossRef>https://gitlab.nic.cz/datovka/datovka/-/blob/develop/COPYING</crossRef> | ||
| <crossRef>https://github.com/nbs-system/naxsi/blob/951123ad456bdf5ac94e8d8819342fe3d49bc002/naxsi_src/naxsi_raw.c</crossRef> | ||
| <crossRef>http://web.mit.edu/jgross/arch/amd64_deb60/bin/mosh</crossRef> | ||
| <crossRef>https://sourceforge.net/p/linux-ima/ima-evm-utils/ci/master/tree/src/evmctl.c#l30</crossRef> | ||
| </crossRefs> | ||
| <text> | ||
| <p> | ||
| <alt name="addition" match="In addition, as|As">In addition, as</alt> 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 | ||
| <alt name="what" match="two|program with the OpenSSL library">two</alt>. | ||
| </p> | ||
| <p> | ||
| You must <alt name="obey" match="obey|comply with">obey</alt> | ||
| the GNU General Public License in all respects | ||
| for all of the code used other than | ||
| <alt name="subject" match="OpenSSL|as permitted herein">OpenSSL</alt>. | ||
| 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 | ||
| <alt name="where" match="here|in the license file">here</alt>. | ||
| </p> | ||
| </text> | ||
| </exception> | ||
| </SPDXLicenseCollection> |