1273682 - Port Bug 1035125 to Seamonkey. Remove sandboxbroker.dll from Installer

Status: RESOLVED FIXED

(SeaMonkey :: Installer, defect)

Description

[Frank-Rainer Grahl (:frg)]

sandboxbroker.dll no longer exists after Bug 1035125

Comment 1

[Frank-Rainer Grahl (:frg)]

Attachment: 1273682-sandboxbroker.patch

Seamonkey does not seem to use MOZ_SANDBOX. Only did a quick test and Suite still runs after removing it.

Comment 2

[Philip Chee]

Looks like we need to port the rest of Bug 1035125 Part 9: Link Chromium sandbox into firefox.exe instead of having a separate DLL.
https://hg.mozilla.org/mozilla-central/rev/a416c55e6648

And:
Bug 1110760 - Build and Package Chromium Sandbox wow_helper
https://hg.mozilla.org/mozilla-central/rev/c2845100484d

Comment 3

[Frank-Rainer Grahl (:frg)]

Attachment: 1273682-sandboxbroker-V2.patch

Version 2. The dymanic linking will likely break XP SP2 but this is on the way out anyway. Will test on SP3.

Comment 4

[Frank-Rainer Grahl (:frg)]

Briefly tested on XP SP3. Works.

Comment 5

[Philip Chee]

Comment on attachment 8753859 [details] [diff] [review]
1273682-sandboxbroker-V2.patch

> +++ b/suite/app/moz.build

Should remove DELAYLOAD_DLLS as well
https://hg.mozilla.org/mozilla-central/rev/3b9b7b90c5f4#l1.34

> +++ b/browser/installer/windows/nsis/shared.nsh

I think you missed this part:
https://hg.mozilla.org/mozilla-central/rev/a416c55e6648#l4.12

> -  Push "sandboxbroker.dll"

> +++ b/suite/app/nsSuiteApp.cpp

[Note: If we port Bug 1238769 in some other bug ( Add a -xpcshell option to Firefox) we should also add this hunk.

> -    return XRE_XPCShellMain(--argc, argv, envp);
> +
> +    XREShellData shellData;
> +#if defined(XP_WIN) && defined(MOZ_SANDBOX)
> +    shellData.sandboxBrokerServices =
> +      sandboxing::GetInitializedBrokerServices();
> +#endif
> +
> +    return XRE_XPCShellMain(--argc, argv, envp, &shellData);

Comment 6

[Frank-Rainer Grahl (:frg)]

Attachment: 1273682-sandboxbroker-V3.patch

>> Should remove DELAYLOAD_DLLS as well

Thanks. Looked for the bug where the static got removed but didn't find it.

>> > +++ b/browser/installer/windows/nsis/shared.nsh

>> I think you missed this part:

Sorry. Was in my tree but forgot to copy it in my clean patch tree.

>> [Note: If we port Bug 1238769 in some other bug ( Add a -xpcshell option to Firefox) we should also add this hunk.

I think it would be best to do this here too or we might end up with a broken patch later when someone forgets this so put this one into V3 too.

Comment 7

[Philip Chee]

Comment on attachment 8754077 [details] [diff] [review]
1273682-sandboxbroker-V3.patch

Works! r=me a=me for landing on a CLOSED TREE

Comment 8

[Frank-Rainer Grahl (:frg)]

https://hg.mozilla.org/comm-central/rev/622ad44c617a