| 1 |
commit: 9def327b17275c5e330ab4db1e80b41c43ac9508 |
| 2 |
Author: Vjaceslavs Klimovs <vklimovs <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Jan 26 01:31:46 2020 +0000 |
| 4 |
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jan 26 01:45:36 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9def327b |
| 7 |
|
| 8 |
net-wireless/crda: fix Hunk #4 succeeded at 117 with fuzz 2. |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/14452 |
| 11 |
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org> |
| 12 |
|
| 13 |
net-wireless/crda/files/crda-4.14-python-3.patch | 18 ++++++++++-------- |
| 14 |
1 file changed, 10 insertions(+), 8 deletions(-) |
| 15 |
|
| 16 |
diff --git a/net-wireless/crda/files/crda-4.14-python-3.patch b/net-wireless/crda/files/crda-4.14-python-3.patch |
| 17 |
index 97db1ac0529..df22a6a4bd4 100644 |
| 18 |
--- a/net-wireless/crda/files/crda-4.14-python-3.patch |
| 19 |
+++ b/net-wireless/crda/files/crda-4.14-python-3.patch |
| 20 |
@@ -1,5 +1,7 @@ |
| 21 |
---- /utils/key2pub.py |
| 22 |
-+++ /utils/key2pub.py |
| 23 |
+diff --git a/utils/key2pub.py b/utils/key2pub.py |
| 24 |
+index 9bb04cd..632e6a6 100755 |
| 25 |
+--- a/utils/key2pub.py |
| 26 |
++++ b/utils/key2pub.py |
| 27 |
@@ -3,20 +3,20 @@ |
| 28 |
import sys |
| 29 |
try: |
| 30 |
@@ -25,7 +27,7 @@ |
| 31 |
val = val[8:] |
| 32 |
vnew.reverse() |
| 33 |
output.write('static BN_ULONG %s[%d] = {\n' % (name, len(vnew))) |
| 34 |
-@@ -34,13 +34,13 @@ |
| 35 |
+@@ -34,13 +34,13 @@ def print_ssl_64(output, name, val): |
| 36 |
output.write('};\n\n') |
| 37 |
|
| 38 |
def print_ssl_32(output, name, val): |
| 39 |
@@ -42,7 +44,7 @@ |
| 40 |
val = val[4:] |
| 41 |
vnew.reverse() |
| 42 |
output.write('static BN_ULONG %s[%d] = {\n' % (name, len(vnew))) |
| 43 |
-@@ -80,21 +80,21 @@ |
| 44 |
+@@ -80,21 +80,21 @@ struct pubkey { |
| 45 |
|
| 46 |
static struct pubkey keys[] = { |
| 47 |
''') |
| 48 |
@@ -67,16 +69,16 @@ |
| 49 |
idx += 1 |
| 50 |
if idx == 8: |
| 51 |
idx = 0 |
| 52 |
-@@ -117,7 +117,7 @@ |
| 53 |
+@@ -117,7 +117,7 @@ struct key_params { |
| 54 |
|
| 55 |
- static const struct key_params keys[] = { |
| 56 |
+ static const struct key_params __attribute__ ((unused)) keys[] = { |
| 57 |
''') |
| 58 |
- for n in xrange(n + 1): |
| 59 |
+ for n in range(n + 1): |
| 60 |
output.write(' KEYS(e_%d, n_%d),\n' % (n, n)) |
| 61 |
output.write('};\n') |
| 62 |
|
| 63 |
-@@ -135,7 +135,7 @@ |
| 64 |
+@@ -135,7 +135,7 @@ except IndexError: |
| 65 |
mode = None |
| 66 |
|
| 67 |
if not mode in modes: |
| 68 |
@@ -85,7 +87,7 @@ |
| 69 |
sys.exit(2) |
| 70 |
|
| 71 |
output = open(outfile, 'w') |
| 72 |
-@@ -153,3 +153,5 @@ |
| 73 |
+@@ -153,3 +153,5 @@ for f in files: |
| 74 |
idx += 1 |
| 75 |
|
| 76 |
modes[mode][1](output, idx - 1) |
Archives