Commit 05555ab9 authored by J.C. Jones's avatar J.C. Jones
Browse files

Bug 1523175 - land NSS d0a282507d59 UPGRADE_NSS_RELEASE, r=me 

--HG--
extra : rebase_source : dd44102a2725f37040b0048499987421d1a11781
parent 1c81ba83

security/nss/TAG-INFO

+1 −1
Original line number Diff line number Diff line 
NSS_3_42_RTM
 
d0a282507d59

security/nss/automation/abi-check/expected-report-libnsssysinit.so.txt

+0 −8
Original line number Diff line number Diff line 
Function symbols changes summary: 2 Removed, 0 Added function symbols not referenced by debug info

Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referenced by debug info



2 Removed function symbols not referenced by debug info:



  _fini

  _init

security/nss/automation/abi-check/previous-nss-release

+1 −1
Original line number Diff line number Diff line 
NSS_3_41_BRANCH
 
NSS_3_42_BRANCH

security/nss/build.sh

+0 −4
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ fuzz=0 
fuzz_tls=0

fuzz_oss=0

no_local_nspr=0

sslkeylogfile=1



gyp_params=(--depth="$cwd" --generator-output=".")

ninja_params=()
@@ -104,7 +103,6 @@ while [ $# -gt 0 ]; do 
        --enable-fips) gyp_params+=(-Ddisable_fips=0) ;;

        --enable-libpkix) gyp_params+=(-Ddisable_libpkix=0) ;;

        --mozpkix-only) gyp_params+=(-Dmozpkix_only=1 -Ddisable_tests=1 -Dsign_libs=0) ;;

        --disable-keylog) sslkeylogfile=0 ;;

        *) show_help; exit 2 ;;

    esac

    shift
@@ -118,8 +116,6 @@ else 
    target=Debug

fi



gyp_params+=(-Denable_sslkeylogfile="$sslkeylogfile")



# Do special setup.

if [ "$fuzz" = 1 ]; then

    source "$cwd"/coreconf/fuzz.sh

security/nss/coreconf/coreconf.dep

+1 −0
Original line number Diff line number Diff line
@@ -10,3 +10,4 @@ 
 */



#error "Do not include this header file."