Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

firefox: updates #89438

Merged
merged 5 commits into from Jun 14, 2020
Merged

firefox: updates #89438

merged 5 commits into from Jun 14, 2020

Conversation

ajs124
Copy link
Member

@ajs124 ajs124 commented Jun 3, 2020

Motivation for this change

Upstream release day was yesterday.

NSS 3.52.1 instead of 3.53, because it fails to compile with:

In file included from blapi.h:11,
                 from loader.h:11,
                 from loader.c:8:
blapit.h:11:10: fatal error: seccomon.h: No such file or directory
   11 | #include "seccomon.h"
      |          ^~~~~~~~~~~~
compilation terminated.
make[2]: *** [../../coreconf/rules.mk:292: Linux5.4_x86_64_gcc_glibc_PTH_64_OPT.OBJ/loader.o] Error 1
make[2]: Leaving directory '/build/nss-3.53/nss/lib/freebl'
make[1]: *** [../coreconf/rules.mk:44: freebl] Error 2
make[1]: Leaving directory '/build/nss-3.53/nss/lib'
make: *** [coreconf/rules.mk:44: lib] Error 2

cc @andir

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@andir
Copy link
Member

andir commented Jun 4, 2020

Usually we have that NSS update as part of a staging/staging-next cycle to reduce the amounts of rebuilds on master. Given the severity of some of the issues and it being a dependency of Firefox it might be fine to just land this on master as is. If someone disagrees we can also do it the "normal" way.

I'll spent the afternoon on the backports of this. As of a few days we are only support 20.03 and master IIRC so I'll skip 19.09 but it would probably not be that hard (famous last words).

@FRidh
Copy link
Member

FRidh commented Jun 4, 2020

I expect tomorrow around noon we can start a new staging-next cycle so this can be included then.

@ajs124
Copy link
Member Author

ajs124 commented Jun 4, 2020

I'm not that familiar with the whole staging/staging-next workflow. Is there anything I need to do once the new cycle has been started?

@jonringer jonringer added this to WIP in Staging via automation Jun 4, 2020
vcunat pushed a commit that referenced this pull request Jun 5, 2020
Needed to compile firefox 77.  Taken from PR #89438.
@vcunat
Copy link
Member

vcunat commented Jun 5, 2020

I pushed the nss bump to staging now. This still does not prevent us from skipping the wait in case the staging-next cycle gets stuck on some hard-to-solve problem. (I pushed with non-SRI hash, although that change perhaps wasn't really required.) Actually, this time I see no "critical" security problems, so it seems to be less important than usual :-)

@andir andir mentioned this pull request Jun 8, 2020
3 tasks
vcunat pushed a commit that referenced this pull request Jun 12, 2020
vcunat pushed a commit that referenced this pull request Jun 12, 2020
vcunat pushed a commit that referenced this pull request Jun 12, 2020
@vcunat
Copy link
Member

vcunat commented Jun 12, 2020

Uh, I forgot to mention it here... and forgot this PR for a while: most of the commits don't need any large rebuild and they can go directly to master. I pushed those now (better late than later).

@vcunat
Copy link
Member

vcunat commented Jun 12, 2020

I see these commit hashes are linked from 20.03 already, so we merge this PR as-is into current staging-next?

@ajs124
Copy link
Member Author

ajs124 commented Jun 12, 2020

I don't know why @edolstra merged the backport, before this was merged. Since the commits are already referenced on release-20.03, this should probably merged as is.

@vcunat
Copy link
Member

vcunat commented Jun 12, 2020

I think it's good that 20.03 merge to wasn't delayed this long, but we could have merged this whole PR to staging long ago – at the first moment I only took what was necessary (nss).

@ajs124
Copy link
Member Author

ajs124 commented Jun 12, 2020

So I'll just close this then, right?

@ajs124 ajs124 closed this Jun 12, 2020
Staging automation moved this from WIP to Done Jun 12, 2020
@FRidh FRidh reopened this Jun 12, 2020
Staging automation moved this from Done to WIP Jun 12, 2020
@FRidh
Copy link
Member

FRidh commented Jun 12, 2020

Won't firefox on master fail because nss is still on staging-next?

@vcunat
Copy link
Member

vcunat commented Jun 12, 2020

firefox would fail, but I didn't push that. I tested running all those I pushed.

@vcunat vcunat changed the base branch from master to staging-next June 14, 2020 09:40
@vcunat vcunat merged commit 6857bcc into NixOS:staging-next Jun 14, 2020
Staging automation moved this from WIP to Done Jun 14, 2020
@ajs124 ajs124 deleted the firefox branch June 14, 2020 15:06
@ajs124 ajs124 mentioned this pull request Jun 29, 2020
4 tasks
@TredwellGit TredwellGit added 8.has: port to stable A PR already has a backport to the stable release. and removed 9.needs: port to stable A PR needs a backport to the stable release. labels Aug 20, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Staging
  
Done
Development

Successfully merging this pull request may close these issues.

None yet

5 participants