From 234f7a9e5dccfaa449d75a120ef90080d0715436 Mon Sep 17 00:00:00 2001
From: Daniel Engberg <daniel.engberg.lists@pyret.net>
Date: Sat, 15 Jun 2019 09:47:21 +0000
Subject: [PATCH] tools/e2fsprogs: Update to 1.45.3

Update e2fsprogs to 1.45.3
Remove OpenBSD patch
Remove Darwin patch, neither macports or brew patches these files
Add patch to avoid crond detection on host OS

Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
---
 tools/e2fsprogs/Makefile                      |  4 ++--
 tools/e2fsprogs/patches/003-no-crond.patch    | 11 ++++++++++
 .../patches/003-openbsd-compat.patch          | 12 ----------
 .../e2fsprogs/patches/004-darwin-compat.patch | 22 -------------------
 4 files changed, 13 insertions(+), 36 deletions(-)
 create mode 100644 tools/e2fsprogs/patches/003-no-crond.patch
 delete mode 100644 tools/e2fsprogs/patches/003-openbsd-compat.patch
 delete mode 100644 tools/e2fsprogs/patches/004-darwin-compat.patch

diff --git a/tools/e2fsprogs/Makefile b/tools/e2fsprogs/Makefile
index db93c3beea..a4523137ac 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.44.5
-PKG_HASH:=ba5eb3069d69160d96818bb9700de9ab5a8458d9add1fd85d427c0000d34c5b9
+PKG_VERSION:=1.45.3
+PKG_HASH:=90d10066b815e27b0b4875f0d5e396c663e0bf55aa3ca10868978d10c6ffe595
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
diff --git a/tools/e2fsprogs/patches/003-no-crond.patch b/tools/e2fsprogs/patches/003-no-crond.patch
new file mode 100644
index 0000000000..87b50bff2b
--- /dev/null
+++ b/tools/e2fsprogs/patches/003-no-crond.patch
@@ -0,0 +1,11 @@
+--- a/configure
++++ b/configure
+@@ -14525,7 +14525,7 @@ $as_echo_n "checking for system crontab
+ 
+ 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${crond_dir}" >&5
+ $as_echo "${crond_dir}" >&6; }
+-		have_crond="yes"
++		have_crond="no"; with_crond_dir=""
+ 
+ else
+ 
diff --git a/tools/e2fsprogs/patches/003-openbsd-compat.patch b/tools/e2fsprogs/patches/003-openbsd-compat.patch
deleted file mode 100644
index 492b8a8860..0000000000
--- a/tools/e2fsprogs/patches/003-openbsd-compat.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/lib/blkid/getsize.c
-+++ b/lib/blkid/getsize.c
-@@ -29,6 +29,9 @@
- #include <fcntl.h>
- #ifdef HAVE_SYS_IOCTL_H
- #include <sys/ioctl.h>
-+#ifdef __OpenBSD__
-+#include <sys/dkio.h>
-+#endif
- #endif
- #ifdef HAVE_LINUX_FD_H
- #include <linux/fd.h>
diff --git a/tools/e2fsprogs/patches/004-darwin-compat.patch b/tools/e2fsprogs/patches/004-darwin-compat.patch
deleted file mode 100644
index d84aa121ca..0000000000
--- a/tools/e2fsprogs/patches/004-darwin-compat.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/lib/blkid/blkid_types.h.in
-+++ b/lib/blkid/blkid_types.h.in
-@@ -9,6 +9,8 @@
- 
- @ASM_TYPES_HEADER@
- 
-+#include <stdint.h>
-+
- #ifndef HAVE___U8
- #define HAVE___U8
- #ifdef __U8_TYPEDEF
---- a/lib/ext2fs/ext2_types.h.in
-+++ b/lib/ext2fs/ext2_types.h.in
-@@ -9,6 +9,8 @@
- 
- @ASM_TYPES_HEADER@
- 
-+#include <stdint.h>
-+
- #ifndef HAVE___U8
- #define HAVE___U8
- #ifdef __U8_TYPEDEF
-- 
2.30.2