[22.x] rc2 backports #22534

pull fanquake wants to merge 12 commits into bitcoin:22.x from fanquake:22_x_backports changing 12 files +82 −44
  1. fanquake commented at 1:14 am on July 23, 2021: member
    Currently backports #22511. We can collect up further backports and merge prior to rc2.
  2. guix: Silence getent(1) invocation 
    Github-Pull: #22511
Rebased-From: 3c4d2c418e62d421a8bd7640ef5384251c892406
    45e0f3d608
  3. guix/INSTALL: Misc fixups 
    Github-Pull: #22511
Rebased-From: a884a1edcd1b795799f1be65df17462041741dc3
    9e52a30ebd
  4. DrahtBot added the label Backport on Jul 23, 2021
  5. guix/build: Remove vestigial SKIPATTEST.TAG 
    Github-Pull: #22533
Rebased-From: 9f01feda0ad99d8600f9edee1f37594c5166a7b8
    34f9f88bc9
  6. Updated Readme, Corrected the codesign typo 
    Github-Pull: #22538
Rebased-From: d7b7f610a53aa62bd82f6704a9c518a93c896963
    3bbfc1b8e0
  7. script, doc: guix touchups 
    Github-Pull: #22538
Rebased-From: 198ceb82f91bfdeac6e143ca7433f4a524f6f36f
    8f1e3b31b2
  8. guix: Make all.SHA256SUMS rather than codesigned.SHA256SUMS 
    Github-Pull: #22531
Rebased-From: 33455c76964b9e27b33e970d9722cc47657b291b
    056e47d887
  9. guix: Allow changing the base manifest in guix-verify 
    When verifying guix attestations, it is useful to set a particular
signer's manifest as the base to compare against.

Github-Pull: #22531
Rebased-From: 4a466388a0092fbdf5f8969c6bfb65bf8cc962e1
    aa9b6aba03
  10. guix, doc: Add a note that codesigners need to rebuild after tagging 
    One of the issues observed during the 22.0rc1 release process was that a
codesigner's attestation mismatched non-codesigner attestations because
the guix-codesign step was performed prior to tagging the version in
bitcoin-detached-sigs.

Github-Pull: #22531
Rebased-From: d080c27066449f76bc8709fc50e422757971d2cf
    38d18c01e2
  11. guix: Remove extra \r from all.SHA256SUMS line ending 
    guix-attest mistakenly added an extra \r to the line endings in
all.SHA256SUMS, causing guix-verify to erroneously fail.

Co-Authored-By: Carl Dong <contact@carldong.me>

Github-Pull: #22531
Rebased-From: 43225f0a2a517ccd79dc49279b979ffd2eca6b85
    219900a123
  12. guix: Ensure EPOCH_SOURCE_DATE does not include GPG information 
    If the user has set log.showSignature=true in their git config, then the
git log will always output GPG signature information. Since git log is
used to set EPOCH_SOURCE_DATE, this will mistakenly have GPG signature
information in it which causes issues for the build. To avoid this
issue, we override the config and force log.showSignature=false.

Github-Pull: #22531
Rebased-From: 9b313dfef18792fcc36e78ef3caa693fafcce04e
    cd57bb1a66
  13. achow101 commented at 5:49 pm on July 30, 2021: member

    ACK cd57bb1a6626e0820ae2456cd3b71c140cf83403

    Verified that the diffs match.

  14. dongcarl commented at 7:16 pm on July 30, 2021: member
    Building cd57bb1a66 right now and checking the codesigning workflow with self-signed certs.
  15. fanquake commented at 3:36 am on August 2, 2021: member

    Guix builds:

     0bash-5.1# find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
 1d0f9039e14c2c61912fa961fb4d8a048c5ccc23e5673880df344ecc23910325f  guix-build-cd57bb1a6626/output/aarch64-linux-gnu/SHA256SUMS.part
 2adbd1af831ce5dd319de5859c5df36dcd3899a83e76f4be0d71d674ca4f086a6  guix-build-cd57bb1a6626/output/aarch64-linux-gnu/bitcoin-cd57bb1a6626-aarch64-linux-gnu-debug.tar.gz
 383aac881d256ceae2dc4771f4cff800c75592c0610ebce2ad1e3a0b7a98cb17f  guix-build-cd57bb1a6626/output/aarch64-linux-gnu/bitcoin-cd57bb1a6626-aarch64-linux-gnu.tar.gz
 48c4b1313f6d4b62590e33eb79581a0a0694c59b067e11e5375d952cf88749906  guix-build-cd57bb1a6626/output/arm-linux-gnueabihf/SHA256SUMS.part
 57ceb281370f61df3078b09cf80674c12f24815aeba0c1bc148ade9d63ec8263b  guix-build-cd57bb1a6626/output/arm-linux-gnueabihf/bitcoin-cd57bb1a6626-arm-linux-gnueabihf-debug.tar.gz
 6941f268fcd0882bffdb9fa8f02b7c2dfbb2b60695336ce8a2980befe5a2dbaad  guix-build-cd57bb1a6626/output/arm-linux-gnueabihf/bitcoin-cd57bb1a6626-arm-linux-gnueabihf.tar.gz
 758ec80628160a50663f4481953baac812793f0df0b505040fd4d0af01672173a  guix-build-cd57bb1a6626/output/dist-archive/bitcoin-cd57bb1a6626.tar.gz
 8fc1336666f725eec0c2f1221c54f7b8900004f351937b920b1cb4f53dfb97d7e  guix-build-cd57bb1a6626/output/powerpc64-linux-gnu/SHA256SUMS.part
 9d5444007c3a3c85304f9176bd47f74bd2c0d75fc7ae6c577429f5c25cdd79e80  guix-build-cd57bb1a6626/output/powerpc64-linux-gnu/bitcoin-cd57bb1a6626-powerpc64-linux-gnu-debug.tar.gz
1027ac3784de27e6db98f46cf6200f4fccdb1161229bfa6d9cbcbcb75662da9a9b  guix-build-cd57bb1a6626/output/powerpc64-linux-gnu/bitcoin-cd57bb1a6626-powerpc64-linux-gnu.tar.gz
119856f57fe35ce727ce125cd8faefcd4710652599c88b87eb118a601685157059  guix-build-cd57bb1a6626/output/powerpc64le-linux-gnu/SHA256SUMS.part
12d00163bf2ad874d5d76a53b470857181493bb54c11cf64c6e79a7ef97e72b24c  guix-build-cd57bb1a6626/output/powerpc64le-linux-gnu/bitcoin-cd57bb1a6626-powerpc64le-linux-gnu-debug.tar.gz
138ee09b7bb1482640dc91bff595fc8cbcdedcf6eea746b98e7002e92d3669cc76  guix-build-cd57bb1a6626/output/powerpc64le-linux-gnu/bitcoin-cd57bb1a6626-powerpc64le-linux-gnu.tar.gz
14bb06ed9128bce843326cce59b7dc243be7d798c5b0434ee506332277c74997a6  guix-build-cd57bb1a6626/output/riscv64-linux-gnu/SHA256SUMS.part
15369aba2fcc6523724faf216e711b6d2dea737515475bac3c757c8dfbde5ad4c0  guix-build-cd57bb1a6626/output/riscv64-linux-gnu/bitcoin-cd57bb1a6626-riscv64-linux-gnu-debug.tar.gz
16730d411cd605caecad1581660783e6f5046f9423ec7d30bbe4f99e061e049342  guix-build-cd57bb1a6626/output/riscv64-linux-gnu/bitcoin-cd57bb1a6626-riscv64-linux-gnu.tar.gz
1725e0f763eef908ee3ef01cf32badba940961cc8e7b9ef987ed2ee909e2d2d3e4  guix-build-cd57bb1a6626/output/x86_64-apple-darwin18/SHA256SUMS.part
18360030cce3ded4c74bffd9fd3744b88d7238f71d2f59b4ec4aaa61d798aaa927  guix-build-cd57bb1a6626/output/x86_64-apple-darwin18/bitcoin-cd57bb1a6626-osx-unsigned.dmg
198ca84dc139801158a07de11409870fde942385b39586194edfbaefa5adb837c9  guix-build-cd57bb1a6626/output/x86_64-apple-darwin18/bitcoin-cd57bb1a6626-osx-unsigned.tar.gz
20764333eb47ccc1758fe81aace15c9ae0d59f7491c0a333146c9c2651754766d7  guix-build-cd57bb1a6626/output/x86_64-apple-darwin18/bitcoin-cd57bb1a6626-osx64.tar.gz
21dea7484c8f1659e2f4fe3c0f1a6ae63191d25b3892c41d5f88f0c7145e19bf20  guix-build-cd57bb1a6626/output/x86_64-linux-gnu/SHA256SUMS.part
22638ecdac8aa7da8b1cea51d0c6df5732b59e934ccf415e010529e9cc6c5db181  guix-build-cd57bb1a6626/output/x86_64-linux-gnu/bitcoin-cd57bb1a6626-x86_64-linux-gnu-debug.tar.gz
2391cc5a77ef30691a2793a2f5f10f426a5aa620ec55d7fac7a945fa4cdbc431ef  guix-build-cd57bb1a6626/output/x86_64-linux-gnu/bitcoin-cd57bb1a6626-x86_64-linux-gnu.tar.gz
242bbc50eee80a63dd3b3c3f60a38bc0951add0f1db4bfcaddbf52da519aac56dd  guix-build-cd57bb1a6626/output/x86_64-w64-mingw32/SHA256SUMS.part
2585dbf24017d34950c810b427ba965874cae865475e08e378d5b766c19c79082d  guix-build-cd57bb1a6626/output/x86_64-w64-mingw32/bitcoin-cd57bb1a6626-win-unsigned.tar.gz
269146603ef76f2defd1f768b874ed11dd5838008c0346f85982b103010cbb1055  guix-build-cd57bb1a6626/output/x86_64-w64-mingw32/bitcoin-cd57bb1a6626-win64-debug.zip
276cadd6813c4cd723657f4eb3a59cf4a517bc1bfc3797cc3dead8f0d7155c4a58  guix-build-cd57bb1a6626/output/x86_64-w64-mingw32/bitcoin-cd57bb1a6626-win64-setup-unsigned.exe
2830271711dd689096e05b381df8f916b082e5b2308b6a2655cf672f632b53d69e  guix-build-cd57bb1a6626/output/x86_64-w64-mingw32/bitcoin-cd57bb1a6626-win64.zip
  16. laanwj commented at 9:06 am on August 2, 2021: member
    Let’s add #22589
  17. contrib, p2p: update I2P hardcoded seeds 
    Github-Pull: #22589
Rebased-From: 2962640c49cf38f76345e45e63045a8f0eed5c61
    cc8838ce98
  18. doc: add info to i2p.md about IBD time and multiple networks 
    Github-Pull: #22589
Rebased-From: d2dffd5be4c8f6a1942dd971d09707c3620a1689
    739d19053b
  19. fanquake commented at 12:00 pm on August 2, 2021: member

    Let’s add #22589

    Added.

  20. laanwj added this to the milestone 22.0 on Aug 2, 2021
  21. laanwj commented at 1:38 pm on August 2, 2021: member
    ACK 739d19053b152c8f6a5d70461a9a1b93549f135c
  22. laanwj merged this on Aug 2, 2021
  23. laanwj closed this on Aug 2, 2021
  24. fanquake deleted the branch on Aug 3, 2021
  25. DrahtBot locked this on Aug 18, 2022


fanquake achow101 dongcarl laanwj

Labels
Backport

Milestone
22.0

github-metadata-mirror

This is a metadata mirror of the GitHub repository bitcoin/bitcoin. This site is not affiliated with GitHub. Content is generated from a GitHub metadata backup.
generated: 2024-07-03 10:13 UTC
This site is hosted by @0xB10C
More mirrored repositories can be found on mirror.b10c.me