From aa8b4b328eebac7b66305e1af42bf5d4cc5c21cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Thu, 11 Apr 2024 20:41:51 +0200 Subject: [PATCH 1/2] remove dos-style end of lines --- .../cryptsetup-OpenSSL-exception.xml | 60 +++++++++---------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/src/exceptions/cryptsetup-OpenSSL-exception.xml b/src/exceptions/cryptsetup-OpenSSL-exception.xml index 125bc9be4..9a620cec7 100644 --- a/src/exceptions/cryptsetup-OpenSSL-exception.xml +++ b/src/exceptions/cryptsetup-OpenSSL-exception.xml @@ -1,30 +1,30 @@ - - - - - https://gitlab.com/cryptsetup/cryptsetup/-/blob/main/COPYING - https://gitlab.nic.cz/datovka/datovka/-/blob/develop/COPYING - https://github.com/nbs-system/naxsi/blob/951123ad456bdf5ac94e8d8819342fe3d49bc002/naxsi_src/naxsi_raw.c - http://web.mit.edu/jgross/arch/amd64_deb60/bin/mosh - - -

- 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. -

- - - + + + + + https://gitlab.com/cryptsetup/cryptsetup/-/blob/main/COPYING + https://gitlab.nic.cz/datovka/datovka/-/blob/develop/COPYING + https://github.com/nbs-system/naxsi/blob/951123ad456bdf5ac94e8d8819342fe3d49bc002/naxsi_src/naxsi_raw.c + http://web.mit.edu/jgross/arch/amd64_deb60/bin/mosh + + +

+ 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. +

+ + + From 26149d8268232778dd2b55158bee1ce262a7315c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Thu, 11 Apr 2024 20:43:21 +0200 Subject: [PATCH 2/2] add markup change to cryptsetup-OpenSSL-exception Fixes: #2343 --- src/exceptions/cryptsetup-OpenSSL-exception.xml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/exceptions/cryptsetup-OpenSSL-exception.xml b/src/exceptions/cryptsetup-OpenSSL-exception.xml index 9a620cec7..906f79966 100644 --- a/src/exceptions/cryptsetup-OpenSSL-exception.xml +++ b/src/exceptions/cryptsetup-OpenSSL-exception.xml @@ -7,23 +7,29 @@ https://gitlab.nic.cz/datovka/datovka/-/blob/develop/COPYING https://github.com/nbs-system/naxsi/blob/951123ad456bdf5ac94e8d8819342fe3d49bc002/naxsi_src/naxsi_raw.c http://web.mit.edu/jgross/arch/amd64_deb60/bin/mosh + https://sourceforge.net/p/linux-ima/ima-evm-utils/ci/master/tree/src/evmctl.c#l30

- In addition, as a special exception, the copyright + 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. + 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 + 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. + all source files in the program, then also delete it + here.