Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: c3e22dd546cc
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 5d8bd748f305
Choose a head ref
  • 1 commit
  • 3 files changed
  • 1 contributor

Commits on Dec 6, 2019

  1. chrony: fix build break from libseccomp 2.4.2 

    03be1ad bumped libseccomp to 2.4.2, which has this note in the
changelog:

    "Stop defining __NR_x values for syscalls that don't exist,
     libseccomp now uses __SNR_x internally"

This change means that invalid syscalls for Linux that aren't defined in
glibc will no longer work. In this unlucky case, 'chrony' was trying to
reference the syscall number for 'ppoll', which doesn't exist. Fixing
this is easy with a simple patch.

This also includes another patch from upstream, which allows
clock_adjtime in the seccomp filter list. This is a robustness measure
for future glibc versions that use clock_adjutime inside adjtimex().

Signed-off-by: Austin Seipp <aseipp@pobox.com>
    @thoughtpolice
    thoughtpolice committed Dec 6, 2019
    1
    Copy the full SHA
    5d8bd74 View commit details
    Browse the repository at this point in the history