This is an automated email from the ASF dual-hosted git repository. jimjag pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 6ebbb1999180569847be721fe8edf8f2aacfcb41 Author: Jim Jagielski <[email protected]> AuthorDate: Mon Aug 3 13:01:47 2026 -0400 Fix two macOS installer-packaging bugs - postprocess/packcomponents/makefile.mk: - solenv/bin/modules/installer/parameter.pm: --- main/postprocess/packcomponents/makefile.mk | 2 +- main/solenv/bin/modules/installer/parameter.pm | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/main/postprocess/packcomponents/makefile.mk b/main/postprocess/packcomponents/makefile.mk index 366e9a8743..bb262f937c 100644 --- a/main/postprocess/packcomponents/makefile.mk +++ b/main/postprocess/packcomponents/makefile.mk @@ -315,7 +315,7 @@ my_components += \ component/avmedia/source/macavf/avmediaMacAVF \ component/fpicker/source/aqua/fps_aqua \ component/lingucomponent/source/spellcheck/macosxspell/MacOSXSpell \ - macab1 \ + component/connectivity/source/drivers/macab/macab1 \ macbe1 .END diff --git a/main/solenv/bin/modules/installer/parameter.pm b/main/solenv/bin/modules/installer/parameter.pm index 820ec747df..419e5d9156 100644 --- a/main/solenv/bin/modules/installer/parameter.pm +++ b/main/solenv/bin/modules/installer/parameter.pm @@ -420,6 +420,15 @@ sub setglobalvariables if ( $ENV{'TMP'} ) { $installer::globals::temppath = $ENV{'TMP'}; } elsif ( $ENV{'TEMP'} ) { $installer::globals::temppath = $ENV{'TEMP'}; } elsif ( $ENV{'TMPDIR'} ) { $installer::globals::temppath = $ENV{'TMPDIR'}; } + # On macOS, $TMPDIR (like /tmp) lives under /var, which is itself a + # symlink to /private/var. Archive::Zip's extraction safety check + # refuses to extract through a symlinked path component, so resolve + # it here rather than let that fail deep inside packaging. + if ( -e $installer::globals::temppath ) + { + my $resolved = Cwd::realpath($installer::globals::temppath); + $installer::globals::temppath = $resolved if ( $resolved ); + } $installer::globals::temppath =~ s/\Q$installer::globals::separator\E\s*$//; # removing ending slashes and backslashes $installer::globals::temppath = $installer::globals::temppath . $installer::globals::separator . $installer::globals::globaltempdirname; installer::systemactions::create_directory_with_privileges($installer::globals::temppath, "777");
