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

Update stable to 0.7.4 with patches #4734

Open
wants to merge 14 commits into
base: stable
Choose a base branch
from
Open

Update stable to 0.7.4 with patches #4734

wants to merge 14 commits into from

Conversation

XVilka
Copy link
Member

@XVilka XVilka commented Nov 24, 2024

DO NOT SQUASH

Your checklist for this pull request

  • I've read the guidelines for contributing to this repository
  • I made sure to follow the project's coding style
  • I've documented or updated the documentation of every function and struct this PR changes. If not so I've explained why.
  • I've added tests that prove my fix is effective or that my feature works (if possible)
  • I've updated the rizin book with the relevant information (if needed)

Detailed description

Import some security fixes from dev.

Blocked on rizinorg/rz-bindgen#66

Test plan

CI is green

@github-actions github-actions bot added the rizin label Nov 24, 2024
@XVilka XVilka force-pushed the dist-release-0.7.4 branch from 3b1b73f to 4158efc Compare November 24, 2024 10:04
@XVilka XVilka force-pushed the dist-release-0.7.4 branch 2 times, most recently from 399605c to 97f671d Compare November 24, 2024 10:09
kazarmy and others added 6 commits November 24, 2024 18:18
* Fix NetBSD 10 build
* It's TRAP_BRKPT, not TRAP_BKPT
Use the p_stat of the main thread to decide in which state the process is.
For multi-threaded applications this is still not quite correct but at
least this compiles on OpenBSD-current.

See also openbsd/ports@5d4f90e

Fix for #4576
* Use Python venv on OpenBSD

* Activate venv after setting PATH
@XVilka XVilka force-pushed the dist-release-0.7.4 branch from 97f671d to 3b50ce2 Compare November 24, 2024 10:19
@XVilka XVilka requested a review from yossizap as a code owner November 24, 2024 10:19
@wargio wargio changed the title Removed call to command m which does not exist Update stable to 0.7.4 with patches Nov 24, 2024
@wargio
Copy link
Member

wargio commented Nov 24, 2024

i think you need to cherrypick also the changes for the CI made by @kazarmy

@XVilka
Copy link
Member Author

XVilka commented Nov 24, 2024

Everything works except rz-bindgen:

Found ninja-1.11.1.git.kitware.jobserver-1 at /usr/local/bin/ninja
ninja: Entering directory `/home/runner/work/rizin/rizin/rz-bindgen/build'
[1/7] Generating bindgen_outputs with a custom command
FAILED: rizin.i 
/usr/bin/python3 ../src/main.py -o . --clang-path /usr/lib/llvm-14/lib --clang-args ' -resource-dir="/usr/lib/llvm-14/lib/clang/14.0.0"' --rizin-include-path /usr/include/librz --targets SWIG
Traceback (most recent call last):
  File "/home/runner/work/rizin/rizin/rz-bindgen/build/../src/main.py", line 51, in <module>
    bindings.run()
  File "/home/runner/work/rizin/rizin/rz-bindgen/src/bindings.py", line 43, in run
    builders = [HeaderBuilder(name) for name in threaded_headers]
  File "/home/runner/work/rizin/rizin/rz-bindgen/src/bindings.py", line 43, in <listcomp>
    builders = [HeaderBuilder(name) for name in threaded_headers]
  File "/home/runner/work/rizin/rizin/rz-bindgen/src/cparser_header.py", line 101, in __init__
    assert os.path.exists(filename), f"File {filename} does not exist"
AssertionError: File /usr/include/librz/rz_util/ht_sp.h does not exist
[2/7] Generating plugin/swig_runtime with a custom command
ninja: build stopped: subcommand failed.

We should make it working with two branches too, like jsdec, for example - with dev and stable: rizinorg/rz-bindgen#66

@wargio
Copy link
Member

wargio commented Nov 25, 2024

i think it can be merged even without bindgen

@wargio
Copy link
Member

wargio commented Dec 2, 2024

given that everything is green besides bindgen, i think we can merge?

@XVilka
Copy link
Member Author

XVilka commented Dec 2, 2024

given that everything is green besides bindgen, i think we can merge?

No, lets fix bindgen first.

@XVilka
Copy link
Member Author

XVilka commented Dec 2, 2024

I created dev and stable branches in rz-bindgen, we need fix Rizin CI scripts to use corresponding branch and then we can merge.

We also need to fix rz-bindgen first as well: rizinorg/rz-bindgen#68

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants