Michael Stahl
b483b1c6c0
Fixes CVE-2026-2781 Change-Id: I49936c56638dc6ce2bc5d7cf7d591586d4c5924a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200787 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Stephan Bergmann <stephan.bergmann@collabora.com> (cherry picked from commit e340bae8d3fb6b8d5ba4880e4853b975d48e8a8e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200812 Reviewed-by: Michael Stahl <michael.stahl@collabora.com> Tested-by: Jenkins
82 lines
3.2 KiB
Diff
82 lines
3.2 KiB
Diff
diff -ru a/nspr/configure b/nspr/configure
|
|
--- a/a/nspr/configure 2014-09-29 16:50:33.907375937 +0100
|
|
+++ b/b/nspr/configure 2014-09-29 16:51:59.213931947 +0100
|
|
@@ -6448,6 +6448,9 @@
|
|
AS='$(CC) -x assembler-with-cpp'
|
|
CFLAGS="$CFLAGS -Wall -fno-common"
|
|
case "${target_cpu}" in
|
|
+ aarch64)
|
|
+ CPU_ARCH=arm64
|
|
+ ;;
|
|
arm*)
|
|
CPU_ARCH=arm
|
|
;;
|
|
@@ -7221,7 +7221,7 @@
|
|
fi
|
|
|
|
DSO_CFLAGS=-fPIC
|
|
- DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @executable_path/$@ -headerpad_max_install_names'
|
|
+ DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @__________________________________________________OOO/$@ -headerpad_max_install_names'
|
|
_OPTIMIZE_FLAGS=-O2
|
|
MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
|
|
STRIP="$STRIP -x -S"
|
|
diff -ru a/nss/coreconf/Darwin.mk b/nss/coreconf/Darwin.mk
|
|
--- a/a/nss/coreconf/Darwin.mk 2014-09-29 16:50:22.992304799 +0100
|
|
+++ b/b/nss/coreconf/Darwin.mk 2014-09-29 16:51:59.214931953 +0100
|
|
@@ -20,6 +20,7 @@
|
|
CPU_ARCH := $(shell uname -p)
|
|
endif
|
|
|
|
+ifeq (,$(findstring -arch ,$(CC)))
|
|
ifeq (,$(filter-out i%86 x86_64,$(CPU_ARCH)))
|
|
ifdef USE_64
|
|
CC += -arch x86_64
|
|
@@ -46,6 +47,7 @@
|
|
else
|
|
$(error Unknown CPU architecture)
|
|
endif
|
|
+endif # findstring -arch
|
|
|
|
ifeq (,$(filter-out ppc ppc64,$(CPU_ARCH)))
|
|
ifneq ($(NSS_DISABLE_CRYPTO_VSX),0)
|
|
@@ -54,12 +56,16 @@
|
|
endif
|
|
|
|
ifneq (,$(MACOS_SDK_DIR))
|
|
+ CLANG_VERSION_FULL := $(shell $(CC) -v 2>&1 | grep "clang version" | sed -e "s/^.*clang version[ ]*//" | awk '{ print $$1 }')
|
|
GCC_VERSION_FULL := $(shell $(CC) -dumpversion)
|
|
GCC_VERSION_MAJOR := $(shell echo $(GCC_VERSION_FULL) | awk -F. '{ print $$1 }')
|
|
GCC_VERSION_MINOR := $(shell echo $(GCC_VERSION_FULL) | awk -F. '{ print $$2 }')
|
|
GCC_VERSION = $(GCC_VERSION_MAJOR).$(GCC_VERSION_MINOR)
|
|
+ ifneq (,$(CLANG_VERSION_FULL))
|
|
+ DARWIN_SDK_CFLAGS = -isysroot $(MACOS_SDK_DIR)
|
|
+ DARWIN_SDK_SHLIBFLAGS = -isysroot $(MACOS_SDK_DIR)
|
|
|
|
- ifeq (,$(filter-out 2 3,$(GCC_VERSION_MAJOR)))
|
|
+ else ifeq (,$(filter-out 2 3,$(GCC_VERSION_MAJOR)))
|
|
# GCC <= 3
|
|
DARWIN_SDK_FRAMEWORKS = -F$(MACOS_SDK_DIR)/System/Library/Frameworks
|
|
ifneq (,$(shell find $(MACOS_SDK_DIR)/Library/Frameworks -maxdepth 0))
|
|
@@ -111,7 +113,7 @@
|
|
# May override this with different compatibility and current version numbers.
|
|
DARWIN_DYLIB_VERSIONS = -compatibility_version 1 -current_version 1
|
|
# May override this with -bundle to create a loadable module.
|
|
-DSO_LDOPTS = -dynamiclib $(DARWIN_DYLIB_VERSIONS) -install_name @executable_path/$(notdir $@) -headerpad_max_install_names
|
|
+DSO_LDOPTS = -dynamiclib $(DARWIN_DYLIB_VERSIONS) -install_name @__________________________________________________OOO/$(notdir $@) -headerpad_max_install_names
|
|
|
|
ifdef USE_GCOV
|
|
OS_CFLAGS += --coverage
|
|
diff -ru a/nss/Makefile b/nss/Makefile
|
|
--- a/a/nss/Makefile 2014-09-29 16:50:22.990304789 +0100
|
|
+++ b/b/nss/Makefile 2014-09-29 16:51:59.207931908 +0100
|
|
@@ -81,6 +81,9 @@
|
|
ifdef USE_64
|
|
NSPR_CONFIGURE_OPTS += --enable-64bit
|
|
endif
|
|
+ifdef MACOS_SDK_DIR
|
|
+NSPR_CONFIGURE_OPTS += --with-macos-sdk=$(MACOS_SDK_DIR)
|
|
+endif
|
|
ifdef USE_DEBUG_RTL
|
|
NSPR_CONFIGURE_OPTS += --enable-debug-rtl
|
|
endif
|