diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2021-10-19 15:17:39 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2021-12-06 11:24:17 +0100 |
| commit | f59e6ad34a2665f1210938781d39e2d854e5f38b (patch) | |
| tree | 144d89056ca027df0b14f108c8fb2e5fca28b6a6 /external/nss/nss-ios.patch | |
| parent | 740e89232eb5ffe50a6b08dd9136a5c176092b2f (diff) | |
nss: upgrade to release 3.73co-6.4-51
Fixes:
CVE-2021-43527 Memory corruption via DER-encoded DSA and RSA-PSS signatures
Includes: nss: upgrade to release 3.71
* external/nss/nss.getopt.patch.0: fixed upstream
* external/nss/nss-win-arm64.patch: fixed upstream
* external/nss/nss_macosx.patch: one hunk was fixed upstream
Conflicts:
download.lst
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126218
Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
(cherry picked from commit c8e21d246bcb4289cb25c82be440cd07b7418436)
Change-Id: I5c3f169c57fc2763029b07ad7e325b2f53b7e28f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126235
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'external/nss/nss-ios.patch')
| -rw-r--r-- | external/nss/nss-ios.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/external/nss/nss-ios.patch b/external/nss/nss-ios.patch index 65115a96e806..da09b8d8edf8 100644 --- a/external/nss/nss-ios.patch +++ b/external/nss/nss-ios.patch @@ -193,9 +193,9 @@ +if test $1 = "arm64-apple-darwin"; then echo $1; exit; fi +if test $1 = "aarch64-apple-darwin"; then echo $1; exit; fi + - # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). - # Here we must recognize all the valid KERNEL-OS combinations. - maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` + # Split fields of configuration type + # shellcheck disable=SC2162 + IFS="-" read field1 field2 field3 field4 <<EOF --- a/a/nspr/config/autoconf.mk.in +++ a/a/nspr/config/autoconf.mk.in @@ -67,7 +67,7 @@ |