diff options
author | psyc://loupsycedyglgamf.onion/~lynX <ircs://psyced.org/youbroketheinternet> | 2018-06-07 14:42:24 +0000 |
---|---|---|
committer | psyc://loupsycedyglgamf.onion/~lynX <ircs://psyced.org/youbroketheinternet> | 2018-06-07 14:42:24 +0000 |
commit | 4e29ecde9b3ad3e34af359f18b6679c06b17ce78 (patch) | |
tree | 63b75ec60314a80f9071bd7c2d4afc6ffa30ed3e /contrib | |
parent | 20eaa2aeedcc804a14f5b5265321ad41516b11b9 (diff) | |
download | gnunet-4e29ecde9b3ad3e34af359f18b6679c06b17ce78.tar.gz gnunet-4e29ecde9b3ad3e34af359f18b6679c06b17ce78.zip |
glitch in the license text detected by hyazinthe, thank you!
Diffstat (limited to 'contrib')
-rwxr-xr-x | contrib/scripts/afferify | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/contrib/scripts/afferify b/contrib/scripts/afferify index 188b66c64..7bd7dbd9f 100755 --- a/contrib/scripts/afferify +++ b/contrib/scripts/afferify | |||
@@ -43,6 +43,9 @@ sub wanted { | |||
43 | # Debugging: What's inside the file we just read? | 43 | # Debugging: What's inside the file we just read? |
44 | # print STDERR '> ', $_; | 44 | # print STDERR '> ', $_; |
45 | 45 | ||
46 | if (0) { | ||
47 | # This code did the initial conversion. We ifdef it out. | ||
48 | |||
46 | # Good idea to have the text start with "GNUnet" rather than "This program" | 49 | # Good idea to have the text start with "GNUnet" rather than "This program" |
47 | if ( s#GNUnet is free software; you can redistribute it and/or modify it under the#GNUnet is free software: you can redistribute it and/or modify it# ) { | 50 | if ( s#GNUnet is free software; you can redistribute it and/or modify it under the#GNUnet is free software: you can redistribute it and/or modify it# ) { |
48 | # Whoever had the idea of reformatting the GPL license text... | 51 | # Whoever had the idea of reformatting the GPL license text... |
@@ -52,7 +55,7 @@ sub wanted { | |||
52 | # to read perl code: if regexps appear without any | 55 | # to read perl code: if regexps appear without any |
53 | # context, it means they are applied to the default | 56 | # context, it means they are applied to the default |
54 | # variable being '$_'. | 57 | # variable being '$_'. |
55 | return unless s#terms of the GNU General Public License as published by the Free Software#under the terms of the GNU General Public License as published#; | 58 | return unless s#terms of the GNU General Public License as published by the Free Software#under the terms of the GNU Affero General Public License as published#; |
56 | return unless s#^(\W*\s+)Foundation; either version \d, or \(at your option\) any later version\.#\1by the Free Software Foundation, either version 3 of the License,\n\1or (at your option) any later version.#m; | 59 | return unless s#^(\W*\s+)Foundation; either version \d, or \(at your option\) any later version\.#\1by the Free Software Foundation, either version 3 of the License,\n\1or (at your option) any later version.#m; |
57 | return unless s#GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY#GNUnet is distributed in the hope that it will be useful, but#; | 60 | return unless s#GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY#GNUnet is distributed in the hope that it will be useful, but#; |
58 | return unless s#WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR#WITHOUT ANY WARRANTY; without even the implied warranty of#; | 61 | return unless s#WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR#WITHOUT ANY WARRANTY; without even the implied warranty of#; |
@@ -64,7 +67,7 @@ sub wanted { | |||
64 | print STDERR "\nTrying regular style on $name\t"; | 67 | print STDERR "\nTrying regular style on $name\t"; |
65 | 68 | ||
66 | # Patterns are designed to also match some typos and substitutions. | 69 | # Patterns are designed to also match some typos and substitutions. |
67 | return unless s#it under the terms of the GNU General Public Lice\w+ as published#under the terms of the GNU General Public License as published#; | 70 | return unless s#it under the terms of the GNU General Public Lice\w+ as published#under the terms of the GNU Affero General Public License as published#; |
68 | return unless s#by the Free Software Foundation; either version \d, or \(at your#by the Free Software Foundation, either version 3 of the License,#; | 71 | return unless s#by the Free Software Foundation; either version \d, or \(at your#by the Free Software Foundation, either version 3 of the License,#; |
69 | return unless s#option\) any later version\.#or (at your option) any later version.#; | 72 | return unless s#option\) any later version\.#or (at your option) any later version.#; |
70 | return unless s#General Public Lice\w+ for more details\.#Affero General Public License for more details.#; | 73 | return unless s#General Public Lice\w+ for more details\.#Affero General Public License for more details.#; |
@@ -72,6 +75,16 @@ sub wanted { | |||
72 | } | 75 | } |
73 | print STDERR "OK"; | 76 | print STDERR "OK"; |
74 | 77 | ||
78 | } else { | ||
79 | # This is the code in actual & current use: | ||
80 | |||
81 | return unless m#GNUnet is free software: you can redistribute it and/or modify it#; | ||
82 | print STDERR "\nTrying $name\t"; | ||
83 | # There was a mistake in the replacement text! | ||
84 | return unless s#under the terms of the GNU General Public License as published#under the terms of the GNU Affero General Public License as published#; | ||
85 | print STDERR "FIXED"; | ||
86 | } | ||
87 | |||
75 | # We directly overwrite the original file in the | 88 | # We directly overwrite the original file in the |
76 | # assumption that we're in a healthy revertible git. | 89 | # assumption that we're in a healthy revertible git. |
77 | open(O, '>', $f) or die "Cannot overwrite $f"; | 90 | open(O, '>', $f) or die "Cannot overwrite $f"; |