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.

Sign up for GitHub

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

Jump to bottom

strongswan-swanctl: adapt options to strongswan-5.7.1 #49197

Merged
merged 1 commit into from Oct 27, 2018
Merged

strongswan-swanctl: adapt options to strongswan-5.7.1 #49197

merged 1 commit into from Oct 27, 2018

Conversation

basvandijk
Copy link
Member

@basvandijk basvandijk commented Oct 26, 2018 •
edited

Motivation for this change

The options of the strongswan-swanctl module need to be adapted from strongswan-5.6.3 to the current version of strongswan-5.7.1.

Things done

The changes were found by executing the following in the strongswan
repo (https://github.com/strongswan/strongswan):

git diff 5.6.3..5.7.1 src/swanctl/swanctl.opt

The manual also builds correctly with these changes.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Fits CONTRIBUTING.md.

@GrahamcOfBorg test strongswan-swanctl

@basvandijk
strongswan-swanctl: adapt options to strongswan-5.7.1
ca655e8 
The changes were found by executing the following in the strongswan
repo (https://github.com/strongswan/strongswan):

git diff 5.6.3..5.7.1 src/swanctl/swanctl.opt
@basvandijk basvandijk self-assigned this Oct 26, 2018
@basvandijk
Copy link
Member Author

@GrahamcOfBorg test strongswan-swanctl

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: tests.strongswan-swanctl

Partial log (click to expand)

test script finished in 179.21s
cleaning up
killing alice (pid 632)
killing moon (pid 644)
killing carol (pid 657)
vde_switch: vde_switch: EOF on stdin, cleaning up and exiting
EOF on stdin, cleaning up and exiting
vde_switch: Could not remove ctl dir '/build/vde0.ctl': Directory not empty
vde_switch: Could not remove ctl dir '/build/vde1.ctl': Directory not empty
/nix/store/zmxqaqbbwwj00ki6kkc3jd8l7jmc56f9-vm-test-run-strongswan-swanctl

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: tests.strongswan-swanctl

Partial log (click to expand)

test script finished in 46.16s
cleaning up
killing carol (pid 598)
killing alice (pid 610)
killing moon (pid 622)
vde_switch: EOF on stdin, cleaning up and exiting
vde_switch: Could not remove ctl dir '/build/vde1.ctl': Directory not empty
vde_switch: EOF on stdin, cleaning up and exiting
vde_switch: Could not remove ctl dir '/build/vde0.ctl': Directory not empty
/nix/store/fbdzaif5kfjv3i36vpmbb2hv1nx1ql9v-vm-test-run-strongswan-swanctl

@basvandijk basvandijk merged commit 0b381dd into NixOS:master Oct 27, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@basvandijk basvandijk

Labels
0.kind: enhancement 6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 0 11.by: package-maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@basvandijk @GrahamcOfBorg