Update signapple for platform identifier fix

achow101 commented at 6:05 pm on March 15, 2022: member

Apparently #23134 is caused by the platform identifier field being set to the incorrect value in our code signatures. The problem has been resolved in signapple, and so guix should point to the latest commit containing the fix.

I suppose guix does not strictly need to have this; only the macOS code signer will need to have the fix.

Fixes #23134

DrahtBot added the label Scripts and tools on Mar 15, 2022

hebasto approved

hebasto commented at 7:09 am on March 16, 2022: member

ACK 286db5882d1324a51998ac0ef72b5575702e318a, I have reviewed the code and it looks OK, I agree it can be merged.

I’ve verified that changes in the https://github.com/achow101/signapple/commit/8a945a2e7583be2665cf3a6a89d665b70ecd1ab6 follow documentation. Did not test that #23134 is fixed.

fanquake commented at 9:42 am on March 16, 2022: member

Concept ACK, but can you correct the expected hash so this will Guix build:

 0INFO: Building 286db5882d13 for platform triple x86_64-apple-darwin:
 1      ...using reference timestamp: 1647367347
 2      ...running at most 8 jobs
 3      ...from worktree directory: '/bitcoin'
 4          ...bind-mounted in container to: '/bitcoin'
 5      ...in build directory: '/bitcoin/guix-build-286db5882d13/distsrc-286db5882d13-x86_64-apple-darwin'
 6          ...bind-mounted in container to: '/distsrc-base/distsrc-286db5882d13-x86_64-apple-darwin'
 7      ...outputting in: '/bitcoin/guix-build-286db5882d13/output/x86_64-apple-darwin'
 8          ...bind-mounted in container to: '/outdir-base/x86_64-apple-darwin'
 9substitute: updating substitutes from 'https://ci.guix.gnu.org'... 100.0%
10substitute: updating substitutes from 'https://bordeaux.guix.gnu.org'... 100.0%
11The following derivations will be built:
12   /gnu/store/lmcnfma47i4xpwsahycxy9kbmjs6l442-python-signapple-0.1-1.8a945a2.drv
13   /gnu/store/rafvaq89shi8kmgqlnlmvdh48q0g7ig6-python-signapple-8a945a2e7583be2665cf3a6a89d665b70ecd1ab6-checkout.drv
14
15building /gnu/store/rafvaq89shi8kmgqlnlmvdh48q0g7ig6-python-signapple-8a945a2e7583be2665cf3a6a89d665b70ecd1ab6-checkout.drv...
16-r:sha256 hash mismatch for /gnu/store/d6fiz6vh16c7aadszhfprhkvy39hzwiw-python-signapple-8a945a2e7583be2665cf3a6a89d665b70ecd1ab6-checkout:
17  expected hash: 1mxk4g60zdvfsby2v5drqxwjd3nc4azihgc9dkfr0rpanigjafc0
18  actual hash:   0fr1hangvfyiwflca6jg5g8zvg3jc9qr7vd2c12ff89pznf38dlg
19hash mismatch for store item '/gnu/store/d6fiz6vh16c7aadszhfprhkvy39hzwiw-python-signapple-8a945a2e7583be2665cf3a6a89d665b70ecd1ab6-checkout'
20build of /gnu/store/rafvaq89shi8kmgqlnlmvdh48q0g7ig6-python-signapple-8a945a2e7583be2665cf3a6a89d665b70ecd1ab6-checkout.drv failed
21View build log at '/var/log/guix/drvs/ra/fvaq89shi8kmgqlnlmvdh48q0g7ig6-python-signapple-8a945a2e7583be2665cf3a6a89d665b70ecd1ab6-checkout.drv.gz'.
22note: keeping build directory `/tmp/guix-build-python-signapple-8a945a2e7583be2665cf3a6a89d665b70ecd1ab6-checkout.drv-0'
23cannot build derivation `/gnu/store/lmcnfma47i4xpwsahycxy9kbmjs6l442-python-signapple-0.1-1.8a945a2.drv': 1 dependencies couldn't be built
24guix environment: error: build of `/gnu/store/lmcnfma47i4xpwsahycxy9kbmjs6l442-python-signapple-0.1-1.8a945a2.drv' failed

0bash-5.1# git rev-parse HEAD
18a945a2e7583be2665cf3a6a89d665b70ecd1ab6
2bash-5.1# guix hash -rx .
30fr1hangvfyiwflca6jg5g8zvg3jc9qr7vd2c12ff89pznf38dlg

Update signapple for platform identifier fix 3c74f775ac

in contrib/guix/manifest.scm:501 in 286db5882d outdated

497@@ -498,7 +498,7 @@ and endian independent.")
498          (file-name (git-file-name name commit))
499          (sha256
500           (base32
501-           "19axspyyfqbrfw2r53c17mi9bvm8zsb39mz8v9h7c173qkm3x5ym"))))
502+           "1mxk4g60zdvfsby2v5drqxwjd3nc4azihgc9dkfr0rpanigjafc0"))))

gruve-p commented at 9:44 am on March 16, 2022:

0           "0fr1hangvfyiwflca6jg5g8zvg3jc9qr7vd2c12ff89pznf38dlg"))))

achow101 force-pushed on Mar 16, 2022

achow101 commented at 1:12 pm on March 16, 2022: member

Grr. guix hash didn’t ignore things that were in my gitignore. Fixed the hash.

hebasto approved

hebasto commented at 3:40 pm on March 16, 2022: member

re-ACK 3c74f775ac956de4da4fc076b2360b687531cd63

GUIX builds on `x86_64`:

0$ find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
136a2a3376356e52991667e14c39280a519fcdab97d3230f0c9d68821cae5d49d  guix-build-3c74f775ac95/output/arm64-apple-darwin/SHA256SUMS.part
28e23d4fd7b2da372c5c0d4e407b26d0f46ed01d44f158361420180e3799ab151  guix-build-3c74f775ac95/output/arm64-apple-darwin/bitcoin-3c74f775ac95-arm64-apple-darwin.tar.gz
3b7a12f6488f6715aaa792b6f4080462ff2090b67200b07f0cae67db9673f7065  guix-build-3c74f775ac95/output/arm64-apple-darwin/bitcoin-3c74f775ac95-osx-unsigned.dmg
4cdbf19f870d23762170c1cd5f47c3d9b86a4c0b9d9bd5b0c32b8500286128e62  guix-build-3c74f775ac95/output/arm64-apple-darwin/bitcoin-3c74f775ac95-osx-unsigned.tar.gz
510ca455f10bc4e0a122c7d6c83970cf2ec57831d7fad879753a8275422153fb4  guix-build-3c74f775ac95/output/dist-archive/bitcoin-3c74f775ac95.tar.gz
64ecf2eb1c3dc838c23671e4a2765e2ad6ec151a328a7c976ad058f920dad777a  guix-build-3c74f775ac95/output/x86_64-apple-darwin/SHA256SUMS.part
78429f2426675807d14d77f17369b416bcaf49f645837a8d4db0d831a6c92a28b  guix-build-3c74f775ac95/output/x86_64-apple-darwin/bitcoin-3c74f775ac95-osx-unsigned.dmg
878f7b9803a322ce3089bcd19ea993c16b76d4266ba930019109710b5dd3f7bd0  guix-build-3c74f775ac95/output/x86_64-apple-darwin/bitcoin-3c74f775ac95-osx-unsigned.tar.gz
943dc210e5c31e0579f8a4e707ddf3b847b4a93ea3937131473f22cd2df257ef7  guix-build-3c74f775ac95/output/x86_64-apple-darwin/bitcoin-3c74f775ac95-osx64.tar.gz

prusnak commented at 3:47 pm on March 16, 2022: contributor

Let’s add to 23.0 Milestone and apply the Needs backport (23.x) label.

fanquake added this to the milestone 23.0 on Mar 16, 2022

fanquake added the label Needs backport (23.x) on Mar 16, 2022

gruve-p commented at 4:17 pm on March 16, 2022: contributor

ACK https://github.com/bitcoin/bitcoin/pull/24573/commits/3c74f775ac956de4da4fc076b2360b687531cd63

fanquake approved

fanquake commented at 4:44 pm on March 16, 2022: member

ACK 3c74f775ac956de4da4fc076b2360b687531cd63

Guix Build:

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
136a2a3376356e52991667e14c39280a519fcdab97d3230f0c9d68821cae5d49d  guix-build-3c74f775ac95/output/arm64-apple-darwin/SHA256SUMS.part
28e23d4fd7b2da372c5c0d4e407b26d0f46ed01d44f158361420180e3799ab151  guix-build-3c74f775ac95/output/arm64-apple-darwin/bitcoin-3c74f775ac95-arm64-apple-darwin.tar.gz
3b7a12f6488f6715aaa792b6f4080462ff2090b67200b07f0cae67db9673f7065  guix-build-3c74f775ac95/output/arm64-apple-darwin/bitcoin-3c74f775ac95-osx-unsigned.dmg
4cdbf19f870d23762170c1cd5f47c3d9b86a4c0b9d9bd5b0c32b8500286128e62  guix-build-3c74f775ac95/output/arm64-apple-darwin/bitcoin-3c74f775ac95-osx-unsigned.tar.gz
510ca455f10bc4e0a122c7d6c83970cf2ec57831d7fad879753a8275422153fb4  guix-build-3c74f775ac95/output/dist-archive/bitcoin-3c74f775ac95.tar.gz
64ecf2eb1c3dc838c23671e4a2765e2ad6ec151a328a7c976ad058f920dad777a  guix-build-3c74f775ac95/output/x86_64-apple-darwin/SHA256SUMS.part
78429f2426675807d14d77f17369b416bcaf49f645837a8d4db0d831a6c92a28b  guix-build-3c74f775ac95/output/x86_64-apple-darwin/bitcoin-3c74f775ac95-osx-unsigned.dmg
878f7b9803a322ce3089bcd19ea993c16b76d4266ba930019109710b5dd3f7bd0  guix-build-3c74f775ac95/output/x86_64-apple-darwin/bitcoin-3c74f775ac95-osx-unsigned.tar.gz
943dc210e5c31e0579f8a4e707ddf3b847b4a93ea3937131473f22cd2df257ef7  guix-build-3c74f775ac95/output/x86_64-apple-darwin/bitcoin-3c74f775ac95-osx64.tar.gz

fanquake merged this on Mar 16, 2022

fanquake closed this on Mar 16, 2022

fanquake referenced this in commit de528793b6 on Mar 16, 2022

fanquake removed the label Needs backport (23.x) on Mar 16, 2022

fanquake commented at 8:55 pm on March 16, 2022: member

Backported in #24593.

sidhujag referenced this in commit e39d71cfd1 on Mar 16, 2022

laanwj referenced this in commit 55a60b9718 on Mar 17, 2022

kwvg referenced this in commit 99f187740a on Jun 11, 2023

kwvg referenced this in commit b9d18043af on Jun 11, 2023

PastaPastaPasta referenced this in commit cc9f59d0fb on Jun 18, 2023

PastaPastaPasta referenced this in commit d159340395 on Jun 18, 2023

delta1 referenced this in commit 5255689011 on Oct 16, 2023

bitcoin locked this on Feb 17, 2024

Update signapple for platform identifier fix #24573

GUIX builds on x86_64:

GUIX builds on `x86_64`: