chrony: Update to version 3.2

Signed-of-by: Robert Joslyn <robert.joslyn@redrectangle.org>

Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
This commit is contained in:
Robert Joslyn
2017-11-18 10:07:36 -08:00
committed by Joe MacDonald
parent 286eaa380f
commit a6288549e6
2 changed files with 24 additions and 18 deletions
@@ -1,48 +1,54 @@
chrony: fix build failure for arma9 chrony: fix build failure for arma9
Eliminate references to syscalls not available Eliminate references to syscalls not available
for ARM_EABI. Also add a dependency on libseccomp for ARM_EABI. Also add a dependency on libseccomp
which is needed for scfilter to work. which is needed for scfilter to work.
Set PACKAGECONFIG to not enable scfilter, since Set PACKAGECONFIG to not enable scfilter, since
kernel CONFIG_SECCOMP is unlikely to be set. This kernel CONFIG_SECCOMP is unlikely to be set. This
aligns the usage of libseccomp with that of other packages. aligns the usage of libseccomp with that of other packages.
Upstream-Status: Pending Upstream-Status: Pending
Signed-off-by: Joe Slater <jslater@windriver.com> Signed-off-by: Joe Slater <jslater@windriver.com>
Refresh patch for new upstream version.
Signed-off-by: Robert Joslyn <robert.joslyn@redrectangle.org>
--- a/sys_linux.c --- a/sys_linux.c
+++ b/sys_linux.c +++ b/sys_linux.c
@@ -453,13 +453,12 @@ SYS_Linux_EnableSystemCallFilter(int lev @@ -465,14 +465,14 @@ SYS_Linux_EnableSystemCallFilter(int lev
const int syscalls[] = { const int syscalls[] = {
/* Clock */ /* Clock */
SCMP_SYS(adjtimex), SCMP_SYS(gettimeofday), SCMP_SYS(settimeofday), SCMP_SYS(adjtimex), SCMP_SYS(clock_gettime), SCMP_SYS(gettimeofday),
- SCMP_SYS(time), - SCMP_SYS(settimeofday), SCMP_SYS(time),
+ SCMP_SYS(settimeofday),
/* Process */ /* Process */
- SCMP_SYS(clone), SCMP_SYS(exit), SCMP_SYS(exit_group), SCMP_SYS(getrlimit), SCMP_SYS(clone), SCMP_SYS(exit), SCMP_SYS(exit_group), SCMP_SYS(getpid),
+ SCMP_SYS(clone), SCMP_SYS(exit), SCMP_SYS(exit_group), - SCMP_SYS(getrlimit), SCMP_SYS(rt_sigaction), SCMP_SYS(rt_sigreturn),
SCMP_SYS(rt_sigaction), SCMP_SYS(rt_sigreturn), SCMP_SYS(rt_sigprocmask), + SCMP_SYS(rt_sigaction), SCMP_SYS(rt_sigreturn),
SCMP_SYS(set_tid_address), SCMP_SYS(sigreturn), SCMP_SYS(wait4), SCMP_SYS(rt_sigprocmask), SCMP_SYS(set_tid_address), SCMP_SYS(sigreturn),
SCMP_SYS(wait4),
/* Memory */ /* Memory */
- SCMP_SYS(brk), SCMP_SYS(madvise), SCMP_SYS(mmap), SCMP_SYS(mmap2), - SCMP_SYS(brk), SCMP_SYS(madvise), SCMP_SYS(mmap), SCMP_SYS(mmap2),
+ SCMP_SYS(brk), SCMP_SYS(madvise), SCMP_SYS(mmap2), + SCMP_SYS(brk), SCMP_SYS(madvise), SCMP_SYS(mmap2),
SCMP_SYS(mprotect), SCMP_SYS(mremap), SCMP_SYS(munmap), SCMP_SYS(shmdt), SCMP_SYS(mprotect), SCMP_SYS(mremap), SCMP_SYS(munmap), SCMP_SYS(shmdt),
/* Filesystem */ /* Filesystem */
SCMP_SYS(access), SCMP_SYS(chmod), SCMP_SYS(chown), SCMP_SYS(chown32), SCMP_SYS(access), SCMP_SYS(chmod), SCMP_SYS(chown), SCMP_SYS(chown32),
@@ -470,14 +469,21 @@ SYS_Linux_EnableSystemCallFilter(int lev @@ -483,14 +483,21 @@
SCMP_SYS(bind), SCMP_SYS(connect), SCMP_SYS(getsockname), SCMP_SYS(bind), SCMP_SYS(connect), SCMP_SYS(getsockname),
SCMP_SYS(recvfrom), SCMP_SYS(recvmsg), SCMP_SYS(sendmmsg), SCMP_SYS(recvfrom), SCMP_SYS(recvmmsg), SCMP_SYS(recvmsg),
SCMP_SYS(sendmsg), SCMP_SYS(sendto), SCMP_SYS(sendmmsg), SCMP_SYS(sendmsg), SCMP_SYS(sendto),
- /* TODO: check socketcall arguments */ - /* TODO: check socketcall arguments */
- SCMP_SYS(socketcall), - SCMP_SYS(socketcall),
/* General I/O */ /* General I/O */
SCMP_SYS(_newselect), SCMP_SYS(close), SCMP_SYS(open), SCMP_SYS(pipe), SCMP_SYS(_newselect), SCMP_SYS(close), SCMP_SYS(open), SCMP_SYS(openat), SCMP_SYS(pipe),
- SCMP_SYS(poll), SCMP_SYS(read), SCMP_SYS(futex), SCMP_SYS(select), - SCMP_SYS(poll), SCMP_SYS(read), SCMP_SYS(futex), SCMP_SYS(select),
+ SCMP_SYS(poll), SCMP_SYS(read), SCMP_SYS(futex), + SCMP_SYS(poll), SCMP_SYS(read), SCMP_SYS(futex),
SCMP_SYS(set_robust_list), SCMP_SYS(write), SCMP_SYS(set_robust_list), SCMP_SYS(write),
/* Miscellaneous */ /* Miscellaneous */
SCMP_SYS(uname), SCMP_SYS(getrandom), SCMP_SYS(sysinfo), SCMP_SYS(uname),
+ /* not always available */ + /* not always available */
+#if ! defined(__ARM_EABI__) +#if ! defined(__ARM_EABI__)
+ SCMP_SYS(time), + SCMP_SYS(time),
@@ -25,7 +25,7 @@ This recipe produces two binary packages: 'chrony' which contains chronyd, \
the configuration file and the init script, and 'chronyc' which contains \ the configuration file and the init script, and 'chronyc' which contains \
the client program only." the client program only."
HOMEPAGE = "http://chrony.tuxfamily.org/" HOMEPAGE = "https://chrony.tuxfamily.org/"
SECTION = "net" SECTION = "net"
LICENSE = "GPLv2" LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
@@ -35,8 +35,8 @@ SRC_URI = "https://download.tuxfamily.org/chrony/chrony-${PV}.tar.gz \
file://chronyd \ file://chronyd \
file://arm_eabi.patch \ file://arm_eabi.patch \
" "
SRC_URI[md5sum] = "d0598aa8a9be8faccef9386f6fc0d5f2" SRC_URI[md5sum] = "f4c4eb0dc92f35ee4bb7d3dcd8029ecb"
SRC_URI[sha256sum] = "8d04e7cda2333289c2104b731d39c3c1db94816e43bae35d7ee4e7ae8af6391f" SRC_URI[sha256sum] = "329f6718dd8c3ece3eee78be1f4821cbbeb62608e7d23f25da293cfa433c4116"
DEPENDS = "pps-tools" DEPENDS = "pps-tools"