aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorRosen Penev <rosenp@gmail.com>2021-09-18 01:09:29 -0700
committerHauke Mehrtens <hauke@hauke-m.de>2021-09-20 15:21:17 +0200
commit8c863f604d68da05abbdc7edfdb805db79ed5ded (patch)
tree91a74687828315bb246ed6fc2e08fb3e69babb21 /tools
parent0d983c2a68f419471bf0897cd82052e304bc132e (diff)
downloadupstream-8c863f604d68da05abbdc7edfdb805db79ed5ded.tar.gz
upstream-8c863f604d68da05abbdc7edfdb805db79ed5ded.tar.bz2
upstream-8c863f604d68da05abbdc7edfdb805db79ed5ded.zip
tools/e2fsprogs: update to 1.46.4
Refresh patches. Signed-off-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/e2fsprogs/Makefile4
-rw-r--r--tools/e2fsprogs/patches/001-exit_0_on_corrected_errors.patch2
-rw-r--r--tools/e2fsprogs/patches/002-dont-build-e4defrag.patch2
-rw-r--r--tools/e2fsprogs/patches/003-no-crond.patch2
4 files changed, 5 insertions, 5 deletions
diff --git a/tools/e2fsprogs/Makefile b/tools/e2fsprogs/Makefile
index 408097f740..f8ca482224 100644
--- a/tools/e2fsprogs/Makefile
+++ b/tools/e2fsprogs/Makefile
@@ -9,8 +9,8 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=e2fsprogs
PKG_CPE_ID:=cpe:/a:e2fsprogs_project:e2fsprogs
-PKG_VERSION:=1.46.2
-PKG_HASH:=23aa093295c94e71ef1be490c4004871c5b01d216a8cb4d111fa6c0aac354168
+PKG_VERSION:=1.46.4
+PKG_HASH:=b11042533c1b1dcf17512f0da48e05b0c573dada1dd8b762864d10f4dc399713
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
diff --git a/tools/e2fsprogs/patches/001-exit_0_on_corrected_errors.patch b/tools/e2fsprogs/patches/001-exit_0_on_corrected_errors.patch
index 67a30f610b..9b9b06d540 100644
--- a/tools/e2fsprogs/patches/001-exit_0_on_corrected_errors.patch
+++ b/tools/e2fsprogs/patches/001-exit_0_on_corrected_errors.patch
@@ -1,6 +1,6 @@
--- a/e2fsck/e2fsck.h
+++ b/e2fsck/e2fsck.h
-@@ -73,7 +73,7 @@
+@@ -74,7 +74,7 @@
* Exit codes used by fsck-type programs
*/
#define FSCK_OK 0 /* No errors */
diff --git a/tools/e2fsprogs/patches/002-dont-build-e4defrag.patch b/tools/e2fsprogs/patches/002-dont-build-e4defrag.patch
index 2a7842f655..f59cd317a1 100644
--- a/tools/e2fsprogs/patches/002-dont-build-e4defrag.patch
+++ b/tools/e2fsprogs/patches/002-dont-build-e4defrag.patch
@@ -1,6 +1,6 @@
--- a/misc/Makefile.in
+++ b/misc/Makefile.in
-@@ -11,7 +11,7 @@ INSTALL = @INSTALL@
+@@ -12,7 +12,7 @@ MKDIR_P = @MKDIR_P@
@MCONFIG@
diff --git a/tools/e2fsprogs/patches/003-no-crond.patch b/tools/e2fsprogs/patches/003-no-crond.patch
index 87b50bff2b..a7ea52b1ac 100644
--- a/tools/e2fsprogs/patches/003-no-crond.patch
+++ b/tools/e2fsprogs/patches/003-no-crond.patch
@@ -1,6 +1,6 @@
--- a/configure
+++ b/configure
-@@ -14525,7 +14525,7 @@ $as_echo_n "checking for system crontab
+@@ -12538,7 +12538,7 @@ $as_echo_n "checking for system crontab
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${crond_dir}" >&5
$as_echo "${crond_dir}" >&6; }