Bump buildroot to 2019.02
This commit is contained in:
@@ -0,0 +1,28 @@
|
||||
From 948ecf84314f78da82e0e2b07b6570ca9cff86c8 Mon Sep 17 00:00:00 2001
|
||||
From: Miroslav Lichvar <mlichvar@redhat.com>
|
||||
Date: Thu, 20 Sep 2018 15:01:16 +0200
|
||||
Subject: [PATCH] hash: include util.h for MIN macro
|
||||
|
||||
The hash_intmd5.c file inadvertently relied on the system headers to
|
||||
provide the MIN macro, but it is missing with some libc implementations.
|
||||
|
||||
Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com>
|
||||
---
|
||||
hash_intmd5.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/hash_intmd5.c b/hash_intmd5.c
|
||||
index 0b60f9b..49da1cf 100644
|
||||
--- a/hash_intmd5.c
|
||||
+++ b/hash_intmd5.c
|
||||
@@ -29,6 +29,7 @@
|
||||
#include "sysincl.h"
|
||||
#include "hash.h"
|
||||
#include "memory.h"
|
||||
+#include "util.h"
|
||||
|
||||
#include "md5.c"
|
||||
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@@ -1,42 +0,0 @@
|
||||
From 7c5bd948bb7e21fa0ee22f29e97748b2d0360319 Mon Sep 17 00:00:00 2001
|
||||
From: Miroslav Lichvar <mlichvar@redhat.com>
|
||||
Date: Thu, 17 May 2018 14:16:58 +0200
|
||||
Subject: [PATCH] util: fall back to reading /dev/urandom when getrandom()
|
||||
blocks
|
||||
|
||||
With recent changes in the Linux kernel, the getrandom() system call may
|
||||
block for a long time after boot on machines that don't have enough
|
||||
entropy. It blocks the chronyd's initialization before it can detach
|
||||
from the terminal and may cause a chronyd service to fail to start due
|
||||
to a timeout.
|
||||
|
||||
At least for now, enable the GRND_NONBLOCK flag to make the system call
|
||||
non-blocking and let the code fall back to reading /dev/urandom (which
|
||||
never blocks) if the system call failed with EAGAIN or any other error.
|
||||
|
||||
This makes the start of chronyd non-deterministic with respect to files
|
||||
that it needs to open and possibly also makes it slightly easier to
|
||||
guess the transmit/receive timestamp in client requests until the
|
||||
urandom source is fully initialized.
|
||||
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
---
|
||||
util.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/util.c b/util.c
|
||||
index 4b3e455..76417d5 100644
|
||||
--- a/util.c
|
||||
+++ b/util.c
|
||||
@@ -1224,7 +1224,7 @@ get_random_bytes_getrandom(char *buf, unsigned int len)
|
||||
if (disabled)
|
||||
break;
|
||||
|
||||
- if (getrandom(rand_buf, sizeof (rand_buf), 0) != sizeof (rand_buf)) {
|
||||
+ if (getrandom(rand_buf, sizeof (rand_buf), GRND_NONBLOCK) != sizeof (rand_buf)) {
|
||||
disabled = 1;
|
||||
break;
|
||||
}
|
||||
--
|
||||
2.11.0
|
||||
|
||||
4
bsp/buildroot/package/chrony/S49chrony
Executable file → Normal file
4
bsp/buildroot/package/chrony/S49chrony
Executable file → Normal file
@@ -2,12 +2,12 @@
|
||||
#
|
||||
# Start chrony
|
||||
|
||||
[ -f /etc/chrony.conf ] || exit 0
|
||||
[ -r /etc/default/chrony ] && . /etc/default/chrony
|
||||
|
||||
case "$1" in
|
||||
start)
|
||||
printf "Starting chrony: "
|
||||
chronyd && echo "OK" || echo "FAIL"
|
||||
chronyd $CHRONY_ARGS && echo "OK" || echo "FAIL"
|
||||
;;
|
||||
stop)
|
||||
printf "Stopping chrony: "
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# From https://listengine.tuxfamily.org/chrony.tuxfamily.org/chrony-announce/2017/09/msg00000.html
|
||||
md5 f4c4eb0dc92f35ee4bb7d3dcd8029ecb chrony-3.2.tar.gz
|
||||
sha1 64db6c31e013222cc0a2b66322192b4cedf6e048 chrony-3.2.tar.gz
|
||||
# From https://listengine.tuxfamily.org/chrony.tuxfamily.org/chrony-announce/2018/09/msg00000.html
|
||||
md5 7170e750469c198fc6784047d6f71144 chrony-3.4.tar.gz
|
||||
sha1 fa41e595e7041a9deda76a69e970a023091474f6 chrony-3.4.tar.gz
|
||||
# Locally calculated
|
||||
sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
CHRONY_VERSION = 3.2
|
||||
CHRONY_VERSION = 3.4
|
||||
CHRONY_SITE = http://download.tuxfamily.org/chrony
|
||||
CHRONY_LICENSE = GPL-2.0
|
||||
CHRONY_LICENSE_FILES = COPYING
|
||||
|
||||
Reference in New Issue
Block a user