Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Add patch to make codesign_allocate compatible with Apple's" #20855

Merged
merged 1 commit into from
Jan 5, 2021

Conversation

sipa
Copy link
Member

@sipa sipa commented Jan 5, 2021

This reverts #20644.

It appears that Apple has recently changed their codesign_allocate tool back to using 4k alignment on x86_64, at least in some cases, so this patch isn't causing our cctools-based version to be exactly compatible.

Furthermore, if codesigning were to change to use https://github.com/achow101/signapple instead, there is no need anymore to try to mimick Apple.

@sipa sipa added this to the 0.21.0rc5 milestone Jan 5, 2021
@sipa sipa removed the Backport label Jan 5, 2021
@laanwj
Copy link
Member

laanwj commented Jan 5, 2021

ACK a0eb4c5
Thanks for doing this anyway, this is so thankless and tiring, having to second-guess Apple's moves.

@maflcko
Copy link
Member

maflcko commented Jan 5, 2021

Reference from IRC: [06:46] <jonasschnelli> current state: 0.19.2rc1 and 0.20.2rc1 are signed (with achow101's tool), 0.21.0rc4 can't be signed deterministically (needs revert of sipas patch)

Copy link
Contributor

@jonasschnelli jonasschnelli left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK a0eb4c5

@maflcko
Copy link
Member

maflcko commented Jan 5, 2021

checked-clean-revert ACK a0eb4c5

@maflcko maflcko merged commit b40254b into bitcoin:master Jan 5, 2021
maflcko pushed a commit to maflcko/bitcoin-core that referenced this pull request Jan 5, 2021
@maflcko
Copy link
Member

maflcko commented Jan 5, 2021

Backported in #20850

sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Jan 5, 2021
…atible with Apple's"

a0eb4c5 Revert "Add patch to make codesign_allocate compatible with Apple's" (Pieter Wuille)

Pull request description:

  This reverts bitcoin#20644.

  It appears that Apple has recently changed their `codesign_allocate` tool back to using 4k alignment on x86_64, at least in some cases, so this patch isn't causing our cctools-based version to be exactly compatible.

  Furthermore, if codesigning were to change to use https://github.com/achow101/signapple instead, there is no need anymore to try to mimick Apple.

ACKs for top commit:
  laanwj:
    ACK a0eb4c5
  MarcoFalke:
    checked-clean-revert ACK a0eb4c5
  jonasschnelli:
    ACK a0eb4c5

Tree-SHA512: 529719a76811006122406689233d1e80995107fe1ac1fc862a4ac53ca21685748ed76cac7ca648dd70f0ea43dd8dcf2e29d559beeab10e1d30dc5542ac95fd97
@laanwj laanwj modified the milestones: 0.21.0rc5, 0.21.0 Jan 7, 2021
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Aug 16, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants