git.iko.soy/typeable/nixpkgs
on master help sign in
chrony: 3.5.1 -> 4.0
commit4e6f5a305492be4d373f4a05e49b238a812f5dc6 authorBruno Bigras <bigras.bruno@gmail.com> dateFri 30 Oct 2020, 16:37 (6 years ago) parent989b403
3 files changed+4−48
compare with master
unifiedsplit
pkgs/tools/networking/chrony/allow-clock_adjtime.patch−26 pkgs/tools/networking/chrony/default.nix+4−9 pkgs/tools/networking/chrony/fix-seccomp-build.patch−13
pkgs/tools/networking/chrony/allow-clock_adjtime.patchdeleted−26
@@ -1,26 +0,0 @@
1−From 0cf506c92967c84f9ed83ba9e1be946a7fda6425 Mon Sep 17 00:00:00 2001
2−From: Miroslav Lichvar <mlichvar@redhat.com>
3−Date: Mon, 2 Dec 2019 12:47:13 +0100
4−Subject: sys_linux: allow clock_adjtime in seccomp filter
5−
6−The adjtimex() function in glibc was switched to the clock_adjtime
7−system call.
8−
9−diff --git a/sys_linux.c b/sys_linux.c
10−index 63eb8f1..fcf89c2 100644
11−--- a/sys_linux.c
12−+++ b/sys_linux.c
13−@@ -478,8 +478,8 @@ SYS_Linux_EnableSystemCallFilter(int level)
14− {
15− const int syscalls[] = {
16− /* Clock */
17−- SCMP_SYS(adjtimex), SCMP_SYS(clock_gettime), SCMP_SYS(gettimeofday),
18−- SCMP_SYS(settimeofday), SCMP_SYS(time),
19−+ SCMP_SYS(adjtimex), SCMP_SYS(clock_adjtime), SCMP_SYS(clock_gettime),
20−+ SCMP_SYS(gettimeofday), SCMP_SYS(settimeofday), SCMP_SYS(time),
21− /* Process */
22− SCMP_SYS(clone), SCMP_SYS(exit), SCMP_SYS(exit_group), SCMP_SYS(getpid),
23− SCMP_SYS(getrlimit), SCMP_SYS(rt_sigaction), SCMP_SYS(rt_sigreturn),
24−--
25−cgit v0.10.2
26−
pkgs/tools/networking/chrony/default.nix+4−9
@@ -1,27 +1,22 @@
11{ stdenv, fetchurl, pkgconfig, libcap, readline, texinfo, nss, nspr
2−, libseccomp, pps-tools }:
2+, libseccomp, pps-tools, gnutls }:
33
44assert stdenv.isLinux -> libcap != null;
55
66stdenv.mkDerivation rec {
77 pname = "chrony";
8− version = "3.5.1";
8+ version = "4.0";
99
1010 src = fetchurl {
1111 url = "https://download.tuxfamily.org/chrony/${pname}-${version}.tar.gz";
12− sha256 = "19ywl8a3lb2id7lcna5hp2g4pjnfwdc9ihr0fk6i9m45vdq2za0v";
12+ sha256 = "09f6w2x5h5kamb4rhcbaz911q1f730qdalgsn8s48yjyqlafl9xy";
1313 };
1414
15− patches = [
16− ./allow-clock_adjtime.patch
17− ./fix-seccomp-build.patch
18− ];
19−
2015 postPatch = ''
2116 patchShebangs test
2217 '';
2318
24− buildInputs = [ readline texinfo nss nspr ]
19+ buildInputs = [ readline texinfo nss nspr gnutls ]
2520 ++ stdenv.lib.optionals stdenv.isLinux [ libcap libseccomp pps-tools ];
2621 nativeBuildInputs = [ pkgconfig ];
2722
pkgs/tools/networking/chrony/fix-seccomp-build.patchdeleted−13
@@ -1,13 +0,0 @@
1−diff --git a/sys_linux.c b/sys_linux.c
2−index 898dc7a7f75..fcd334ecf03 100644
3−--- a/sys_linux.c
4−+++ b/sys_linux.c
5−@@ -503,7 +503,7 @@ SYS_Linux_EnableSystemCallFilter(int level)
6− SCMP_SYS(socketcall),
7− /* General I/O */
8− SCMP_SYS(_newselect), SCMP_SYS(close), SCMP_SYS(open), SCMP_SYS(openat), SCMP_SYS(pipe),
9−- SCMP_SYS(pipe2), SCMP_SYS(poll), SCMP_SYS(ppoll), SCMP_SYS(pselect6), SCMP_SYS(read),
10−+ SCMP_SYS(pipe2), SCMP_SYS(poll), SCMP_SYS(pselect6), SCMP_SYS(read),
11− SCMP_SYS(futex), SCMP_SYS(select), SCMP_SYS(set_robust_list), SCMP_SYS(write),
12− /* Miscellaneous */
13− SCMP_SYS(getrandom), SCMP_SYS(sysinfo), SCMP_SYS(uname),