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

libreswan: 3.31 -> 3.32 #88098

Merged
merged 1 commit into from Jun 21, 2020
Merged

libreswan: 3.31 -> 3.32 #88098

merged 1 commit into from Jun 21, 2020

Conversation

@mmilata
Copy link
Member

mmilata commented May 18, 2020

Changes: https://github.com/libreswan/libreswan/releases/tag/v3.32

Motivation for this change

https://nvd.nist.gov/vuln/detail/CVE-2020-1763

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.
@mweinelt
Copy link
Member

mweinelt commented May 19, 2020

Result of nixpkgs-review pr 88098 1

1 package failed to build:
- hash-slinger
1 package built:
- libreswan
@mmilata
Copy link
Member Author

mmilata commented May 19, 2020

The hash-slinger failing build is not caused by this PR:

[libreswan-3.32] ~/work/nixpkgs
mmilata@amd% nix-build -A hash-slinger
error: Package ‘pyunbound-1.9.3’ in /home/mmilata/work/nixpkgs/pkgs/tools/networking/unbound/python.nix:58 is marked as broken, refusing to evaluate.

a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowBroken = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowBroken = true; }
to ~/.config/nixpkgs/config.nix.

(use '--show-trace' to show detailed location information)
optional = stdenv.lib.optional;
version = "3.31";
version = "3.32";
name = "libreswan-${version}";
Comment on lines 8 to 10

This comment has been minimized.

Copy link
@prusnak

prusnak May 31, 2020

Member

Nitpick: it seems there is no reason why optional, version and name should be defined here.

I suggest removing these 3 lines. Then adding pname and version to mkDerivation below and expanding optional into stdenv.lib.optional.

This is just a matter of taste, though. That's why I am just adding as an extra comment, not part of the review.

@mmilata mmilata force-pushed the mmilata:libreswan-3.32 branch from f181208 to d0cb57b May 31, 2020
Copy link
Member

danieldk left a comment

LGTM:

Result of nixpkgs-review pr 88098 1

1 package failed to build:
- hash-slinger
1 package built:
- libreswan

As mentioned already, hash-slinger fails because it has unbound as a transitive dependency, which is marked as broken.

@danieldk danieldk merged commit fd7f606 into NixOS:master Jun 21, 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="d0cb57b"; rev="d0cb57b10c25c966878217cac8d29eab472f3e22"; } ./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="d0cb57b"; rev="d0cb57b10c25c966878217cac8d29eab472f3e22"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="d0cb57b"; rev="d0cb57b10c25c966878217cac8d29eab472f3e22"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="d0cb57b"; rev="d0cb57b10c25c966878217cac8d29eab472f3e22"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="d0cb57b"; rev="d0cb57b10c25c966878217cac8d29eab472f3e22"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="d0cb57b"; rev="d0cb57b10c25c966878217cac8d29eab472f3e22"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="d0cb57b"; rev="d0cb57b10c25c966878217cac8d29eab472f3e22"; } ./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
libreswan, libreswan.passthru.tests on aarch64-linux Success
Details
libreswan, libreswan.passthru.tests on x86_64-linux Success
Details
@mmilata mmilata deleted the mmilata:libreswan-3.32 branch Jun 21, 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

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