diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 06f27a9..d6a3d72 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -20,9 +20,14 @@ updates: default-days: 7 commit-message: prefix: build + # pybind11 stays at 2.x, and pybind11-stubgen at the version that bin/lint_bindings.py is made for. cmake is only the lowest version that + # the build asks for in pyproject.toml, and a bump of it would make the module build with nothing older ignore: - dependency-name: pybind11 update-types: ["version-update:semver-major"] + - dependency-name: pybind11-stubgen + update-types: ["version-update:semver-major"] + - dependency-name: cmake groups: build: patterns: diff --git a/bin/check_macho_hardening.sh b/bin/check_macho_hardening.sh index 94fa08b..c9b77f9 100755 --- a/bin/check_macho_hardening.sh +++ b/bin/check_macho_hardening.sh @@ -5,15 +5,15 @@ # # Apple clang turns the stack protector on (-fstack-protector-strong), so what is checked is that the module imports the guard and the handler of # the canary, and that many functions call the handler. The count is the number of calls to ___stack_chk_fail in the code, a call for each function -# that has a canary. The minimum was not measured on this module: monero-c, which links the same libraries of monero-project, has about 3400, and -# a module built with no stack protector, or whose libraries were, has a handful. It is a guess, the first run of the check prints the real number. +# that has a canary. The module of the build of CI has 3018 of them on arm64 (macos-15) and 2864 on x86_64 (macos-15-intel), and the minimum is +# about half of that: a module built with no stack protector, or whose libraries were, has a handful. # # The exports are _PyInit_monero and nothing else, which the linker is asked for with -exported_symbol in CMakeLists.txt. set -euo pipefail export LC_ALL=C library="${1:?usage: check_macho_hardening.sh monero.cpython-314-darwin.so}" -MIN_CANARY_CALLS=500 +MIN_CANARY_CALLS=1400 failed=0 fail() {