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

[20.03] salt: 2019.2.0 -> 2019.2.4 #86653

Merged
merged 1 commit into from May 3, 2020
Merged

Conversation

@Flakebi
Copy link
Member

Flakebi commented May 3, 2020

Motivation for this change

Fixes CVE-2020-11651 and CVE-2020-11652, see also #85561.

Things done

nixpkgs-review failed, I guess release-20.03 is currently broken. The same patch worked for 19.09 in #86651.

$ nix-env -f /home/sebi/.cache/nixpkgs-review/rev-b5a4c50e31b27a041f992acb3c87aae510fa736d/nixpkgs -qaP --xml --out-path --show-trace --meta
error: while querying the derivation named 'lambdabot-5.2':
while evaluating the attribute 'buildInputs' of the derivation 'lambdabot-5.2' at /home/sebi/.cache/nixpkgs-review/rev-b5a4c50e31b27a041f992acb3c87aae510fa736d/nixpkgs/pkgs/development/haskell-modules/generic-builder.nix:291:3:
while evaluating the attribute 'propagatedBuildInputs' of the derivation 'lambdabot-core-5.2' at /home/sebi/.cache/nixpkgs-review/rev-b5a4c50e31b27a041f992acb3c87aae510fa736d/nixpkgs/pkgs/development/haskell-modules/generic-builder.nix:291:3:
while evaluating 'getOutput' at /home/sebi/.cache/nixpkgs-review/rev-b5a4c50e31b27a041f992acb3c87aae510fa736d/nixpkgs/lib/attrsets.nix:464:23, called from undefined position:
while evaluating anonymous function at /home/sebi/.cache/nixpkgs-review/rev-b5a4c50e31b27a041f992acb3c87aae510fa736d/nixpkgs/pkgs/stdenv/generic/make-derivation.nix:156:17, called from undefined position:
attribute 'hslogger_1_3_0_0' missing, at /home/sebi/.cache/nixpkgs-review/rev-b5a4c50e31b27a041f992acb3c87aae510fa736d/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix:1215:114
Nothing changed
  • 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.
Fixes CVE-2020-11651 and CVE-2020-11652
@mweinelt
Copy link
Member

mweinelt commented May 3, 2020

Builds and is executable.

❯ nixpkgs-review pr 86653
$ git -c fetch.prune=false fetch --force https://github.com/NixOS/nixpkgs release-20.03:refs/nixpkgs-review/0 pull/86653/head:refs/nixpkgs-review/1
remote: Enumerating objects: 5, done.
remote: Counting objects: 100% (5/5), done.
remote: Total 7 (delta 5), reused 5 (delta 5), pack-reused 2
Unpacking objects: 100% (7/7), 1.59 KiB | 813.00 KiB/s, done.
From https://github.com/NixOS/nixpkgs
 + af62dc53559...236016c356e release-20.03        -> refs/nixpkgs-review/0  (forced update)
 + 435713eac22...b5a4c50e31b refs/pull/86653/head -> refs/nixpkgs-review/1  (forced update)
$ git worktree add /home/hexa/.cache/nixpkgs-review/pr-86653/nixpkgs 236016c356e3d4058188999fb69160a7ff8cb671
Preparing worktree (detached HEAD 236016c356e)
Updating files: 100% (21009/21009), done.
HEAD is now at 236016c356e wireguard-compat: 1.0.20200426 -> 1.0.20200429
$ git merge --no-commit b5a4c50e31b27a041f992acb3c87aae510fa736d
Automatic merge went well; stopped before committing as requested
$ nix build --no-link --keep-going --option build-use-sandbox relaxed -f /home/hexa/.cache/nixpkgs-review/pr-86653/build.nix
[4 built, 81 copied (350.9 MiB), 66.8 MiB DL]
https://github.com/NixOS/nixpkgs/pull/86653
1 package built:
salt

$ nix-shell /home/hexa/.cache/nixpkgs-review/pr-86653/shell.nix
these paths will be fetched (0.05 MiB download, 0.28 MiB unpacked):
  /nix/store/0rbnlnd1pvlpii8p72ybvvg672j2wc2f-bash-interactive-4.4-p23-dev
copying path '/nix/store/0rbnlnd1pvlpii8p72ybvvg672j2wc2f-bash-interactive-4.4-p23-dev' from 'https://cache.nixos.org'...

[nix-shell:~/.cache/nixpkgs-review/pr-86653]$ ./results/salt/bin/salt-master --version
/nix/store/mpv6p517jc6zwa062j7ib0fzqykp5vkh-salt-2019.2.4/lib/python2.7/site-packages/salt/scripts.py:102: DeprecationWarning: Python 2.7 will reach the end of its life on January 1st, 2020. Please upgrade your Python as Python 2.7 won't be maintained after that date.  Salt will drop support for Python 2.7 in the Sodium release or later.
salt-master 2019.2.4 (Fluorine)
@bhipple
Copy link
Contributor

bhipple commented May 3, 2020

Result of nixpkgs-review pr 86653 1

1 package built:
- salt
@bhipple
bhipple approved these changes May 3, 2020
@bhipple bhipple merged commit d97db80 into NixOS:release-20.03 May 3, 2020
16 checks passed
16 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="b5a4c50"; rev="b5a4c50e31b27a041f992acb3c87aae510fa736d"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="b5a4c50"; rev="b5a4c50e31b27a041f992acb3c87aae510fa736d"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="b5a4c50"; rev="b5a4c50e31b27a041f992acb3c87aae510fa736d"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="b5a4c50"; rev="b5a4c50e31b27a041f992acb3c87aae510fa736d"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="b5a4c50"; rev="b5a4c50e31b27a041f992acb3c87aae510fa736d"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="b5a4c50"; rev="b5a4c50e31b27a041f992acb3c87aae510fa736d"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="b5a4c50"; rev="b5a4c50e31b27a041f992acb3c87aae510fa736d"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
salt, salt.passthru.tests on aarch64-linux Success
Details
salt, salt.passthru.tests on x86_64-linux Success
Details
@Flakebi Flakebi deleted the Flakebi:salt-20.03 branch May 4, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.