From: Milan Broz Date: Sat, 29 Dec 2012 10:33:54 +0000 (+0100) Subject: Change License from GPLv2 only to GPLv2+ ("or any later"). X-Git-Tag: upstream/1.6~91 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fupstream%2Fcryptsetup.git;a=commitdiff_plain;h=29f21208a05732b4685f7800967f3108b2555119 Change License from GPLv2 only to GPLv2+ ("or any later"). Agreed by all copyright authors. --- diff --git a/lib/crypt_plain.c b/lib/crypt_plain.c index dbbbbee..61a93f5 100644 --- a/lib/crypt_plain.c +++ b/lib/crypt_plain.c @@ -7,7 +7,8 @@ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/lib/crypto_backend/crypto_backend.h b/lib/crypto_backend/crypto_backend.h index 0c71d9d..ee4b7b3 100644 --- a/lib/crypto_backend/crypto_backend.h +++ b/lib/crypto_backend/crypto_backend.h @@ -6,7 +6,8 @@ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/lib/internal.h b/lib/internal.h index ec3e3af..821c115 100644 --- a/lib/internal.h +++ b/lib/internal.h @@ -8,7 +8,8 @@ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/lib/libcryptsetup.h b/lib/libcryptsetup.h index e77c1dd..ff3144a 100644 --- a/lib/libcryptsetup.h +++ b/lib/libcryptsetup.h @@ -8,7 +8,8 @@ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/lib/libdevmapper.c b/lib/libdevmapper.c index 5d3a605..9100a3e 100644 --- a/lib/libdevmapper.c +++ b/lib/libdevmapper.c @@ -8,7 +8,8 @@ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/lib/luks1/af.c b/lib/luks1/af.c index 9c50c16..835d997 100644 --- a/lib/luks1/af.c +++ b/lib/luks1/af.c @@ -9,7 +9,8 @@ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/lib/luks1/af.h b/lib/luks1/af.h index 89c0af8..b53e67b 100644 --- a/lib/luks1/af.h +++ b/lib/luks1/af.h @@ -9,7 +9,8 @@ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/lib/luks1/keyencryption.c b/lib/luks1/keyencryption.c index c93f471..7a3dc2f 100644 --- a/lib/luks1/keyencryption.c +++ b/lib/luks1/keyencryption.c @@ -6,7 +6,8 @@ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/lib/luks1/keymanage.c b/lib/luks1/keymanage.c index 9953fd9..164ba4a 100644 --- a/lib/luks1/keymanage.c +++ b/lib/luks1/keymanage.c @@ -6,7 +6,8 @@ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/lib/luks1/luks.h b/lib/luks1/luks.h index 961df35..6d6c74c 100644 --- a/lib/luks1/luks.h +++ b/lib/luks1/luks.h @@ -6,7 +6,8 @@ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/lib/random.c b/lib/random.c index 5de4214..0664e97 100644 --- a/lib/random.c +++ b/lib/random.c @@ -5,7 +5,8 @@ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/lib/setup.c b/lib/setup.c index 685ef80..6263578 100644 --- a/lib/setup.c +++ b/lib/setup.c @@ -8,7 +8,8 @@ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/lib/utils.c b/lib/utils.c index a5a330c..7bc833a 100644 --- a/lib/utils.c +++ b/lib/utils.c @@ -8,7 +8,8 @@ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/lib/utils_benchmark.c b/lib/utils_benchmark.c index 4ee0c03..bb2319a 100644 --- a/lib/utils_benchmark.c +++ b/lib/utils_benchmark.c @@ -6,7 +6,8 @@ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/lib/utils_crypt.c b/lib/utils_crypt.c index 6dbdf15..9fc05ac 100644 --- a/lib/utils_crypt.c +++ b/lib/utils_crypt.c @@ -7,7 +7,8 @@ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/lib/utils_crypt.h b/lib/utils_crypt.h index 48c8198..e447d9f 100644 --- a/lib/utils_crypt.h +++ b/lib/utils_crypt.h @@ -7,7 +7,8 @@ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/lib/utils_device.c b/lib/utils_device.c index 428aa12..44282a6 100644 --- a/lib/utils_device.c +++ b/lib/utils_device.c @@ -8,7 +8,8 @@ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/lib/utils_devpath.c b/lib/utils_devpath.c index 876b6ca..d1e8735 100644 --- a/lib/utils_devpath.c +++ b/lib/utils_devpath.c @@ -8,7 +8,8 @@ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/lib/utils_dm.h b/lib/utils_dm.h index 8af91e8..ae4836c 100644 --- a/lib/utils_dm.h +++ b/lib/utils_dm.h @@ -8,7 +8,8 @@ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/lib/utils_fips.c b/lib/utils_fips.c index 150f882..a4df016 100644 --- a/lib/utils_fips.c +++ b/lib/utils_fips.c @@ -5,7 +5,8 @@ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/lib/utils_fips.h b/lib/utils_fips.h index fb38c3f..d4d2239 100644 --- a/lib/utils_fips.h +++ b/lib/utils_fips.h @@ -5,7 +5,8 @@ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/lib/utils_loop.c b/lib/utils_loop.c index 81ae1fa..d7b03a1 100644 --- a/lib/utils_loop.c +++ b/lib/utils_loop.c @@ -6,7 +6,8 @@ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/lib/utils_loop.h b/lib/utils_loop.h index 0a964b8..052623d 100644 --- a/lib/utils_loop.h +++ b/lib/utils_loop.h @@ -5,7 +5,8 @@ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/lib/utils_wipe.c b/lib/utils_wipe.c index 50f3af6..858964c 100644 --- a/lib/utils_wipe.c +++ b/lib/utils_wipe.c @@ -7,7 +7,8 @@ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/lib/volumekey.c b/lib/volumekey.c index f533ad3..9a80529 100644 --- a/lib/volumekey.c +++ b/lib/volumekey.c @@ -6,7 +6,8 @@ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/misc/dict_search/crypt_dict.c b/misc/dict_search/crypt_dict.c index 80d36f4..6811662 100644 --- a/misc/dict_search/crypt_dict.c +++ b/misc/dict_search/crypt_dict.c @@ -6,13 +6,19 @@ * Run this (for LUKS as root), * e.g. ./crypt_dict test.img /usr/share/john/password.lst 4 * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU General Public License v.2. + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include diff --git a/misc/keyslot_checker/chk_luks_keyslots.c b/misc/keyslot_checker/chk_luks_keyslots.c index 7a9b391..fa284aa 100644 --- a/misc/keyslot_checker/chk_luks_keyslots.c +++ b/misc/keyslot_checker/chk_luks_keyslots.c @@ -16,7 +16,8 @@ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/cryptsetup.c b/src/cryptsetup.c index cfe0608..46b32b9 100644 --- a/src/cryptsetup.c +++ b/src/cryptsetup.c @@ -8,7 +8,8 @@ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/cryptsetup.h b/src/cryptsetup.h index 97fdb13..c9a40b8 100644 --- a/src/cryptsetup.h +++ b/src/cryptsetup.h @@ -8,7 +8,8 @@ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/cryptsetup_reencrypt.c b/src/cryptsetup_reencrypt.c index faa54b1..8bf064c 100644 --- a/src/cryptsetup_reencrypt.c +++ b/src/cryptsetup_reencrypt.c @@ -6,7 +6,8 @@ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/utils_password.c b/src/utils_password.c index 795ba59..3723ec2 100644 --- a/src/utils_password.c +++ b/src/utils_password.c @@ -6,7 +6,8 @@ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/utils_tools.c b/src/utils_tools.c index 84329c6..ca39339 100644 --- a/src/utils_tools.c +++ b/src/utils_tools.c @@ -8,7 +8,8 @@ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/veritysetup.c b/src/veritysetup.c index ac43e33..cc2095d 100644 --- a/src/veritysetup.c +++ b/src/veritysetup.c @@ -5,7 +5,8 @@ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/tests/api-test.c b/tests/api-test.c index 9925b42..747c3cf 100644 --- a/tests/api-test.c +++ b/tests/api-test.c @@ -6,7 +6,8 @@ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/tests/differ.c b/tests/differ.c index e2c6674..d4b1b37 100644 --- a/tests/differ.c +++ b/tests/differ.c @@ -5,7 +5,8 @@ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of