From c3593a05c7273551b06a0dc1d6b1b88ded329b62 Mon Sep 17 00:00:00 2001 From: Andrew Afflitto Date: Fri, 19 Jun 2026 20:01:51 +0000 Subject: [PATCH 1/3] Revert "Use libmagic 5.46 on macOS CI builds to work around 5.47 regression (#723)" This reverts commit 52ae4bfc38a022d49d167a8d82794bebd5e4ed97. --- .github/actions/test-package/action.yml | 6 +----- docs/install/pypi.md | 2 +- docs/install/source.md | 14 +------------- ofrak_core/CHANGELOG.md | 1 + ofrak_core/version.py | 3 ++- 5 files changed, 6 insertions(+), 20 deletions(-) diff --git a/.github/actions/test-package/action.yml b/.github/actions/test-package/action.yml index cd0d0f8c1..2831070a1 100644 --- a/.github/actions/test-package/action.yml +++ b/.github/actions/test-package/action.yml @@ -98,11 +98,7 @@ runs: if: runner.os == 'macOS' shell: bash -euxo pipefail {0} run: | - brew install cmake - curl -O https://raw.githubusercontent.com/Homebrew/homebrew-core/b8292ac3475e57ca407db18dfeb131cc51116da2/Formula/lib/libmagic.rb - brew tap-new redballoonsecurity/ofrak-libmagic - cp libmagic.rb $(brew --repository)/Library/Taps/redballoonsecurity/homebrew-ofrak-libmagic/Formula/ - brew install redballoonsecurity/ofrak-libmagic/libmagic + brew install cmake libmagic - name: Install packages shell: bash -euxo pipefail {0} diff --git a/docs/install/pypi.md b/docs/install/pypi.md index 6ba7a8435..86a986b38 100644 --- a/docs/install/pypi.md +++ b/docs/install/pypi.md @@ -5,7 +5,7 @@ Install OFRAK quickly using pip for the simplest setup. ## Prerequisites - Python 3.9+ and pip -- cmake and libmagic 5.46 (macOS only - libmagic 5.47 has a known regression affecting ELF identification; see [source install docs](source.md#macos-libmagic-install) for installation steps) +- cmake and libmagic (macOS only - install via `brew install cmake libmagic`) ## Quick Install diff --git a/docs/install/source.md b/docs/install/source.md index c51e6589c..ba63218d8 100644 --- a/docs/install/source.md +++ b/docs/install/source.md @@ -7,7 +7,7 @@ Install OFRAK from source code for development or contribution. - Python 3.9+ and pip - Git with [Git LFS](https://git-lfs.github.com/) installed ([installation instructions](https://github.com/git-lfs/git-lfs#installing)) - make -- cmake and libmagic 5.46 (macOS only - libmagic 5.47 has a known regression affecting ELF identification; see [macOS libmagic install](#macos-libmagic-install) below) +- cmake and libmagic (macOS only - install via `brew install cmake libmagic`) ## Clone @@ -103,18 +103,6 @@ make requirements-pip make requirements-build-docker ``` -### macOS libmagic Install - -libmagic 5.47 contains a regression where ELF files are identified as `ELF` instead of `ELF ` (with trailing space), which breaks OFRAK's ELF identification. Install libmagic 5.46 via a custom Homebrew tap: - -```bash -brew install cmake -curl -O https://raw.githubusercontent.com/Homebrew/homebrew-core/b8292ac3475e57ca407db18dfeb131cc51116da2/Formula/lib/libmagic.rb -brew tap-new local/ofrak-libmagic -cp libmagic.rb $(brew --repository)/Library/Taps/local/homebrew-ofrak-libmagic/Formula/ -brew install local/ofrak-libmagic/libmagic -``` - ### keystone-engine Import Error on macOS (M1/M2) **Symptoms**: `ImportError: ERROR: fail to load the dynamic library` when importing or using OFRAK components that depend on `keystone-engine`. diff --git a/ofrak_core/CHANGELOG.md b/ofrak_core/CHANGELOG.md index c07c16c16..e2a597268 100644 --- a/ofrak_core/CHANGELOG.md +++ b/ofrak_core/CHANGELOG.md @@ -24,6 +24,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - Remove test dependencies that are already in the global `requirements-dev.txt` ([#695](https://github.com/redballoonsecurity/ofrak/pull/695)) ### Fixed +- Remove libmagic 5.46 pin as the pinned manifest is not compatible with latest brew and libmagic 5.48 fixes the original regression ([]()) - Fix thread-unsafe `os.chdir` in `ZipPacker` by passing `cwd` to subprocess ([#721](https://github.com/redballoonsecurity/ofrak/pull/721)) - Pin libmagic to 5.46 on macOS CI builds to work around a regression in 5.47 that breaks ELF identification; update documentation to reflect the libmagic 5.46 requirement ([#723](https://github.com/redballoonsecurity/ofrak/pull/723)) - Bump `aiohttp` to >=3.13.3 to address CVE-2025-69223 ([#693](https://github.com/redballoonsecurity/ofrak/pull/693)) diff --git a/ofrak_core/version.py b/ofrak_core/version.py index 34e578f6e..fa434bafc 100644 --- a/ofrak_core/version.py +++ b/ofrak_core/version.py @@ -1 +1,2 @@ -VERSION = "3.4.0rc14" +VERSION = "3.4.0rc15" +VERSION = "3.4.0rc7" From 986633fa9ed275e25fe4182f6a4c0196bacf0dd0 Mon Sep 17 00:00:00 2001 From: Andrew Afflitto Date: Fri, 19 Jun 2026 20:03:26 +0000 Subject: [PATCH 2/3] Fix typo --- ofrak_core/version.py | 1 - 1 file changed, 1 deletion(-) diff --git a/ofrak_core/version.py b/ofrak_core/version.py index fa434bafc..7038bdeb9 100644 --- a/ofrak_core/version.py +++ b/ofrak_core/version.py @@ -1,2 +1 @@ VERSION = "3.4.0rc15" -VERSION = "3.4.0rc7" From be6c3fbb1fd95f766ab05bc8aa99008c136642bc Mon Sep 17 00:00:00 2001 From: Andrew Afflitto Date: Fri, 19 Jun 2026 20:05:41 +0000 Subject: [PATCH 3/3] Update changelog --- ofrak_core/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ofrak_core/CHANGELOG.md b/ofrak_core/CHANGELOG.md index e2a597268..b085ecd43 100644 --- a/ofrak_core/CHANGELOG.md +++ b/ofrak_core/CHANGELOG.md @@ -24,7 +24,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - Remove test dependencies that are already in the global `requirements-dev.txt` ([#695](https://github.com/redballoonsecurity/ofrak/pull/695)) ### Fixed -- Remove libmagic 5.46 pin as the pinned manifest is not compatible with latest brew and libmagic 5.48 fixes the original regression ([]()) +- Remove libmagic 5.46 pin as the pinned manifest is not compatible with latest brew and libmagic 5.48 fixes the original regression ([#755](https://github.com/redballoonsecurity/ofrak/pull/755)) - Fix thread-unsafe `os.chdir` in `ZipPacker` by passing `cwd` to subprocess ([#721](https://github.com/redballoonsecurity/ofrak/pull/721)) - Pin libmagic to 5.46 on macOS CI builds to work around a regression in 5.47 that breaks ELF identification; update documentation to reflect the libmagic 5.46 requirement ([#723](https://github.com/redballoonsecurity/ofrak/pull/723)) - Bump `aiohttp` to >=3.13.3 to address CVE-2025-69223 ([#693](https://github.com/redballoonsecurity/ofrak/pull/693))