From 8c97451ab93a90313ca97b87183632d22b00ffae Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Tue, 25 Jan 2022 23:15:33 +0100 Subject: [PATCH] package/util-linux: bump version to 2.37.3 (fixes CVE-2021-3996, CVE-2021-3995) - add 'touch' workaround for missing disk-utils/raw.8 file ([1], [2]) in util-linux-2.37.3 release download package For details see [1]. [1] https://www.spinics.net/lists/util-linux-ng/msg17037.html Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni [Arnout: put fix in POST_PATCH instead of PRE_COMPILE hook] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit b292f1d41a8734b6cdcbcf2ae726b51f9e1338a9) Signed-off-by: Peter Korsgaard --- package/util-linux/util-linux.hash | 2 +- package/util-linux/util-linux.mk | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/package/util-linux/util-linux.hash b/package/util-linux/util-linux.hash index eafbe9254a..9c10a42dca 100644 --- a/package/util-linux/util-linux.hash +++ b/package/util-linux/util-linux.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/utils/util-linux/v2.37/sha256sums.asc -sha256 6a0764c1aae7fb607ef8a6dd2c0f6c47d5e5fd27aa08820abaad9ec14e28e9d9 util-linux-2.37.2.tar.xz +sha256 590c592e58cd6bf38519cb467af05ce6a1ab18040e3e3418f24bcfb2f55f9776 util-linux-2.37.3.tar.xz # License files, locally calculated sha256 869660b5269f4f40a8a679da7f403ea3a6e71d46087aab5e14871b09bcb55955 README.licensing sha256 9b718a9460fed5952466421235bc79eb49d4e9eacc920d7a9dd6285ab8fd6c6d Documentation/licenses/COPYING.BSD-3-Clause diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index cf0fee409b..e59ef7dadc 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -8,7 +8,7 @@ # util-linux-libs/util-linux-libs.mk needs to be updated accordingly as well. UTIL_LINUX_VERSION_MAJOR = 2.37 -UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).2 +UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).3 UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR) @@ -35,6 +35,13 @@ UTIL_LINUX_CONF_OPTS += \ UTIL_LINUX_LINK_LIBS = $(TARGET_NLS_LIBS) +# workaround missing disk-utils/raw.8 file in util-linux-2.37.3 +# release download package +define UTIL_LINUX_FIX_DISK_UTILS_COMPILE + touch $(@D)/disk-utils/raw.8 +endef +UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE + HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf # We also don't want the host-python dependency