[Git][NTPsec/ntpsec][master] Fix CI fail from seccomp SCMP_SYS(ppoll)

[Hal Murray]

Hal Murray pushed to branch master at NTPsec / ntpsec


Commits:
3aff6247 by Hal Murray at 2019-12-28T21:34:40-08:00
Fix CI fail from seccomp SCMP_SYS(ppoll)
There is a change in the SCMP_SYS area that I don't understand.
Fedora 31 now uses __SNR_ppoll rathr than __NR_ppoll.

- - - - -


1 changed file:

- ntpd/ntp_sandbox.c


Changes:

=====================================
ntpd/ntp_sandbox.c
=====================================
@@ -413,9 +413,12 @@ int scmp_sc[] = {
 	SCMP_SYS(geteuid),
 /* __NR_ppoll is not available in Fedora 31.
  * Needed by getaddrinfo on Arch Linux. 2019-Dec */
-#ifdef __NR_ppoll
- 	SCMP_SYS(ppoll),
-#endif
+/* But somebody switched to SNR vs NR so we need a way
+ * to test for old/new so we can do the right ifdef. */
+// Currently broken on Arch Linux but passes GitLab CI
+// #ifdef __NR_ppoll
+//	SCMP_SYS(ppoll),
+// #endif
 	SCMP_SYS(sendmsg),
 #ifdef __NR_geteuid32
 	SCMP_SYS(geteuid32),



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/3aff6247842b315bbc4c16c14766530f697b949d

-- 
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/3aff6247842b315bbc4c16c14766530f697b949d
You're receiving this email because of your account on gitlab.com.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20191229/a02e8c63/attachment-0001.htm>