1 |
On Tue, 5 Dec 2017 08:42:43 -0800 |
2 |
Brian Dolbec <dolsen@g.o> wrote: |
3 |
|
4 |
> On Tue, 5 Dec 2017 17:34:23 +0100 |
5 |
> Michał Górny <mgorny@g.o> wrote: |
6 |
> |
7 |
> > Closes: https://bugs.gentoo.org/615620 |
8 |
> > --- |
9 |
> > pym/portage/checksum.py | 5 ++++- |
10 |
> > 1 file changed, 4 insertions(+), 1 deletion(-) |
11 |
> > |
12 |
> > diff --git a/pym/portage/checksum.py b/pym/portage/checksum.py |
13 |
> > index 5424ce56b..0841ab231 100644 |
14 |
> > --- a/pym/portage/checksum.py |
15 |
> > +++ b/pym/portage/checksum.py |
16 |
> > @@ -150,7 +150,10 @@ if "SHA3_256" not in hashfunc_map or "SHA3_512" |
17 |
> > not in hashfunc_map: # (GnuPG). |
18 |
> > gcrypt_algos = frozenset(('RMD160', 'WHIRLPOOL', 'SHA3_256', |
19 |
> > 'SHA3_512', 'STREEBOG256', 'STREEBOG512')) |
20 |
> > -if gcrypt_algos.difference(hashfunc_map): |
21 |
> > +# Note: currently disabled due to resource exhaustion bugs in |
22 |
> > pygcrypt. +# Please do not reenable until upstream has a fix. |
23 |
> > +# https://bugs.gentoo.org/615620 |
24 |
> > +if False and gcrypt_algos.difference(hashfunc_map): |
25 |
> > try: |
26 |
> > import binascii |
27 |
> > import pygcrypt.hashcontext |
28 |
> |
29 |
> |
30 |
> |
31 |
> It would be better to just comment out the original if, then add a new |
32 |
> line to replace it with just if False. it would be clearer what the |
33 |
> original code should be. Of course with the reason comments... |
34 |
> |
35 |
|
36 |
sorry, brain is still struggling with this damn headache... |
37 |
|
38 |
It would be clearer later when re-enabling if it takes a long time |
39 |
for pygrcrypt to get fixed. I know it would be for me, my memory |
40 |
isn't as good as it used to be. Also if it ends up someone else |
41 |
looks to modify it later. |
42 |
|
43 |
+# Note: currently disabled due to resource exhaustion bugs in pygcrypt. |
44 |
+# Please do not reenable until upstream has a fix. |
45 |
+# https://bugs.gentoo.org/615620 |
46 |
-if gcrypt_algos.difference(hashfunc_map): |
47 |
+#if gcrypt_algos.difference(hashfunc_map): |
48 |
+if False |
49 |
try: |
50 |
import binascii |
51 |
import pygcrypt.hashcontext |
52 |
|
53 |
|
54 |
I approve the above form to merge... Thanks |
55 |
-- |
56 |
Brian Dolbec <dolsen> |