diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2018-11-02 08:11:24 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-02 08:11:24 +0000 |
| commit | e5ca104835d4e9df298c3bfd2b5e401377b59688 (patch) | |
| tree | 9e576cabc3c047e2ee5c5cc8fcf4bb1ab86dcf61 /pkgs/tools | |
| parent | d24dee08e8efdd24ccdc952497aee58d949b1571 (diff) | |
| parent | 6759b7900eac5782f511a8161bd680ffd263b996 (diff) | |
| download | nixlib-e5ca104835d4e9df298c3bfd2b5e401377b59688.tar nixlib-e5ca104835d4e9df298c3bfd2b5e401377b59688.tar.gz nixlib-e5ca104835d4e9df298c3bfd2b5e401377b59688.tar.bz2 nixlib-e5ca104835d4e9df298c3bfd2b5e401377b59688.tar.lz nixlib-e5ca104835d4e9df298c3bfd2b5e401377b59688.tar.xz nixlib-e5ca104835d4e9df298c3bfd2b5e401377b59688.tar.zst nixlib-e5ca104835d4e9df298c3bfd2b5e401377b59688.zip | |
Merge pull request #49562 from zarelit/ntp_upstream_patch
ntp: fix ntpd shutdown by using upstream patch
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/networking/ntp/seccomp.patch | 32 |
1 files changed, 22 insertions, 10 deletions
diff --git a/pkgs/tools/networking/ntp/seccomp.patch b/pkgs/tools/networking/ntp/seccomp.patch index 872bf8e7fcc2..c75536dac7fb 100644 --- a/pkgs/tools/networking/ntp/seccomp.patch +++ b/pkgs/tools/networking/ntp/seccomp.patch @@ -1,7 +1,18 @@ -diff -urN ntp-4.2.8p10.orig/ntpd/ntpd.c ntp-4.2.8p10/ntpd/ntpd.c ---- ntp-4.2.8p10.orig/ntpd/ntpd.c 2017-04-02 20:21:17.371319663 +0200 -+++ ntp-4.2.8p10/ntpd/ntpd.c 2017-04-02 21:26:02.766178723 +0200 -@@ -1157,10 +1157,12 @@ +From 881e427f3236046466bdb8235edf86e6dfa34391 Mon Sep 17 00:00:00 2001 +From: Michael Bishop <cleverca22@gmail.com> +Date: Mon, 11 Jun 2018 08:30:48 -0300 +Subject: [PATCH] fix the seccomp filter to include a few previously missed + syscalls + +--- + ntpd/ntpd.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/ntpd/ntpd.c b/ntpd/ntpd.c +index 2c7f02ec5..4c59dc2ba 100644 +--- a/ntpd/ntpd.c ++++ b/ntpd/ntpd.c +@@ -1140,10 +1140,12 @@ int scmp_sc[] = { SCMP_SYS(close), SCMP_SYS(connect), SCMP_SYS(exit_group), @@ -14,15 +25,16 @@ diff -urN ntp-4.2.8p10.orig/ntpd/ntpd.c ntp-4.2.8p10/ntpd/ntpd.c SCMP_SYS(getsockname), SCMP_SYS(ioctl), SCMP_SYS(lseek), -@@ -1179,6 +1181,7 @@ +@@ -1162,6 +1164,8 @@ int scmp_sc[] = { SCMP_SYS(sendto), SCMP_SYS(setitimer), SCMP_SYS(setsid), -+ SCMP_SYS(setsockopt), ++ SCMP_SYS(setsockopt), ++ SCMP_SYS(openat), SCMP_SYS(socket), SCMP_SYS(stat), SCMP_SYS(time), -@@ -1195,9 +1198,11 @@ +@@ -1178,9 +1182,11 @@ int scmp_sc[] = { SCMP_SYS(clock_settime), SCMP_SYS(close), SCMP_SYS(exit_group), @@ -34,12 +46,12 @@ diff -urN ntp-4.2.8p10.orig/ntpd/ntpd.c ntp-4.2.8p10/ntpd/ntpd.c SCMP_SYS(madvise), SCMP_SYS(mmap), SCMP_SYS(mmap2), -@@ -1211,6 +1216,8 @@ +@@ -1194,6 +1200,8 @@ int scmp_sc[] = { SCMP_SYS(select), SCMP_SYS(setitimer), SCMP_SYS(setsid), -+ SCMP_SYS(setsockopt), -+ SCMP_SYS(openat), ++ SCMP_SYS(setsockopt), ++ SCMP_SYS(openat), SCMP_SYS(sigprocmask), SCMP_SYS(sigreturn), SCMP_SYS(socketcall), |