diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2023-05-18 17:12:36 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2023-05-19 22:43:45 +0200 |
| commit | 3a935f7ea9214c831eccc585f0677c5132957dde (patch) | |
| tree | 61b5684824f0ebdfa26234426cc30ac5acf21ff3 /package | |
| parent | 2f11a89140030b51397199083b34b0e13ba9cbc6 (diff) | |
| download | upstream-3a935f7ea9214c831eccc585f0677c5132957dde.tar.gz upstream-3a935f7ea9214c831eccc585f0677c5132957dde.tar.bz2 upstream-3a935f7ea9214c831eccc585f0677c5132957dde.zip | |
util-linux: Use SYS_getrandom in randutils.c
The getrandom syscall is not hanging at bootup any more if there is
not enough entropy. This was fixed upstream in 2018 in commit:
https://github.com/util-linux/util-linux/commit/a9cf659e0508c1f56813a7d74c64f67bbc962538
This OpenWrt patch is not needed any more.
This reverts commit e64463ebde55 ("util-linux: avoid using the getrandom syscall")
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'package')
| -rw-r--r-- | package/utils/util-linux/Makefile | 2 | ||||
| -rw-r--r-- | package/utils/util-linux/patches/210-use-urandom.patch | 14 |
2 files changed, 1 insertions, 15 deletions
diff --git a/package/utils/util-linux/Makefile b/package/utils/util-linux/Makefile index 8dab621390..704d4f11ec 100644 --- a/package/utils/util-linux/Makefile +++ b/package/utils/util-linux/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=util-linux PKG_VERSION:=2.39 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.39 diff --git a/package/utils/util-linux/patches/210-use-urandom.patch b/package/utils/util-linux/patches/210-use-urandom.patch deleted file mode 100644 index 5817209885..0000000000 --- a/package/utils/util-linux/patches/210-use-urandom.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/lib/randutils.c -+++ b/lib/randutils.c -@@ -26,6 +26,11 @@ - #define THREAD_LOCAL static - #endif - -+/* force /dev/urandom to avoid hanging on early boot */ -+#undef HAVE_GETRANDOM -+#undef SYS_getrandom -+#undef __NR_getrandom -+ - #ifdef HAVE_GETRANDOM - # include <sys/random.h> - #elif defined (__linux__) |