diff options
author | Zac Medico <zmedico@gentoo.org> | 2011-10-03 02:42:53 -0700 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2011-10-03 02:42:53 -0700 |
commit | d9d0606fe01618cc81fb0b862ada91149dad3746 (patch) | |
tree | a8fc59143393b3c82fddb596c1f67437485e1db1 /pym/portage/const.py | |
parent | c8cd3a985cc529299411d7343a11004b7d1330ef (diff) | |
download | portage-d9d0606fe01618cc81fb0b862ada91149dad3746.tar.gz portage-d9d0606fe01618cc81fb0b862ada91149dad3746.tar.bz2 portage-d9d0606fe01618cc81fb0b862ada91149dad3746.zip |
GLEP 59: use manifest-hashes list in layout.conf
The manifest-hashes layout.conf setting simply overrides the hashes
that are generated. When unspecified, the MANIFEST2_HASH_DEFAULTS
constant is used instead (current value contains SHA1, SHA256, and
RMD160).
In order to enable SHA512 and WHIRLPOOL, and drop RMD160 and SHA1,
simply set "manifest-hashes = SHA256 SHA512 WHIRLPOOL" in layout.conf.
As with the previous boolean flags approach, manifest-hashes settings
become redundant and can be removed from layout.conf after a version
of portage with equivalent defaults is stable.
Diffstat (limited to 'pym/portage/const.py')
-rw-r--r-- | pym/portage/const.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/pym/portage/const.py b/pym/portage/const.py index e7eac62fb..e3627ea6e 100644 --- a/pym/portage/const.py +++ b/pym/portage/const.py @@ -114,20 +114,23 @@ MANIFEST1_REQUIRED_HASH = "MD5" # Future events: # # After WHIRLPOOL is supported in stable portage: -# - Add WHIRLPOOL to MANIFEST2_HASH_DEFAULTS. +# - Add SHA256 and WHIRLPOOL to MANIFEST2_HASH_DEFAULTS. # - Remove SHA1 and RMD160 from MANIFEST2_HASH_*. -# - Toggle gentoo-x86/metadata/layout.conf settings to match. +# - Set manifest-hashes in gentoo-x86/metadata/layout.conf as follows: +# manifest-hashes = SHA256 SHA512 WHIRLPOOL # # After WHIRLPOOL is supported in stable portage for at least 1 year: # - Change MANIFEST2_REQUIRED_HASH to WHIRLPOOL. # - Remove SHA256 from MANIFEST2_HASH_*. -# - Toggle gentoo-x86/metadata/layout.conf settings to match. +# - Set manifest-hashes in gentoo-x86/metadata/layout.conf as follows: +# manifest-hashes = SHA512 WHIRLPOOL # # After SHA-3 is approved: # - Add new hashes to MANIFEST2_HASH_*. # # After SHA-3 is supported in stable portage: -# - Toggle gentoo-x86/metadata/layout.conf settings to match. +# - Set manifest-hashes in gentoo-x86/metadata/layout.conf as follows: +# manifest-hashes = SHA3 SHA512 WHIRLPOOL # # After layout.conf settings correspond to defaults in stable portage: # - Remove redundant settings from gentoo-x86/metadata/layout.conf. |