1420407 - Land NSPR 4.18 into FF 59

Status: RESOLVED FIXED

(Core :: Security: PSM, enhancement, P1)

Description

[Kai Engert (:KaiE:)]

FF 59 should use NSPR 4.18 to pick up the cleanup from bug 1404061.

Hopefully we'll get a fix for bug 1399746.

Comment 1

[Kai Engert (:KaiE:)]

Attachment: 1420407-no-patches.txt

At the time we uplift the new NSPR to m-i, we'll need to remove the old locally applied patches.

Comment 2

[Kai Engert (:KaiE:)]

try build for windows with tests:
https://treeherder.mozilla.org/#/jobs?repo=try&revision=fdc15e9bf6ea5c510ddf3526613281c5c01fe45f

try build for linux/mac without tests:
https://treeherder.mozilla.org/#/jobs?repo=try&revision=721bf0ff59892c70842bf2ca7e044a6f89939c75

Comment 3

[Dragana Damjanovic [:dragana]]

Thank you!

Comment 4

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/mozilla-inbound/rev/f7f814a5a957
land NSPR 4.18.1 beta1 (r=me) and remove local NSPR patch that's no longer necessary (r=dragana)

Comment 5

[Noemi Erli[:noemi_erli]]

Backed out changeset f7f814a5a957 (bug 1420407) for statis failures S in config/external/nspr/pr/target r=backout on a CLOSED TREE

https://hg.mozilla.org/integration/mozilla-inbound/rev/b97b62055f10362a4791d684f42c9e71ea202d14

https://treeherder.mozilla.org/#/jobs?repo=mozilla-inbound&revision=f7f814a5a9577b545036f9be69aeb5293d8feda0&filter-classifiedState=unclassified&filter-resultStatus=testfailed&filter-resultStatus=busted&filter-resultStatus=exception

Comment 6

[Kai Engert (:KaiE:)]

20:16:36     INFO -  mozmake.EXE[4]: Entering directory 'z:/build/build/src/obj-firefox/config/external/nspr/pr'
20:16:36     INFO -  z:/build/build/src/sccache2/sccache.exe z:/build/build/src/clang/bin/clang.exe --driver-mode=cl -Xclang -std=gnu99 -Fow95thred.obj -c -DNDEBUG=1 -DTRIMMED=1 -D_NSPR_BUILD_ -DWIN32 -DXP_PC -D_PR_GLOBAL_THREADS_ONLY -DWIN95 -UWINNT -D_AMD64_ -Iz:/build/build/src/config/external/nspr/pr -Iz:/build/build/src/obj-firefox/config/external/nspr/pr -Iz:/build/build/src/config/external/nspr -Iz:/build/build/src/nsprpub/pr/include -Iz:/build/build/src/nsprpub/pr/include/private -Iz:/build/build/src/obj-firefox/dist/include -Iz:/build/build/src/obj-firefox/dist/include/nspr -Iz:/build/build/src/obj-firefox/dist/include/nss -MD -FI z:/build/build/src/obj-firefox/mozilla-config.h -DMOZILLA_CLIENT -Qunused-arguments -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -Qunused-arguments -TC -nologo -wd4091 -D_HAS_EXCEPTIONS=0 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -W3 -Gy -Zc:inline -Gw -wd4244 -wd4267 -Wno-unknown-pragmas -Wno-ignored-pragmas -Wno-deprecated-declarations -Wno-invalid-noreturn -we4553 -Z7 -Xclang -load -Xclang z:/build/build/src/obj-firefox/build/clang-plugin/clang-plugin.dll -Xclang -add-plugin -Xclang moz-check -O1 -Oi -Oy-  -deps.deps/w95thred.obj.pp    z:/build/build/src/nsprpub/pr/src/md/windows/w95thred.c
20:16:36     INFO -  clang.exe: warning: unknown argument ignored in clang-cl: '-deps.deps/w95thred.obj.pp' [-Wunknown-argument]
20:16:36     INFO -  z:/build/build/src/nsprpub/pr/src/md/windows/w95thred.c(69,12):  error: token is not a valid binary operator in a preprocessor subexpression
20:16:36     INFO -  #if define DO_NOT_WAIT_FOR_CONNECT_OVERLAPPED_OPERATIONS
20:16:36     INFO -      ~~~~~~ ^
20:16:36     INFO -  1 error generated.
20:16:36     INFO -  z:/build/build/src/config/rules.mk:771: recipe for target 'w95thred.obj' failed
20:16:36     INFO -  mozmake.EXE[4]: *** [w95thred.obj] Error 1
20:16:36     INFO -  mozmake.EXE[4]: Leaving directory 'z:/build/build/src/obj-firefox/config/external/nspr/pr'
20:16:36     INFO -  z:/build/build/src/config/recurse.mk:73: recipe for target 'config/external/nspr/pr/target' failed
20:16:36     INFO -  mozmake.EXE[3]: *** [config/external/nspr/pr/target] Error 2
20

Comment 7

[Kai Engert (:KaiE:)]

link to failing build:
https://treeherder.mozilla.org/#/jobs?repo=mozilla-inbound&revision=f7f814a5a9577b545036f9be69aeb5293d8feda0

Comment 8

[Dragana Damjanovic [:dragana]]

This was a copy-paste error from a definition of DO_NOT_WAIT_FOR_CONNECT_OVERLAPPED_OPERATIONS

the line should be #if defined(DO_NOT_WAIT_FOR_CONNECT_OVERLAPPED_OPERATIONS)

sorry :(

Comment 9

[Kai Engert (:KaiE:)]

It's confusing that it worked on most windows configurations.
Started another try build with Dragana's suggested from bug 1421247 for all windows configurations:
https://hg.mozilla.org/try/rev/4ab29a84f3d2b9319e21f680a9169abe2720a529

Comment 10

[Kai Engert (:KaiE:)]

(In reply to Kai Engert (:kaie:) from comment #9)
> Started another try build with Dragana's suggested from bug 1421247 for all
> windows configurations:
> https://hg.mozilla.org/try/rev/4ab29a84f3d2b9319e21f680a9169abe2720a529

https://treeherder.mozilla.org/#/jobs?repo=try&revision=4ab29a84f3d2b9319e21f680a9169abe2720a529

Comment 11

[Kai Engert (:KaiE:)]

try infrastructure failure, resubmitted try:
https://treeherder.mozilla.org/#/jobs?repo=try&revision=dec317d04c3bcca68ae8a180880baab6a4a37866

Comment 12

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/mozilla-inbound/rev/798b87f30668
land NSPR 4.18 beta2 (r=me) and remove local NSPR patch that's no longer necessary (r=dragana)

Comment 13

[Kai Engert (:KaiE:)]

The try build looked good. Beta2 includes Dragana's fix for the bustage.

Comment 14

[Bogdan Tara[:bogdan_tara | bogdant]]

https://hg.mozilla.org/mozilla-central/rev/798b87f30668

Comment 15

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/mozilla-inbound/rev/63dd14f05665
NSPR_4_18_BETA3, r=me

Comment 16

[Stefan Hindli [:stefan_hindli]]

https://hg.mozilla.org/mozilla-central/rev/63dd14f05665

Comment 17

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/mozilla-inbound/rev/62afafe1b3d9
Land NSPR 4.18 into FF 59, NSPR_4_18_BETA4, r=me

Comment 18

[Raul Gurzau (:RaulG)]

https://hg.mozilla.org/mozilla-central/rev/62afafe1b3d9

Comment 19

[Kai Engert (:KaiE:)]

Tagged beta5, which includes bug 1407070. Let's see if this works with Firefox tests:
https://treeherder.mozilla.org/#/jobs?repo=try&revision=24e0813b007ec1f9d695c5269f3994bd034cd625

Comment 20

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/mozilla-inbound/rev/3a9a20dfd7b3
Land NSPR 4.18 into FF 59, NSPR_4_18_BETA5, r=me

Comment 21

[Arthur Iakab [arthur_iakab]]

https://hg.mozilla.org/mozilla-central/rev/3a9a20dfd7b3

Comment 22

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/mozilla-inbound/rev/2e91a03fa6b8
uplift NSPR_4_18_RTM, no code change, only version number. Require version 4.18 for building. r=me

Comment 23

[Andrei Ciure[:aciure]]

https://hg.mozilla.org/mozilla-central/rev/2e91a03fa6b8