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

[staging-20.09] shadow: 4.8 -> 4.8.1 #102992

Merged
merged 1 commit into from Nov 11, 2020

Conversation

redvers
Copy link
Member

@redvers redvers commented Nov 6, 2020

https://nvd.nist.gov/vuln/detail/CVE-2019-19882
(cherry picked from commit 17d4902)

Motivation for this change

Addresses: #88398 - CVE-2019-19882

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.

@redvers redvers changed the title shadow: 4.8 -> 4.8.1 shadow: 4.8 -> 4.8.1 [20.09] Nov 6, 2020
@jonringer
Copy link
Contributor

jonringer commented Nov 6, 2020

this is a mass rebuild, please target staging-20.09

git rebase --onto=origin/staging-20.09 HEAD^
git push .. .. --force

then change target branch

@jonringer jonringer changed the title shadow: 4.8 -> 4.8.1 [20.09] [staging-20.09] shadow: 4.8 -> 4.8.1 Nov 6, 2020
@redvers
Copy link
Member Author

redvers commented Nov 6, 2020

git rebase --onto=origin/staging-20.09 HEAD^

[root@evil:/home/red/projects/nixpkgs]# git rebase --onto=origin/staging-20.09 HEAD^
fatal: Does not point to a valid commit 'origin/staging-20.09'

Sorry - I'm git impaired :/

@jonringer
Copy link
Contributor

please do git remote -v, you probably just have upstream named differently from me

@redvers
Copy link
Member Author

redvers commented Nov 6, 2020

please do git remote -v, you probably just have upstream named differently from me

[root@evil:/home/red/projects/nixpkgs]# git remote -v
origin  git@github.com:redvers/nixpkgs (fetch)
origin  git@github.com:redvers/nixpkgs (push)
upstream        https://github.com/nixos/nixpkgs.git (fetch)
upstream        https://github.com/nixos/nixpkgs.git (push)

@jonringer
Copy link
Contributor

ah, you cloned from your fork:

git rebase --onto=upstream/staging-20.09 HEAD^
git push .. .. --force

should work

@redvers redvers changed the base branch from release-20.09 to staging-20.09 November 6, 2020 20:14
@redvers
Copy link
Member Author

redvers commented Nov 6, 2020

ah, you cloned from your fork:

git rebase --onto=upstream/staging-20.09 HEAD^
git push .. .. --force

should work

Okay - I think we're good now?

Thanks for your due diligence.

@jonringer
Copy link
Contributor

git history looks good now

@redvers
Copy link
Member Author

redvers commented Nov 6, 2020

@andir

@jonringer jonringer added this to In progress in 20.09-Staging via automation Nov 6, 2020
@jonringer
Copy link
Contributor

This likely wont get merged until the current staging-20.09 gets merged

@jonringer
Copy link
Contributor

jonringer commented Nov 6, 2020

@GrahamcOfBorg eval

shouldn't have "package new"

@roberth
Copy link
Member

roberth commented Nov 9, 2020

@jonringer Hydra is not picking up on the new build timeout for GHC, blocking staging-20.09. A mass rebuild may be exactly what we need, so we get a new hash, therefore a new "Build" and possibly an increased timeout.

See also NixOS/hydra#830
and https://hydra.nixos.org/build/129420286

@roberth roberth merged commit 8d08d51 into NixOS:staging-20.09 Nov 11, 2020
20.09-Staging automation moved this from In progress to Done Nov 11, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

None yet

4 participants