Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/
Date: Mon, 06 Nov 2017 14:33:51
Message-Id: 1509978780.148ef9055f20dfeb2996417575cefeda922b43a9.mgorny@gentoo
1 commit: 148ef9055f20dfeb2996417575cefeda922b43a9
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Mon Nov 6 07:04:11 2017 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 6 14:33:00 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=148ef905
7
8 portage.const: Remove obsolete manifest-hashes comment
9
10 The comment is based upon the wrong assumption that the world is
11 Portage-centric. We are keeping the manifest-hashes in layout.conf
12 indefinitely, and we will most likely take BLAKE2 instead of SHA3.
13
14 Reviewed-by: Zac Medico <zmedico <AT> gentoo.org>
15
16 pym/portage/const.py | 23 -----------------------
17 1 file changed, 23 deletions(-)
18
19 diff --git a/pym/portage/const.py b/pym/portage/const.py
20 index cbd2b6042..11e94b0a2 100644
21 --- a/pym/portage/const.py
22 +++ b/pym/portage/const.py
23 @@ -207,29 +207,6 @@ EAPI = 6
24 HASHING_BLOCKSIZE = 32768
25 MANIFEST1_HASH_FUNCTIONS = ("MD5", "SHA256", "RMD160")
26
27 -# Past events:
28 -#
29 -# 20120704 - After WHIRLPOOL is supported in stable portage:
30 -# - Set manifest-hashes in gentoo-x86/metadata/layout.conf as follows:
31 -# manifest-hashes = SHA256 SHA512 WHIRLPOOL
32 -# - Add SHA512 and WHIRLPOOL to MANIFEST2_HASH_DEFAULTS.
33 -# - Remove SHA1 and RMD160 from MANIFEST2_HASH_*.
34 -#
35 -# Future events:
36 -#
37 -# After WHIRLPOOL is supported in stable portage for at least 1 year:
38 -# - Change MANIFEST2_REQUIRED_HASH to WHIRLPOOL.
39 -# - Remove SHA256 from MANIFEST2_HASH_*.
40 -# - Set manifest-hashes in gentoo-x86/metadata/layout.conf as follows:
41 -# manifest-hashes = SHA512 WHIRLPOOL
42 -#
43 -# After SHA-3 is supported in stable portage:
44 -# - Set manifest-hashes in gentoo-x86/metadata/layout.conf as follows:
45 -# manifest-hashes = SHA3 SHA512 WHIRLPOOL
46 -#
47 -# After layout.conf settings correspond to defaults in stable portage:
48 -# - Remove redundant settings from gentoo-x86/metadata/layout.conf.
49 -
50 MANIFEST2_HASH_FUNCTIONS = ("SHA256", "SHA512", "WHIRLPOOL",
51 "BLAKE2B", "BLAKE2S", "SHA3_256", "SHA3_512",
52 "STREEBOG256", "STREEBOG512")