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

[18.09] ntp: fix ntpd shutdown by using upstream patch #49563

Merged
merged 1 commit into from Nov 2, 2018
Merged

[18.09] ntp: fix ntpd shutdown by using upstream patch #49563

merged 1 commit into from Nov 2, 2018

Conversation

zarelit
Copy link
Member

@zarelit zarelit commented Oct 31, 2018 •
edited

After a series of amendments the seccomp.patch made ntpd work properly
but only on 32-bit systems.
This commit replaces that patch with the one submitted upstream by
cleverca22 and that fixes the issue also on 64-bit systems.

(cherry picked from commit 6759b79)

Motivation for this change

Backport of #49562

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 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.

@zarelit
ntp: fix ntpd shutdown by using upstream patch
3f06ebf 
After a series of amendments the seccomp.patch made ntpd work properly
but only on 32-bit systems.
This commit replaces that patch with the one submitted upstream by
cleverca22 and that fixes the issue also on 64-bit systems.

Close NixOS#38627, NixOS#45885

(cherry picked from commit 6759b79)
@zarelit zarelit mentioned this pull request Oct 31, 2018
Merged
9 tasks
@worldofpeace
Copy link
Contributor

@zarelit It's nice if you can prefix the pr header with [18.09] or whatever version you're backporting to.

That way it's easily identifiable if something is a backport and to where.

@zarelit zarelit changed the title ntp: fix ntpd shutdown by using upstream patch [18.09] ntp: fix ntpd shutdown by using upstream patch Nov 1, 2018
@7c6f434c 7c6f434c merged commit 9660896 into NixOS:release-18.09 Nov 2, 2018
@thoughtpolice thoughtpolice mentioned this pull request Oct 9, 2021
Closed
@zarelit zarelit deleted the ntp_upstream_patch_bp branch June 25, 2022 15:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@zarelit @worldofpeace @bjornfor @7c6f434c @GrahamcOfBorg