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

NTPSec #63821

Closed
wants to merge 4 commits into from
Closed

NTPSec #63821

wants to merge 4 commits into from

Conversation

georgyo
Copy link
Contributor

@georgyo georgyo commented Jun 26, 2019

Motivation for this change

NTPSec is fork of ntpd, and there for a drop in replacement of it. It includes numerous security fixes and improvements, as well as implementations of secure time protocols such as NTS.

Instead of creating a new ntpsec service configuration, I decided it would be better to just reuse the existing ntp configuration, and add a few more customizations to that that one.

This is my first time trying to upstream a nix package, please feel free to point out anything I can do better.

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 (archlinux)
  • 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.

@georgyo georgyo changed the title Ntpsec NTPSec Jun 26, 2019
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To conform to CONTRIBUTING.md, you'll probably want to chagne your commit messages to similar to:

maintainers: add georgyo
ntpsec: init at 1.1.4
nixos/networking: add additional ntp options

I'm not 100% how to label nixos changes, but I think that would be more accurate and inline with CONTRIBUTING.md

@georgyo
Copy link
Contributor Author

georgyo commented Jun 26, 2019

Thanks, commit messages are now fixed up.

Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i think this libcaps logic is more in line with what you're trying to express.

pkgs/tools/networking/ntpsec/default.nix Outdated Show resolved Hide resolved
pkgs/tools/networking/ntpsec/default.nix Outdated Show resolved Hide resolved
pkgs/tools/networking/ntpsec/default.nix Outdated Show resolved Hide resolved
nixos/modules/misc/ids.nix Outdated Show resolved Hide resolved
@georgyo
Copy link
Contributor Author

georgyo commented Jul 1, 2019

Anything blocking this from getting merged now?

@georgyo
Copy link
Contributor Author

georgyo commented Jul 27, 2019

Version bumped to 1.1.6.

@georgyo
Copy link
Contributor Author

georgyo commented Sep 26, 2019

Version bumped to 1.1.7.

in

stdenv.mkDerivation rec {
name = "ntpsec-${version}";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
name = "ntpsec-${version}";
pname = "ntpsec";

@ryantm
Copy link
Member

ryantm commented Jan 6, 2020

@georgyo Sorry this is taking so long to get in. It looks good to me except for that one pname thing. Could you fix that and we should be good to go?

@ryantm
Copy link
Member

ryantm commented Jan 6, 2020

@GrahamcOfBorg build ntpsec

@ryantm
Copy link
Member

ryantm commented Jan 6, 2020

Looks like it is failing the OfBorg build check on x86-64 too.

And nix-review pr 63821 on my system

builder for '/nix/store/qhrfzhwkgqzq969v7c7kbdidln8qmg9l-ntpsec-1.1.7.drv' failed with exit code 1; last 10 log lines:
  
  ../../ntpd/ntpd.c: In function 'parse_cmdline_opts':
  ../../ntpd/ntpd.c:334:4: warning: implicit declaration of function 'strlcpy'; did you mean 'strncpy'? [-Wimplicit-function-declaration]
    334 |    strlcpy(statsdir, ntp_optarg, sizeof(statsdir));
        |    ^~~~~~~
        |    strncpy
  
  Waf: Leaving directory `/build/ntpsec-1.1.7/build/main'

@georgyo
Copy link
Contributor Author

georgyo commented Jan 9, 2020

Interesting. I think this is failing to build with gcc9 which is now on master. I'll take a deeper look this weekend.

@stale
Copy link

stale bot commented Jul 7, 2020

Hello, I'm a bot and I thank you in the name of the community for your contributions.

Nixpkgs is a busy repository, and unfortunately sometimes PRs get left behind for too long. Nevertheless, we'd like to help committers reach the PRs that are still important. This PR has had no activity for 180 days, and so I marked it as stale, but you can rest assured it will never be closed by a non-human.

If this is still important to you and you'd like to remove the stale label, we ask that you leave a comment. Your comment can be as simple as "still important to me". But there's a bit more you can do:

If you received an approval by an unpriviledged maintainer and you are just waiting for a merge, you can @ mention someone with merge permissions and ask them to help. You might be able to find someone relevant by using Git blame on the relevant files, or via GitHub's web interface. You can see if someone's a member of the nixpkgs-committers team, by hovering with the mouse over their username on the web interface, or by searching them directly on the list.

If your PR wasn't reviewed at all, it might help to find someone who's perhaps a user of the package or module you are changing, or alternatively, ask once more for a review by the maintainer of the package/module this is about. If you don't know any, you can use Git blame on the relevant files, or GitHub's web interface to find someone who touched the relevant files in the past.

If your PR has had reviews and nevertheless got stale, make sure you've responded to all of the reviewer's requests / questions. Usually when PR authors show responsibility and dedication, reviewers (privileged or not) show dedication as well. If you've pushed a change, it's possible the reviewer wasn't notified about your push via email, so you can always officially request them for a review, or just @ mention them and say you've addressed their comments.

Lastly, you can always ask for help at our Discourse Forum, or more specifically, at this thread or at #nixos' IRC channel.

@stale stale bot added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Jul 7, 2020
@stale stale bot removed the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Oct 3, 2020
@georgyo georgyo closed this Apr 28, 2021
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

7 participants