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

iputils: 20190324 -> 20190515 #61555

Merged
merged 1 commit into from May 17, 2019
Merged

iputils: 20190324 -> 20190515 #61555

merged 1 commit into from May 17, 2019

Conversation

primeos
Copy link
Member

@primeos primeos commented May 15, 2019

Motivation for this change
Things done
  • 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 nix-review --run "nix-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@dtzWill
Copy link
Member

dtzWill commented May 15, 2019

👍. I started setting -DNO_SETCAP_OR_SUID=true to be clear since those won't work in our sandbox anyway, but since they don't cause problems when we don't set that flag it's good as-is too :). Thanks for the patch! LGTM.

@primeos
Copy link
Member Author

primeos commented May 15, 2019

@dtzWill thanks for the feedback. Yes, setting NO_SETCAP_OR_SUID is a good idea, IIRC I've added another workaround for that during the last update so I can probably drop that as well.

I'll finish it tomorrow and marked it as work-in-progress to avoid confusion (would like to run a few more tests and the musl build - and I should also upstream that patch if no one beats me to it, but I want to generalize it first).

@dtzWill
Copy link
Member

dtzWill commented May 15, 2019

❤️ -- musl build is less convenient now that we have systemd as a dep for iputils, but it's optional and not used for anything we want from iputils AFAIK so not problematic. (more concretely: musl build looks good but was done by dropping systemd dep).

@primeos
Copy link
Member Author

primeos commented May 16, 2019

@dtzWill great, thanks for testing the musl build, I was also about to do that without systemd. We should maybe also make an upstream PR for that as systemd isn't really required (it's only checked to determine whether systemd units should be installed or not). Could be something like this (but IIRC that patch was only for our use-case and needs to be generalized first):
https://github.com/NixOS/nixpkgs/blob/3b079fdf77b7ce8953a22477086ec8d25473deaa/pkgs/os-specific/linux/iputils/use-systemd.patch

Edit: BTW, I submitted a modified version of the new patch and a few additional patches upstream: iputils/iputils#178. We could use one of them to drop libcap from nativeBuildInputs , but personally, I'd wait for the next release as it's required for buildInputs anyway.

This is mainly a bug fix release [0].

File changes:
-etc/systemd/system/rdisc@.service
+etc/systemd/system/rdisc.service

nix path-info -S:
20190324: 41055576
20190515: 41055584

[0]: https://github.com/iputils/iputils/releases/tag/s20190515
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants