1 |
On 10/03/2011 04:43 AM, Brian Harring wrote: |
2 |
> On Mon, Oct 03, 2011 at 02:48:55AM -0700, Zac Medico wrote: |
3 |
>> After some thought, I like the space delimited approach better. Here's |
4 |
>> the patch, which retains the ability to remove the manifest hash |
5 |
>> settings from layout.conf after they become redundant: |
6 |
>> |
7 |
>> http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=d9d0606fe01618cc81fb0b862ada91149dad3746 |
8 |
> |
9 |
> Suggest you go through the implementation a bit closer; quick look, if |
10 |
> the repo no longer uses what portage considers a required hash (atm, |
11 |
> sha1), it still will force it in; while that's rather annoying for |
12 |
> manifest creation, the validation logic there strikes me as probably |
13 |
> being buggy for that case. |
14 |
|
15 |
This case is only supposed to come up if the user is generating |
16 |
manifests with a version of portage that has become obsolete for this |
17 |
type of operation on the repository. I suppose that we could simply make |
18 |
Manifest.write() raise an exception in this case, and make digestgen() |
19 |
return unsuccessfully with a suitable error message. |
20 |
|
21 |
We could also add a layout.conf setting to override |
22 |
MANIFEST2_REQUIRED_HASH, but that seems unnecessary as long as we stick |
23 |
to the plan: |
24 |
|
25 |
After WHIRLPOOL is supported in stable portage: |
26 |
- Add SHA256 and WHIRLPOOL to MANIFEST2_HASH_DEFAULTS. |
27 |
- Remove SHA1 and RMD160 from MANIFEST2_HASH_*. |
28 |
- Set manifest-hashes in gentoo-x86/metadata/layout.conf as follows: |
29 |
manifest-hashes = SHA256 SHA512 WHIRLPOOL |
30 |
|
31 |
After WHIRLPOOL is supported in stable portage for at least 1 year: |
32 |
- Change MANIFEST2_REQUIRED_HASH to WHIRLPOOL. |
33 |
- Remove SHA256 from MANIFEST2_HASH_*. |
34 |
- Set manifest-hashes in gentoo-x86/metadata/layout.conf as follows: |
35 |
manifest-hashes = SHA512 WHIRLPOOL |
36 |
|
37 |
After SHA-3 is approved: |
38 |
- Add new hashes to MANIFEST2_HASH_*. |
39 |
|
40 |
After SHA-3 is supported in stable portage: |
41 |
- Set manifest-hashes in gentoo-x86/metadata/layout.conf as follows: |
42 |
manifest-hashes = SHA3 SHA512 WHIRLPOOL |
43 |
|
44 |
After layout.conf settings correspond to defaults in stable portage: |
45 |
- Remove redundant settings from gentoo-x86/metadata/layout.conf. |
46 |
-- |
47 |
Thanks, |
48 |
Zac |