Skip to content

Use vanilla Expat 2.7.4 sources#5179

Merged
matejk merged 3 commits intomainfrom
5178-expat-vanilla
Feb 2, 2026
Merged

Use vanilla Expat 2.7.4 sources#5179
matejk merged 3 commits intomainfrom
5178-expat-vanilla

Conversation

@matejk
Copy link
Copy Markdown
Contributor

@matejk matejk commented Feb 2, 2026

Summary

  • Use unpatched vanilla Expat sources instead of POCO-patched version (fixes Use vanilla Expat sources #5178)
  • Upgrade bundled Expat from 2.7.3 to 2.7.4 (fixes Upgrade bundled expat to 2.7.4 #5177)
  • Generate expat_config.h at build time using CMake's configure_file()
  • Platform-specific entropy source detection (arc4random_buf, getrandom, /dev/urandom)

Changes

  • Remove xmlparse.cpp (patched C++ version) and xmlparse_poco.patch
  • Remove POCO's RandomInputStream integration - use native entropy sources
  • Update both CMakeLists.txt and traditional Makefile
  • Expat is now self-contained (no Foundation dependency)

Test plan

  • Build succeeds on macOS
  • All 138 XML tests pass

@matejk matejk requested review from aleks-f and obiltschnig February 2, 2026 13:48
Copy link
Copy Markdown
Member

@obiltschnig obiltschnig left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me.

@matejk matejk merged commit 20c7ca6 into main Feb 2, 2026
100 checks passed
@matejk matejk deleted the 5178-expat-vanilla branch February 2, 2026 16:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Use vanilla Expat sources Upgrade bundled expat to 2.7.4

2 participants