Changes in trunk

aaf4fffac3204386b10ccf29c83fe901258f7398 - Harden the SDK analysis and future proof (esp for the Apple Silicon case)

Tue, 09 Jun 2026 21:00:00 +0000

Harden the SDK analysis and future proof (esp for the Apple Silicon case)Later versions of macOS do not provide a real Python, so be more agressive List of files: /trunk/main/configure.ac

286601bfa3558489be642e6e2d8000cacd1bfdb8 - Merge branch 'bump-openssl-3.0.20' into trunk

Tue, 09 Jun 2026 11:00:00 +0000

Merge branch 'bump-openssl-3.0.20' into trunk List of files: /trunk/main/external_deps.lst/trunk/main/openssl/makefile.mk/trunk/main/openssl/openssl.patch/trunk/main/openssl/opensslunx.patch

ad26e2052feb759f8a61fc826e7daf97b53fff59 - commit LLM drafted review/assessment of the differneces between trunk (45x) and AOO42X for potential backports and general knowledge.

Mon, 08 Jun 2026 18:00:00 +0000

commit LLM drafted review/assessment of the differneces between trunk (45x) and AOO42X for potential backports and general knowledge. List of files: /trunk/AOO-trunk.md

9d1a529d5e69cdb76097a23891d8b0f9baa85789 - Fix crash, uninitialized-return, and buffer bugs in update check and macOS x86 bridge

Mon, 08 Jun 2026 09:00:00 +0000

Fix crash, uninitialized-return, and buffer bugs in update check and macOS x86 bridgeupdateprotocol.cxx: guard XNodeList dereferences so a swallowedXPathException no longer leaves a null reference to be dereferenced(crash on malformed/hostile update descriptors); clear the list beforethe relnote query so a thrown exception can't leave us iterating theprevious (sources) node list.cpp2uno.cxx: the queryInterface fast-path guard used 'break', whichexited the switch and skipped the default case, returning anuninitialized typelib_TypeClass. Guard the block with'if (bHasHiddenReturn)' instead so control falls through to default andeRet is always assigned.updatecheck.cxx (getImageFromFileName): use bitwise '|' instead oflogical '||' when combining osl_Process flags; rewrite the trailingCR/LF trim so it never reads/writes before the start of the buffer(e.g. when osl_readFile returns 0 bytes).Co-Authored-By: Claude Opus 4.8 List of files: /trunk/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/cpp2uno.cxx/trunk/main/extensions/source/update/check/updatecheck.cxx/trunk/main/extensions/source/update/check/updateprotocol.cxx

f92bdc34bd4261eed3e87e904069839e706cc272 - Also protect AOO41X and AOO42X (#482)

Sun, 07 Jun 2026 16:00:00 +0000

Also protect AOO41X and AOO42X (#482)They are our release branches and thus they are worth the extra protection. List of files: /trunk/.asf.yaml

11db77d7e757cdd791de32813a7df4993156e8e1 - Fix the macOS x86 bridge. Previous version was fragile.

Fri, 05 Jun 2026 14:00:00 +0000

Fix the macOS x86 bridge. Previous version was fragile. List of files: /trunk/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/uno2cpp.cxx

5e139d9fe42a654147771da4118aea6285c03168 - Native Apple Silicon (arm64) support and bundled Python 3.10 baseline

Fri, 05 Jun 2026 13:00:00 +0000

Native Apple Silicon (arm64) support and bundled Python 3.10 baselineSquashed combination of two efforts, applied onto trunk as a singlecommit. (trunk is not intended to be buildable; this lands the work forreference/integration.)=== Apple Silicon (macOS arm64 / AAPCS64) ===Build plumbing: set_soenv.in + source_soenv.sh arm64 Darwin branch(CPU=R, CPUNAME=AARCH64, OUTPATH=unxmaccr); new solenv/inc/unxmaccr.mkand unx.mk dispatch; macro.hxx AARCH64 arch string; osarch.pm +gbuild/platform/macosx.mk arch entries; configure.ac arm64 hostdetection, Big Sur+ version math, and 11.0 deployment target.C++/UNO bridge (new s5abi_macosx_aarch64): abi.cxx/hxx AAPCS64 classifier(HFA + <=16B/>16B size rules), uno2cpp + call.s AArch64 trampoline,cpp2uno incoming path + privateSnippetExecutor + AArch64 codeSnippetcodegen (x8 indirect-result handled, not displacing this/x0), share.hxx__cxa_exception reserved-member alignment fix; Library_cpp_uno.mk +makefile.mk wiring. sal/osl/unx/interlck.c arm64 atomics (__sync_* ->LSE).Externals: openssl darwin64-arm64-cc; icu arm64 little-endian. (NSS 3.39deferred -- too old for arm64.)Packaging/JVM: Info.plist LSMinimumSystemVersion 11.0; installerdownload.pm/worker.pm/update_module_ignore_lists.pl recognize unxmaccr;jvmfwk modern macOS JDK discovery (/Library/Java/JavaVirtualMachines +Contents/Home probe).The ABI/atomics/trampoline/JDK-discovery code was unit-tested nativelyon an arm64 macOS host; a full AOO build (and bridgetest) was not run.Code-signing infra (mandatory for arm64 distribution) is NOT included.=== Bundled Python 2.7.18 -> 3.10 baseline (Unix/macOS first) ===pyversion.mk/_dmake.mk -> 3.10.18 (single version knob). Shipped .pyfixes: imp -> types.ModuleType (pythonscript.py, pythonloader.py) andfile() -> open(); mailmerge.py Py3 email module imports + encoders.Windows Python 3 build and the makefile.mk/d.lst/configure.ac Py3 workare NOT included (separate, larger effort).NOTE: macOS 11 becomes the minimum supported version. Python 3.10 isEOL 2026-10; the version knob allows a later bump. List of files: /trunk/main/bridges/Library_cpp_uno.mk/trunk/main/bridges/source/cpp_uno/s5abi_macosx_aarch64/abi.cxx/trunk/main/bridges/source/cpp_uno/s5abi_macosx_aarch64/abi.hxx/trunk/main/bridges/source/cpp_uno/s5abi_macosx_aarch64/call.s/trunk/main/bridges/source/cpp_uno/s5abi_macosx_aarch64/cpp2uno.cxx/trunk/main/bridges/source/cpp_uno/s5abi_macosx_aarch64/except.cxx/trunk/main/bridges/source/cpp_uno/s5abi_macosx_aarch64/makefile.mk/trunk/main/bridges/source/cpp_uno/s5abi_macosx_aarch64/share.hxx/trunk/main/bridges/source/cpp_uno/s5abi_macosx_aarch64/uno2cpp.cxx/trunk/main/icu/icu4c-4_2_1-src.patch/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/util.cxx/trunk/main/python/pyversion.mk/trunk/main/python/pyversion_dmake.mk/trunk/main/pyuno/source/loader/pythonloader.py/trunk/main/sal/osl/unx/interlck.c/trunk/main/sal/rtl/source/macro.hxx/trunk/main/scripting/source/pyprov/mailmerge.py/trunk/main/scripting/source/pyprov/pythonscript.py/trunk/main/set_soenv.in/trunk/main/setup_native/source/mac/Info.plist.langpack/trunk/main/solenv/bin/modules/installer/download.pm/trunk/main/solenv/bin/modules/installer/worker.pm/trunk/main/solenv/bin/modules/osarch.pm/trunk/main/solenv/bin/update_module_ignore_lists.pl/trunk/main/solenv/gbuild/platform/macosx.mk/trunk/main/solenv/inc/unx.mk/trunk/main/solenv/inc/unxmaccr.mk/trunk/main/source_soenv.sh/trunk/main/sysui/desktop/macosx/Info.plist