merge bitcoin#27813: Update python-lief package to 0.13.2

This commit is contained in:
Kittywhiskers Van Gogh 2024-11-05 14:28:07 +00:00
parent 70e62830a1
commit d439e4612f
No known key found for this signature in database
GPG Key ID: 30CD0C065E5C4AAD
4 changed files with 26 additions and 48 deletions

View File

@ -76,7 +76,7 @@ RUN pip3 install \
codespell==1.17.1 \
flake8==3.8.3 \
jinja2 \
lief==0.12.3 \
lief==0.13.2 \
pyzmq \
vulture==2.3 \
mypy==0.781 \

View File

@ -113,7 +113,7 @@ def check_ELF_control_flow(binary) -> bool:
main = binary.get_function_address('main')
content = binary.get_content_from_virtual_address(main, 4, lief.Binary.VA_TYPES.AUTO)
if content == [243, 15, 30, 250]: # endbr64
if content.tolist() == [243, 15, 30, 250]: # endbr64
return True
return False
@ -142,7 +142,7 @@ def check_PE_control_flow(binary) -> bool:
content = binary.get_content_from_virtual_address(virtual_address, 4, lief.Binary.VA_TYPES.VA)
if content == [243, 15, 30, 250]: # endbr64
if content.tolist() == [243, 15, 30, 250]: # endbr64
return True
return False
@ -190,7 +190,7 @@ def check_MACHO_control_flow(binary) -> bool:
'''
content = binary.get_content_from_virtual_address(binary.entrypoint, 4, lief.Binary.VA_TYPES.AUTO)
if content == [243, 15, 30, 250]: # endbr64
if content.tolist() == [243, 15, 30, 250]: # endbr64
return True
return False

View File

@ -22,6 +22,7 @@
(gnu packages moreutils)
(gnu packages pkg-config)
(gnu packages python)
((gnu packages python-build) #:select (python-tomli))
(gnu packages python-crypto)
(gnu packages python-web)
(gnu packages shells)
@ -204,38 +205,44 @@ chain for " target " development."))
(search-our-patches "nsis-gcc-10-memmove.patch"
"nsis-disable-installer-reloc.patch")))
(define (fix-ppc64-nx-default lief)
(package-with-extra-patches lief
(search-our-patches "lief-fix-ppc64-nx-default.patch")))
;; Our python-lief package can be removed once we are using
;; guix 83bfdb409787cb2737e68b093a319b247b7858e6 or later.
;; Note we currently use cmake-minimal.
;; While LIEF is packaged in Guix, we maintain our own package,
;; to simplify building, and more easily apply updates.
;; Moreover, the Guix's package uses cmake, which caused build
;; failure; see https://github.com/bitcoin/bitcoin/pull/27296.
(define-public python-lief
(package
(name "python-lief")
(version "0.12.3")
(version "0.13.2")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/lief-project/LIEF")
(commit version)))
(file-name (git-file-name name version))
(modules '((guix build utils)))
(snippet
'(begin
;; Configure build for Python bindings.
(substitute* "api/python/config-default.toml"
(("(ninja = )true" all m)
(string-append m "false"))
(("(parallel-jobs = )0" all m)
(string-append m (number->string (parallel-job-count)))))))
(sha256
(base32
"11i6hqmcjh56y554kqhl61698n9v66j2qk1c1g63mv2w07h2z661"))))
"0y48x358ppig5xp97ahcphfipx7cg9chldj2q5zrmn610fmi4zll"))))
(build-system python-build-system)
(native-inputs (list cmake-minimal))
(native-inputs (list cmake-minimal python-tomli))
(arguments
(list
#:tests? #f ;needs network
#:phases #~(modify-phases %standard-phases
(add-before 'build 'change-directory
(lambda _
(chdir "api/python")))
(replace 'build
(lambda _
(invoke
"python" "setup.py" "--sdk" "build"
(string-append
"-j" (number->string (parallel-job-count)))))))))
(invoke "python" "setup.py" "build"))))))
(home-page "https://github.com/lief-project/LIEF")
(synopsis "Library to instrument executable formats")
(description
@ -600,7 +607,7 @@ inspecting signatures in Mach-O binaries.")
;; Git
git-minimal
;; Tests
(fix-ppc64-nx-default python-lief))
python-lief)
(let ((target (getenv "HOST")))
(cond ((string-suffix? "-mingw32" target)
;; Windows

View File

@ -1,29 +0,0 @@
Correct default for Binary::has_nx on ppc64
From the Linux kernel source:
* This is the default if a program doesn't have a PT_GNU_STACK
* program header entry. The PPC64 ELF ABI has a non executable stack
* stack by default, so in the absence of a PT_GNU_STACK program header
* we turn execute permission off.
This patch can be dropped the next time we update LIEF.
diff --git a/src/ELF/Binary.cpp b/src/ELF/Binary.cpp
index a90be1ab..fd2d9764 100644
--- a/src/ELF/Binary.cpp
+++ b/src/ELF/Binary.cpp
@@ -1084,7 +1084,12 @@ bool Binary::has_nx() const {
return segment->type() == SEGMENT_TYPES::PT_GNU_STACK;
});
if (it_stack == std::end(segments_)) {
- return false;
+ if (header().machine_type() == ARCH::EM_PPC64) {
+ // The PPC64 ELF ABI has a non-executable stack by default.
+ return true;
+ } else {
+ return false;
+ }
}
return !(*it_stack)->has(ELF_SEGMENT_FLAGS::PF_X);