History log of /AOO42X/main/nss/nss_macosx.patch (Results 1 – 10 of 10)
Revision (<<< Hide revision tags) (Show revision tags >>>) Date Author Comments
# e957c701 11-Jun-2026 Jim Jagielski <jimjag@gmail.com>

nss: set CPU_ARCH=aarch64 on Apple Silicon so freebl picks 64-bit HACL

The freebl crypto core fails to link libfreebl3.dylib on arm64:

Undefined symbols for architecture arm64:
"_Hacl_Pol

nss: set CPU_ARCH=aarch64 on Apple Silicon so freebl picks 64-bit HACL

The freebl crypto core fails to link libfreebl3.dylib on arm64:

Undefined symbols for architecture arm64:
"_Hacl_Poly1305_64_finish", referenced from: _Poly1305Do in chacha20poly1305.o
"_Hacl_Poly1305_64_init", ... (and _mk_state/_update)

Two arch decisions disagree. chacha20poly1305.c selects the 64-bit Poly1305
API when (HAVE_INT128_SUPPORT && (NSS_X86_OR_X64 || __aarch64__)); __aarch64__
is a compiler macro always defined on arm64, so it calls Hacl_Poly1305_64_*.
But freebl's Makefile only *compiles* Hacl_Poly1305_64.c when CPU_ARCH=aarch64,
and coreconf/Darwin.mk sets CPU_ARCH from 'uname -p', which on Apple Silicon
is 'arm' (not 'aarch64'). The 'arm' branch did nothing, so the 32-bit source
was built and the 64-bit references went unresolved.

Override CPU_ARCH=aarch64 in Darwin.mk's arm branch (added to nss_macosx.patch).
This makes freebl build the 64-bit Hacl_Poly1305_64.c (and the faster
curve25519_64.c/Hacl_Curve25519.c), matching what the C code already assumes.
No -arch flag is added: the build is native arm64.

Note this is a different token than the NSPR configure fix (f1b9c24444), which
uses 'arm64' (Apple's -arch linker name); NSS coreconf/freebl use 'aarch64'.
The only CPU_ARCH==arm consumer in NSS is freebl/Makefile:239, which is
Linux-gated (32-bit ARM asm) and unreachable on Darwin, so the override is safe.

Verified the full patch chain (nss.patch, nss_sizes.patch, nss_macosx.patch)
applies in order and yields CPU_ARCH=aarch64 -> Hacl_Poly1305_64.c selected.

show more ...


# c1ed73d1 11-Jun-2026 Jim Jagielski <jimjag@gmail.com>

nss: build NSPR for arm64 on Apple Silicon

NSPR 4.20's bundled config.guess predates Apple Silicon and reports the
build triple as arm-apple-darwin (bare 'arm'). NSPR's configure then maps
target_cp

nss: build NSPR for arm64 on Apple Silicon

NSPR 4.20's bundled config.guess predates Apple Silicon and reports the
build triple as arm-apple-darwin (bare 'arm'). NSPR's configure then maps
target_cpu=arm to CPU_ARCH=arm and appends '-arch arm' to CC, so ld picks
the nonexistent 32-bit armv4t target and the link fails:

ld: unknown -arch name: armv4t

NSS runs its own configure and ignores the tree-wide ARCH_FLAGS=-arch arm64,
so this has to be fixed in NSPR's configure directly. Add a hunk to
nss_macosx.patch that maps ARM on Darwin to the correct macOS arch name
arm64 (both the bare 'arm' from the old config.guess and a real
aarch64/arm64 triple).

Verified the augmented patch chain (nss.patch, nss_sizes.patch,
nss_macosx.patch) applies cleanly in order against pristine nss-3.39 and
yields CPU_ARCH=arm64 in nspr/configure.

show more ...


Revision tags: AOO420-Dev5-m5, AOO420-Dev4-m4, AOO420-Dev3-m3
# 5ec3c564 29-Sep-2020 Don Lewis <truckman@apache.org>

Upgrade nss to nss-3.39-with-nspr-4.20

(cherry picked from commit 13effbfbfe1b52a6a38b08a28bfd6972ff86c6ac)
Revision tags: 420-Dev2-m2
# 282fc96f 18-Jul-2016 truckman <truckman@13f79535-47bb-0310-9956-ffa450edef68>

#i126891# bundled nss-3.14.4-with-nspr-4.9.5 has many security
vulnerabilities

Upgrade bundled nss-3.14.4-with-nspr-4.9.5 to nss-3.25-with-nspr-4.12.
These CVEs have been fixed since nss-3.14.4 was

#i126891# bundled nss-3.14.4-with-nspr-4.9.5 has many security
vulnerabilities

Upgrade bundled nss-3.14.4-with-nspr-4.9.5 to nss-3.25-with-nspr-4.12.
These CVEs have been fixed since nss-3.14.4 was released:
CVE-2014-1533
CVE-2014-1534
CVE-2014-1536
CVE-2014-1537
CVE-2014-1540
CVE-2014-1541
CVE-2014-1542
CVE-2014-1543
CVE-2014-1544
CVE-2014-1545
CVE-2014-1547
CVE-2014-1548
CVE-2014-1549
CVE-2014-1550
CVE-2014-1551
CVE-2014-1552
CVE-2014-1555
CVE-2014-1556
CVE-2014-1557
CVE-2014-1558
CVE-2014-1559
CVE-2014-1560
CVE-2014-1561
CVE-2014-1568
CVE-2014-1569
CVE-2014-1587
CVE-2014-1588
CVE-2014-1589
CVE-2014-1590
CVE-2014-1591
CVE-2014-1592
CVE-2014-1593
CVE-2014-1594
CVE-2014-1595
CVE-2015-4513
CVE-2015-4514
CVE-2015-4515
CVE-2015-4518
CVE-2015-7181
CVE-2015-7182
CVE-2015-7183
CVE-2015-7185
CVE-2015-7186
CVE-2015-7187
CVE-2015-7188
CVE-2015-7189
CVE-2015-7190
CVE-2015-7191
CVE-2015-7192
CVE-2015-7193
CVE-2015-7194
CVE-2015-7195
CVE-2015-7196
CVE-2015-7197
CVE-2015-7198
CVE-2015-7199
CVE-2015-7200
CVE-2015-7575
CVE-2016-1938
CVE-2016-1950
CVE-2016-1978
CVE-2016-1979
Whether any of these actually impacts OpenOffice is not known.

Rebase the nss patches to the new version and move any non-conflicting
changes from the platform-specific patch files to nss.patch. The
nss.patch.mingw file was already out of date and was not updated.

Disable nss tests which require at least partial c++11 (-stdc++0x)
support because they use nullptr. This reportedly requires at least
gcc 4.6, which is newer that some of what is provided by some of
our supported platforms.

Fix build issue on FreeBSD 11.0 and other platforms with picky compilers.
The result of shifting a negative signed value is undefined in C and C++.
The generated code does the expected thing in my experience and this
construct just generates a compiler warning, but
nss-3.24/nss/lib/zlib/inflate.c is compiled with -Werror, which breaks
the build. Fix the issue by doing the calculations using the equivalent
unsigned type. The function return should probably also be changed, but
that is more invasive.

Patch pratom.h to no include <intrin.H> inside an extern "C" block
because it breaks the build on Windows.

Recent versions of nss include a new shared library, libfreeblpriv3.so,
so package it so that it gets installed.

Temporarily change nss download URL from https to http to avoid breaking
bootstrap on the buildbots.



git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1753163 13f79535-47bb-0310-9956-ffa450edef68

show more ...


# a21e1734 18-Jul-2016 truckman <truckman@13f79535-47bb-0310-9956-ffa450edef68>

Revert previous change, mangled commit message.



git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1753162 13f79535-47bb-0310-9956-ffa450edef68
# 6a694403 18-Jul-2016 truckman <truckman@13f79535-47bb-0310-9956-ffa450edef68>

Ps-3.14.4-with-nspr-4.9.5 has many security
vulnerabilities

Upgrade bundled nss-3.14.4-with-nspr-4.9.5 to nss-3.25-with-nspr-4.12.
These CVEs have been fixed since nss-3.14.4 was released:
CVE-2

Ps-3.14.4-with-nspr-4.9.5 has many security
vulnerabilities

Upgrade bundled nss-3.14.4-with-nspr-4.9.5 to nss-3.25-with-nspr-4.12.
These CVEs have been fixed since nss-3.14.4 was released:
CVE-2014-1533
CVE-2014-1534
CVE-2014-1536
CVE-2014-1537
CVE-2014-1540
CVE-2014-1541
CVE-2014-1542
CVE-2014-1543
CVE-2014-1544
CVE-2014-1545
CVE-2014-1547
CVE-2014-1548
CVE-2014-1549
CVE-2014-1550
CVE-2014-1551
CVE-2014-1552
CVE-2014-1555
CVE-2014-1556
CVE-2014-1557
CVE-2014-1558
CVE-2014-1559
CVE-2014-1560
CVE-2014-1561
CVE-2014-1568
CVE-2014-1569
CVE-2014-1587
CVE-2014-1588
CVE-2014-1589
CVE-2014-1590
CVE-2014-1591
CVE-2014-1592
CVE-2014-1593
CVE-2014-1594
CVE-2014-1595
CVE-2015-4513
CVE-2015-4514
CVE-2015-4515
CVE-2015-4518
CVE-2015-7181
CVE-2015-7182
CVE-2015-7183
CVE-2015-7185
CVE-2015-7186
CVE-2015-7187
CVE-2015-7188
CVE-2015-7189
CVE-2015-7190
CVE-2015-7191
CVE-2015-7192
CVE-2015-7193
CVE-2015-7194
CVE-2015-7195
CVE-2015-7196
CVE-2015-7197
CVE-2015-7198
CVE-2015-7199
CVE-2015-7200
CVE-2015-7575
CVE-2016-1938
CVE-2016-1950
CVE-2016-1978
CVE-2016-1979
Whether any of these actually impacts OpenOffice is not known.

Rebase the nss patches to the new version and move any non-conflicting
changes from the platform-specific patch files to nss.patch. The
nss.patch.mingw file was already out of date and was not updated.

Disable nss tests which require at least partial c++11 (-stdc++0x)
support because they use nullptr. This reportedly requires at least
gcc 4.6, which is newer that some of what is provided by some of
our supported platforms.

Fix build issue on FreeBSD 11.0 and other platforms with picky compilers.
The result of shifting a negative signed value is undefined in C and C++.
The generated code does the expected thing in my experience and this
construct just generates a compiler warning, but
nss-3.24/nss/lib/zlib/inflate.c is compiled with -Werror, which breaks
the build. Fix the issue by doing the calculations using the equivalent
unsigned type. The function return should probably also be changed, but
that is more invasive.

Patch pratom.h to no include <intrin.H> inside an extern "C" block
because it breaks the build on Windows.

Recent versions of nss include a new shared library, libfreeblpriv3.so,
so package it so that it gets installed.

Temporarily change nss download URL from https to http to avoid breaking
bootstrap on the buildbots.



git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1753148 13f79535-47bb-0310-9956-ffa450edef68

show more ...


# 5be78d22 11-Nov-2013 Steve Yin <steve_y@apache.org>

Synchronized with the trunk to solve the build issue (removing moz)

git-svn-id: https://svn.apache.org/repos/asf/openoffice/branches/ia2@1540658 13f79535-47bb-0310-9956-ffa450edef68
# e094edcf 07-Nov-2013 Herbert Dürr <hdu@apache.org>

#i123637# fix nss build for OSX<10.5 targets on newer OSX hosts

change the check from host OS version to the OSX deployment target


git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@153

#i123637# fix nss build for OSX<10.5 targets on newer OSX hosts

change the check from host OS version to the OSX deployment target


git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1539632 13f79535-47bb-0310-9956-ffa450edef68

show more ...


# c38ced1b 07-Nov-2013 Herbert Dürr <hdu@apache.org>

#i123637# update nss libraries to 3.14.4

Patch by: Pedro Giffuni <pfg@apache.org>


git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1539631 13f79535-47bb-0310-9956-ffa450edef68
# cdf0e10c 16-Aug-2011 rcweir <rcweir@unknown>

Initial import of the old OOo hg repository tip revision.

.../trunk/main is a copy of (currently tip-most)
http://hg.services.openoffice.org/OOO340/rev/c904c1944462

.../trunk/extras/l10n is a co

Initial import of the old OOo hg repository tip revision.

.../trunk/main is a copy of (currently tip-most)
http://hg.services.openoffice.org/OOO340/rev/c904c1944462

.../trunk/extras/l10n is a copy of (currently tip-most)
http://hg.services.openoffice.org/master_l10n/OOO340/rev/af6bc9467af5

Note that the following files with line-end and/or encoding anomalies were left out (they will need to be to be checked in separately):

/ooo/trunk/core/dictionaries/de_DE/README_hyph_de_DE.txt
/ooo/trunk/core/dictionaries/de_CH/README_hyph_de_CH.txt
/ooo/trunk/core/dictionaries/de_AT/README_hyph_de_AT.txt
/ooo/trunk/core/gettext/gettext-0.18.1.1.patch
/ooo/trunk/core/apache-commons/patches/codec.patch
/ooo/trunk/core/libcroco/libcroco-0.6.2.patch
/ooo/trunk/core/testautomation/writer/optional/input/import/mactext.txt
/ooo/trunk/core/graphite/graphite-2.3.1.patch
/ooo/trunk/core/hwpfilter/source/hwpeq.cpp
/ooo/trunk/core/solenv/bin/cwstouched.pl
/ooo/trunk/core/readlicense_oo/html/THIRDPARTYLICENSEREADME.html
/ooo/trunk/core/writerfilter/source/doctok/escher.html
/ooo/trunk/core/writerfilter/source/odiapi/qname/resource/office2003/WordprocessingML Schemas/xsdlib.xsd
/ooo/trunk/core/writerfilter/source/odiapi/qname/resource/office2003/WordprocessingML Schemas/wordnetaux.xsd
/ooo/trunk/core/filter/source/xslt/odf2xhtml/export/common/body.xsl
/ooo/trunk/core/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl

Also: Repository.mk from the l10n toplevel


git-svn-id: https://svn.apache.org/repos/asf/incubator/ooo/trunk@1162288 13f79535-47bb-0310-9956-ffa450edef68

show more ...