[openwrt/openwrt] util-linux: update to 2.36.1

[LEDE Commits]

hauke pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/47f30a566e4e76738464c5c7e6a2f7feb4b48410

commit 47f30a566e4e76738464c5c7e6a2f7feb4b48410
Author: Rosen Penev <rosenp at gmail.com>
AuthorDate: Tue Dec 8 17:21:40 2020 -0800

    util-linux: update to 2.36.1
    
    Removed upstream patch.
    
    Refreshed other ones.
    
    Signed-off-by: Rosen Penev <rosenp at gmail.com>
---
 package/utils/util-linux/Makefile                  |  6 ++---
 .../patches/003-fix_pkgconfig_files.patch          |  2 +-
 .../utils/util-linux/patches/200-musl-1.2.x.patch  | 26 ----------------------
 3 files changed, 4 insertions(+), 30 deletions(-)

diff --git a/package/utils/util-linux/Makefile b/package/utils/util-linux/Makefile
index 05ceaa413e..31a66493e9 100644
--- a/package/utils/util-linux/Makefile
+++ b/package/utils/util-linux/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=util-linux
-PKG_VERSION:=2.36
-PKG_RELEASE:=2
+PKG_VERSION:=2.36.1
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.36
-PKG_HASH:=9e4b1c67eb13b9b67feb32ae1dc0d50e08ce9e5d82e1cccd0ee771ad2fa9e0b1
+PKG_HASH:=09fac242172cd8ec27f0739d8d192402c69417617091d8c6e974841568f37eed
 PKG_CPE_ID:=cpe:/a:kernel:util-linux
 
 PKG_LICENSE:=GPL-2.0
diff --git a/package/utils/util-linux/patches/003-fix_pkgconfig_files.patch b/package/utils/util-linux/patches/003-fix_pkgconfig_files.patch
index 3f97eaf737..4797f7d159 100644
--- a/package/utils/util-linux/patches/003-fix_pkgconfig_files.patch
+++ b/package/utils/util-linux/patches/003-fix_pkgconfig_files.patch
@@ -10,7 +10,7 @@
  endif # BUILD_LIBUUID
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2586,18 +2586,23 @@ AC_CONFIG_HEADERS([config.h])
+@@ -2522,18 +2522,23 @@ AC_CONFIG_HEADERS([config.h])
  #
  AC_CONFIG_FILES([
  Makefile
diff --git a/package/utils/util-linux/patches/200-musl-1.2.x.patch b/package/utils/util-linux/patches/200-musl-1.2.x.patch
deleted file mode 100644
index 658b3ead1d..0000000000
--- a/package/utils/util-linux/patches/200-musl-1.2.x.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 69e4fbfbfd9c42af508954d9fb985c5c7b657784 Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak at redhat.com>
-Date: Tue, 11 Aug 2020 11:02:31 +0200
-Subject: [PATCH] hwclock: add fallback if SYS_settimeofday does not exist
-
-It seems Musl-C removes SYS_settimeofday macro at all.
-
-Addresses: https://github.com/karelzak/util-linux/commit/9c6139a72017cecb9145e46102152cb4f456ada6#commitcomment-41290951
-Signed-off-by: Karel Zak <kzak at redhat.com>
----
- sys-utils/hwclock.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/sys-utils/hwclock.c
-+++ b/sys-utils/hwclock.c
-@@ -675,6 +675,10 @@ display_time(struct timeval hwctime)
-  */
- #define __set_time(_tv)		settimeofday(_tv, NULL)
- 
-+#if !defined(SYS_settimeofday) && defined(__NR_settimeofday)
-+# define SYS_settimeofday	__NR_settimeofday
-+#endif
-+
- static inline int __set_timezone(const struct timezone *tz)
- {
- #ifdef SYS_settimeofday