From: Daniel Engberg <daniel.engberg.lists@pyret.net>
Date: Mon, 3 Feb 2020 17:11:35 +0000 (+0000)
Subject: util-linux: Update to 2.35.1
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0e7d404a9472ffa688c3e8d17ab0ae18c1b1f70c;p=openwrt%2Fstaging%2Fadrian.git

util-linux: Update to 2.35.1

Update util-linux to 2.35.1 and refresh patches.

Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
[commit subject and description tweaks]
Signed-off-by: Petr Štetiar <ynezz@true.cz>
---

diff --git a/package/utils/util-linux/Makefile b/package/utils/util-linux/Makefile
index 29ad135033..77b4b98b56 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.34
-PKG_RELEASE:=2
+PKG_VERSION:=2.35.1
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.34
-PKG_HASH:=743f9d0c7252b6db246b659c1e1ce0bd45d8d4508b4dfa427bbb4a3e9b9f62b5
+PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.35
+PKG_HASH:=d9de3edd287366cd908e77677514b9387b22bc7b88f45b83e1922c3597f1d7f9
 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 f9aa9bc31d..c4afdb1b6e 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
-@@ -2416,18 +2416,23 @@ AC_CONFIG_HEADERS([config.h])
+@@ -2496,18 +2496,23 @@ AC_CONFIG_HEADERS([config.h])
  #
  AC_CONFIG_FILES([
  Makefile
diff --git a/package/utils/util-linux/patches/100-use_urandom.patch b/package/utils/util-linux/patches/100-use_urandom.patch
index 848f2f40c2..5817209885 100644
--- a/package/utils/util-linux/patches/100-use_urandom.patch
+++ b/package/utils/util-linux/patches/100-use_urandom.patch
@@ -1,6 +1,6 @@
 --- a/lib/randutils.c
 +++ b/lib/randutils.c
-@@ -25,6 +25,11 @@
+@@ -26,6 +26,11 @@
  #define THREAD_LOCAL static
  #endif