From: Sergey Matveev Date: Fri, 27 Sep 2019 08:50:19 +0000 (+0300) Subject: Forbid any later GNU GPL versions autousage X-Git-Tag: 4.1~5 X-Git-Url: http://www.git.cypherpunks.ru/?p=pygost.git;a=commitdiff_plain;h=5ecaafbe1a87f9a311a18574653e6dbc75a776b9;hp=6f120959c33dd2297da042e28318375f905a8182 Forbid any later GNU GPL versions autousage --- diff --git a/pygost/asn1schemas/cms.py b/pygost/asn1schemas/cms.py index f168c1c..e3f3244 100644 --- a/pygost/asn1schemas/cms.py +++ b/pygost/asn1schemas/cms.py @@ -4,8 +4,7 @@ # # 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 3 of the License, or -# (at your option) any later version. +# the Free Software Foundation, version 3 of the License. # # 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/pygost/asn1schemas/pfx.py b/pygost/asn1schemas/pfx.py index acc7787..737ebdb 100644 --- a/pygost/asn1schemas/pfx.py +++ b/pygost/asn1schemas/pfx.py @@ -4,8 +4,7 @@ # # 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 3 of the License, or -# (at your option) any later version. +# the Free Software Foundation, version 3 of the License. # # 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/pygost/asn1schemas/x509.py b/pygost/asn1schemas/x509.py index 7e39385..1ab0975 100644 --- a/pygost/asn1schemas/x509.py +++ b/pygost/asn1schemas/x509.py @@ -4,8 +4,7 @@ # # 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 3 of the License, or -# (at your option) any later version. +# the Free Software Foundation, version 3 of the License. # # 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/pygost/gost28147.py b/pygost/gost28147.py index a6a819f..ce84dc2 100644 --- a/pygost/gost28147.py +++ b/pygost/gost28147.py @@ -4,8 +4,7 @@ # # 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 3 of the License, or -# (at your option) any later version. +# the Free Software Foundation, version 3 of the License. # # 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/pygost/gost28147_mac.py b/pygost/gost28147_mac.py index 2292487..c027d63 100644 --- a/pygost/gost28147_mac.py +++ b/pygost/gost28147_mac.py @@ -4,8 +4,7 @@ # # 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 3 of the License, or -# (at your option) any later version. +# the Free Software Foundation, version 3 of the License. # # 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/pygost/gost3410.py b/pygost/gost3410.py index 500c0c9..b506406 100644 --- a/pygost/gost3410.py +++ b/pygost/gost3410.py @@ -4,8 +4,7 @@ # # 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 3 of the License, or -# (at your option) any later version. +# the Free Software Foundation, version 3 of the License. # # 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/pygost/gost3410_vko.py b/pygost/gost3410_vko.py index eebaf4a..612f4bc 100644 --- a/pygost/gost3410_vko.py +++ b/pygost/gost3410_vko.py @@ -4,8 +4,7 @@ # # 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 3 of the License, or -# (at your option) any later version. +# the Free Software Foundation, version 3 of the License. # # 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/pygost/gost34112012.py b/pygost/gost34112012.py index b753274..e433c5b 100644 --- a/pygost/gost34112012.py +++ b/pygost/gost34112012.py @@ -4,8 +4,7 @@ # # 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 3 of the License, or -# (at your option) any later version. +# the Free Software Foundation, version 3 of the License. # # 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/pygost/gost341194.py b/pygost/gost341194.py index 21ebb15..e1192f3 100644 --- a/pygost/gost341194.py +++ b/pygost/gost341194.py @@ -4,8 +4,7 @@ # # 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 3 of the License, or -# (at your option) any later version. +# the Free Software Foundation, version 3 of the License. # # 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/pygost/gost3412.py b/pygost/gost3412.py index 7b4cc78..c6528da 100644 --- a/pygost/gost3412.py +++ b/pygost/gost3412.py @@ -4,8 +4,7 @@ # # 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 3 of the License, or -# (at your option) any later version. +# the Free Software Foundation, version 3 of the License. # # 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/pygost/gost3413.py b/pygost/gost3413.py index d26f69c..15f8306 100644 --- a/pygost/gost3413.py +++ b/pygost/gost3413.py @@ -4,8 +4,7 @@ # # 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 3 of the License, or -# (at your option) any later version. +# the Free Software Foundation, version 3 of the License. # # 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/pygost/test_cms.py b/pygost/test_cms.py index 68354be..9359875 100644 --- a/pygost/test_cms.py +++ b/pygost/test_cms.py @@ -4,8 +4,7 @@ # # 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 3 of the License, or -# (at your option) any later version. +# the Free Software Foundation, version 3 of the License. # # 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/pygost/test_gost28147.py b/pygost/test_gost28147.py index b79b6e4..554343e 100644 --- a/pygost/test_gost28147.py +++ b/pygost/test_gost28147.py @@ -4,8 +4,7 @@ # # 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 3 of the License, or -# (at your option) any later version. +# the Free Software Foundation, version 3 of the License. # # 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/pygost/test_gost28147_mac.py b/pygost/test_gost28147_mac.py index 98fd85c..1f01619 100644 --- a/pygost/test_gost28147_mac.py +++ b/pygost/test_gost28147_mac.py @@ -4,8 +4,7 @@ # # 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 3 of the License, or -# (at your option) any later version. +# the Free Software Foundation, version 3 of the License. # # 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/pygost/test_gost3410.py b/pygost/test_gost3410.py index 681902c..8404a35 100644 --- a/pygost/test_gost3410.py +++ b/pygost/test_gost3410.py @@ -4,8 +4,7 @@ # # 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 3 of the License, or -# (at your option) any later version. +# the Free Software Foundation, version 3 of the License. # # 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/pygost/test_gost3410_vko.py b/pygost/test_gost3410_vko.py index 01a3d3b..290bde3 100644 --- a/pygost/test_gost3410_vko.py +++ b/pygost/test_gost3410_vko.py @@ -4,8 +4,7 @@ # # 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 3 of the License, or -# (at your option) any later version. +# the Free Software Foundation, version 3 of the License. # # 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/pygost/test_gost34112012.py b/pygost/test_gost34112012.py index 78a6384..6216f8e 100644 --- a/pygost/test_gost34112012.py +++ b/pygost/test_gost34112012.py @@ -4,8 +4,7 @@ # # 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 3 of the License, or -# (at your option) any later version. +# the Free Software Foundation, version 3 of the License. # # 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/pygost/test_gost341194.py b/pygost/test_gost341194.py index 6b6fe4b..16a0b77 100644 --- a/pygost/test_gost341194.py +++ b/pygost/test_gost341194.py @@ -4,8 +4,7 @@ # # 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 3 of the License, or -# (at your option) any later version. +# the Free Software Foundation, version 3 of the License. # # 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/pygost/test_gost3412.py b/pygost/test_gost3412.py index cbf28e8..f2a63a0 100644 --- a/pygost/test_gost3412.py +++ b/pygost/test_gost3412.py @@ -4,8 +4,7 @@ # # 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 3 of the License, or -# (at your option) any later version. +# the Free Software Foundation, version 3 of the License. # # 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/pygost/test_gost3413.py b/pygost/test_gost3413.py index 5b2dd08..78a9d74 100644 --- a/pygost/test_gost3413.py +++ b/pygost/test_gost3413.py @@ -4,8 +4,7 @@ # # 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 3 of the License, or -# (at your option) any later version. +# the Free Software Foundation, version 3 of the License. # # 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/pygost/test_pfx.py b/pygost/test_pfx.py index 831dd47..106c66d 100644 --- a/pygost/test_pfx.py +++ b/pygost/test_pfx.py @@ -4,8 +4,7 @@ # # 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 3 of the License, or -# (at your option) any later version. +# the Free Software Foundation, version 3 of the License. # # 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/pygost/test_wrap.py b/pygost/test_wrap.py index e419a8e..78393e8 100644 --- a/pygost/test_wrap.py +++ b/pygost/test_wrap.py @@ -4,8 +4,7 @@ # # 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 3 of the License, or -# (at your option) any later version. +# the Free Software Foundation, version 3 of the License. # # 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/pygost/test_x509.py b/pygost/test_x509.py index a2112ad..8339935 100644 --- a/pygost/test_x509.py +++ b/pygost/test_x509.py @@ -4,8 +4,7 @@ # # 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 3 of the License, or -# (at your option) any later version. +# the Free Software Foundation, version 3 of the License. # # 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/pygost/utils.py b/pygost/utils.py index 3ed80e4..8718792 100644 --- a/pygost/utils.py +++ b/pygost/utils.py @@ -4,8 +4,7 @@ # # 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 3 of the License, or -# (at your option) any later version. +# the Free Software Foundation, version 3 of the License. # # 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/pygost/wrap.py b/pygost/wrap.py index b0995ee..b063fec 100644 --- a/pygost/wrap.py +++ b/pygost/wrap.py @@ -4,8 +4,7 @@ # # 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 3 of the License, or -# (at your option) any later version. +# the Free Software Foundation, version 3 of the License. # # 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/setup.py b/setup.py index 0093ad0..798e822 100644 --- a/setup.py +++ b/setup.py @@ -10,11 +10,11 @@ setup( author="Sergey Matveev", author_email="stargrave@stargrave.org", url="http://pygost.cypherpunks.ru/", - license="GPLv3+", + license="GPLv3", classifiers=[ "Development Status :: 5 - Production/Stable", "Intended Audience :: Developers", - "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)", + "License :: OSI Approved :: GNU General Public License v3 (GPLv3)", "Natural Language :: English", "Operating System :: OS Independent", "Programming Language :: Python :: 2", diff --git a/www.texi b/www.texi index 7f3c0f2..468d546 100644 --- a/www.texi +++ b/www.texi @@ -14,7 +14,7 @@ GOST is GOvernment STandard of Russian Federation (and Soviet Union). It is @url{https://www.gnu.org/philosophy/pragmatic.html, copylefted} @url{https://www.gnu.org/philosophy/free-sw.html, free software}: -licenced under @url{https://www.gnu.org/licenses/gpl-3.0.html, GPLv3+}. +licenced under @url{https://www.gnu.org/licenses/gpl-3.0.html, GPLv3}. You can read about GOST algorithms @url{http://gost.cypherpunks.ru/, more}. Currently supported algorithms are: