diff options
author | fanquake <fanquake@gmail.com> | 2024-06-13 13:48:26 +0100 |
---|---|---|
committer | fanquake <fanquake@gmail.com> | 2024-06-13 13:48:26 +0100 |
commit | b03a45b13e4e33b044cae6c97a6d608f6f3d43f3 (patch) | |
tree | 9524ae52898a74bf16def8cba692ad1039944f3d /contrib/macdeploy | |
parent | 080a47cb8a8db27328bbdf57aa80cc4b4127a370 (diff) |
Revert "contrib: macdeploy: monkey-patch gen-sdk to be deterministic"
This reverts commit ba30a5407e065e9d6dd037351e83f56a43f38f19.
Diffstat (limited to 'contrib/macdeploy')
-rwxr-xr-x | contrib/macdeploy/gen-sdk | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/contrib/macdeploy/gen-sdk b/contrib/macdeploy/gen-sdk index b73f5cba14..86a6262b5c 100755 --- a/contrib/macdeploy/gen-sdk +++ b/contrib/macdeploy/gen-sdk @@ -8,21 +8,6 @@ import gzip import os import contextlib -# monkey-patch Python 3.8 and older to fix wrong TAR header handling -# see https://github.com/bitcoin/bitcoin/pull/24534 -# and https://github.com/python/cpython/pull/18080 for more info -if sys.version_info < (3, 9): - _old_create_header = tarfile.TarInfo._create_header - def _create_header(info, format, encoding, errors): - buf = _old_create_header(info, format, encoding, errors) - # replace devmajor/devminor with binary zeroes - buf = buf[:329] + bytes(16) + buf[345:] - # recompute checksum - chksum = tarfile.calc_chksums(buf)[0] - buf = buf[:-364] + bytes("%06o\0" % chksum, "ascii") + buf[-357:] - return buf - tarfile.TarInfo._create_header = staticmethod(_create_header) - @contextlib.contextmanager def cd(path): """Context manager that restores PWD even if an exception was raised.""" |