| 1 |
On 10/01/2011 09:40 PM, Zac Medico wrote: |
| 2 |
> On 10/01/2011 12:40 AM, Robin H. Johnson wrote: |
| 3 |
>> diff --git a/pym/portage/const.py b/pym/portage/const.py |
| 4 |
>> index 8b5f4ac..a42ebe8 100644 |
| 5 |
>> --- a/pym/portage/const.py |
| 6 |
>> +++ b/pym/portage/const.py |
| 7 |
>> @@ -109,10 +109,12 @@ EAPI = 4 |
| 8 |
>> |
| 9 |
>> HASHING_BLOCKSIZE = 32768 |
| 10 |
>> MANIFEST1_HASH_FUNCTIONS = ("MD5", "SHA256", "RMD160") |
| 11 |
>> -MANIFEST2_HASH_FUNCTIONS = ("SHA1", "SHA256", "RMD160") |
| 12 |
>> +MANIFEST2_HASH_FUNCTIONS = ("SHA256", "SHA512", "WHIRLPOOL") |
| 13 |
>> +# FUTURE: Add SHA-3 when available; remove SHA256 after 2012/10/01 |
| 14 |
>> |
| 15 |
>> MANIFEST1_REQUIRED_HASH = "MD5" |
| 16 |
>> -MANIFEST2_REQUIRED_HASH = "SHA1" |
| 17 |
>> +MANIFEST2_REQUIRED_HASH = "SHA256" |
| 18 |
>> +# FUTURE: Change to WHIRLPOOL after 2012/10/01 |
| 19 |
>> |
| 20 |
>> MANIFEST2_IDENTIFIERS = ("AUX", "MISC", "DIST", "EBUILD") |
| 21 |
>> # =========================================================================== |
| 22 |
> |
| 23 |
> If we control these hashes via metadata/layout.conf, then we can toggle |
| 24 |
> it atomically for all commiters. Otherwise, we'll have an annoying |
| 25 |
> period of time where different committers are committing different sets |
| 26 |
> of hashes, depending on their portage version. |
| 27 |
|
| 28 |
I've applied the whole series, except for 5/5: |
| 29 |
|
| 30 |
http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=f27473d04e6dee44983d1e5ac32ea9d4d375b5a2 |
| 31 |
http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=f3b05d6eed63e19cdfa7f645cf0190ee8019dd90 |
| 32 |
http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=8ac29097395f24ad331602d8e87fdf105ebd972b |
| 33 |
http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=faf87ba9877e3b5a7866c6649f956f15950e789a |
| 34 |
|
| 35 |
-- |
| 36 |
Thanks, |
| 37 |
Zac |
Archives