Gentoo Archives: gentoo-portage-dev

From: Mike Frysinger <vapier@g.o>
To: gentoo-portage-dev@l.g.o
Subject: [gentoo-portage-dev] [PATCH] switch to whirlpool for manifest funcs
Date: Sun, 05 Jan 2014 19:35:42
Message-Id: 1388950542-4597-1-git-send-email-vapier@gentoo.org
1 We've had these hash functions in stable portage for a while now, so
2 switch to using whirlpool by default as planned.
3 ---
4 pym/portage/const.py | 12 +++++++-----
5 1 file changed, 7 insertions(+), 5 deletions(-)
6
7 diff --git a/pym/portage/const.py b/pym/portage/const.py
8 index 1785bff..c44f4a0 100644
9 --- a/pym/portage/const.py
10 +++ b/pym/portage/const.py
11 @@ -204,17 +204,19 @@ MANIFEST1_REQUIRED_HASH = "MD5"
12
13 # Past events:
14 #
15 -# 20120704 - After WHIRLPOOL is supported in stable portage:
16 +# After WHIRLPOOL is supported in stable portage:
17 # - Set manifest-hashes in gentoo-x86/metadata/layout.conf as follows:
18 # manifest-hashes = SHA256 SHA512 WHIRLPOOL
19 # - Add SHA512 and WHIRLPOOL to MANIFEST2_HASH_DEFAULTS.
20 # - Remove SHA1 and RMD160 from MANIFEST2_HASH_*.
21 #
22 -# Future events:
23 -#
24 # After WHIRLPOOL is supported in stable portage for at least 1 year:
25 # - Change MANIFEST2_REQUIRED_HASH to WHIRLPOOL.
26 # - Remove SHA256 from MANIFEST2_HASH_*.
27 +#
28 +# Future events:
29 +#
30 +# After WHIRLPOOL is supported in stable portage for at least 1 year:
31 # - Set manifest-hashes in gentoo-x86/metadata/layout.conf as follows:
32 # manifest-hashes = SHA512 WHIRLPOOL
33 #
34 @@ -229,8 +231,8 @@ MANIFEST1_REQUIRED_HASH = "MD5"
35 # - Remove redundant settings from gentoo-x86/metadata/layout.conf.
36
37 MANIFEST2_HASH_FUNCTIONS = ("SHA256", "SHA512", "WHIRLPOOL")
38 -MANIFEST2_HASH_DEFAULTS = frozenset(["SHA256", "SHA512", "WHIRLPOOL"])
39 -MANIFEST2_REQUIRED_HASH = "SHA256"
40 +MANIFEST2_HASH_DEFAULTS = frozenset(["SHA512", "WHIRLPOOL"])
41 +MANIFEST2_REQUIRED_HASH = "WHIRLPOOL"
42
43 MANIFEST2_IDENTIFIERS = ("AUX", "MISC", "DIST", "EBUILD")
44
45 --
46 1.8.4.3