mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-22 04:57:56 +03:00
ntp: fix ntpd shutdown by using upstream patch
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 #38627, #45885
This commit is contained in:
parent
a3dbeed475
commit
6759b7900e
@ -1,7 +1,18 @@
|
|||||||
diff -urN ntp-4.2.8p10.orig/ntpd/ntpd.c ntp-4.2.8p10/ntpd/ntpd.c
|
From 881e427f3236046466bdb8235edf86e6dfa34391 Mon Sep 17 00:00:00 2001
|
||||||
--- ntp-4.2.8p10.orig/ntpd/ntpd.c 2017-04-02 20:21:17.371319663 +0200
|
From: Michael Bishop <cleverca22@gmail.com>
|
||||||
+++ ntp-4.2.8p10/ntpd/ntpd.c 2017-04-02 21:26:02.766178723 +0200
|
Date: Mon, 11 Jun 2018 08:30:48 -0300
|
||||||
@@ -1157,10 +1157,12 @@
|
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(close),
|
||||||
SCMP_SYS(connect),
|
SCMP_SYS(connect),
|
||||||
SCMP_SYS(exit_group),
|
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(getsockname),
|
||||||
SCMP_SYS(ioctl),
|
SCMP_SYS(ioctl),
|
||||||
SCMP_SYS(lseek),
|
SCMP_SYS(lseek),
|
||||||
@@ -1179,6 +1181,7 @@
|
@@ -1162,6 +1164,8 @@ int scmp_sc[] = {
|
||||||
SCMP_SYS(sendto),
|
SCMP_SYS(sendto),
|
||||||
SCMP_SYS(setitimer),
|
SCMP_SYS(setitimer),
|
||||||
SCMP_SYS(setsid),
|
SCMP_SYS(setsid),
|
||||||
+ SCMP_SYS(setsockopt),
|
+ SCMP_SYS(setsockopt),
|
||||||
|
+ SCMP_SYS(openat),
|
||||||
SCMP_SYS(socket),
|
SCMP_SYS(socket),
|
||||||
SCMP_SYS(stat),
|
SCMP_SYS(stat),
|
||||||
SCMP_SYS(time),
|
SCMP_SYS(time),
|
||||||
@@ -1195,9 +1198,11 @@
|
@@ -1178,9 +1182,11 @@ int scmp_sc[] = {
|
||||||
SCMP_SYS(clock_settime),
|
SCMP_SYS(clock_settime),
|
||||||
SCMP_SYS(close),
|
SCMP_SYS(close),
|
||||||
SCMP_SYS(exit_group),
|
SCMP_SYS(exit_group),
|
||||||
@ -34,7 +46,7 @@ diff -urN ntp-4.2.8p10.orig/ntpd/ntpd.c ntp-4.2.8p10/ntpd/ntpd.c
|
|||||||
SCMP_SYS(madvise),
|
SCMP_SYS(madvise),
|
||||||
SCMP_SYS(mmap),
|
SCMP_SYS(mmap),
|
||||||
SCMP_SYS(mmap2),
|
SCMP_SYS(mmap2),
|
||||||
@@ -1211,6 +1216,8 @@
|
@@ -1194,6 +1200,8 @@ int scmp_sc[] = {
|
||||||
SCMP_SYS(select),
|
SCMP_SYS(select),
|
||||||
SCMP_SYS(setitimer),
|
SCMP_SYS(setitimer),
|
||||||
SCMP_SYS(setsid),
|
SCMP_SYS(setsid),
|
||||||
|
Loading…
Reference in New Issue
Block a user