diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-04-20 22:19:45 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-04-21 14:15:17 +0200 |
| commit | 0cdf41419af854acccee0f819d4add7e8cafb7dc (patch) | |
| tree | 2c759b38c2834e288c753632120f7b95bb3c756a /external/nss/ExternalProject_nss.mk | |
| parent | 87dc77ba52b003a89892e48346e140c47a1ebbb6 (diff) | |
nss: upgrade to release 3.29.5
- fixes CVE-2017-5461 and CVE-2017-5462
- drop ubsan-alignment.patch.0, there is apparently now some
NO_SANITIZE_ALIGNMENT macro upstream to get this effect
- drop some hunks to prevent hard-coding CC/CCC vars, upstream now
respects environment vars (but doesn't quote them...)
- drop first hunk of ubsan.patch.0, fixed upstream
- drop hunk for gtest-internal.h, header looks much newer anyway
Change-Id: I5c484c02c1235e185af1ef5166b069303d3378e1
Reviewed-on: https://gerrit.libreoffice.org/36756
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'external/nss/ExternalProject_nss.mk')
| -rw-r--r-- | external/nss/ExternalProject_nss.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk index 57a78b4a850c..f555975ee7fa 100644 --- a/external/nss/ExternalProject_nss.mk +++ b/external/nss/ExternalProject_nss.mk @@ -56,6 +56,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject $(MAKE) -j1 AR="$(AR)" \ RANLIB="$(RANLIB)" \ NMEDIT="$(NM)edit" \ + CCC="$(CXX)" \ $(if $(CROSS_COMPILING),NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)") \ nss_build_all \ && rm -f $(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib/*.a \ |