From 8fd509169644e456f21e0f2a26dbb8745c8fcb6a Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Mon, 14 Jan 2019 16:29:18 -0800
Subject: [PATCH] e2fsprogs: Update to 1.44.5

Added e4crypt tool for encrypting files and directories. To work properly
requires kernel and work on keyutils. That will be done in a future commit

Some top-level reorganization for consistency between packages.

Tested on GnuBee PC1 (mt7621).

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 package/utils/e2fsprogs/Makefile              | 20 +++++++++++---
 .../e2fsprogs/patches/000-relocatable.patch   | 26 +++++++------------
 2 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/package/utils/e2fsprogs/Makefile b/package/utils/e2fsprogs/Makefile
index a40e7bd3a7..1ed6280eda 100644
--- a/package/utils/e2fsprogs/Makefile
+++ b/package/utils/e2fsprogs/Makefile
@@ -8,13 +8,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=e2fsprogs
-PKG_VERSION:=1.44.3
-PKG_HASH:=5d899f7d30f481cc0c6a049ebe26ebe145f1b524182ea1ecde4086162d4e4bb6
-PKG_RELEASE:=2
+PKG_VERSION:=1.44.5
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@KERNEL/linux/kernel/people/tytso/e2fsprogs/v$(PKG_VERSION)/
+PKG_HASH:=ba5eb3069d69160d96818bb9700de9ab5a8458d9add1fd85d427c0000d34c5b9
+
 PKG_LICENSE:=GPL-2.0
+PKG_LICENSE_FILES:=NOTICE
 PKG_CPE_ID:=cpe:/a:e2fsprogs_project:e2fsprogs
 
 PKG_BUILD_DEPENDS:=util-linux e2fsprogs/host
@@ -110,6 +112,12 @@ $(call Package/e2fsprogs)
   DEPENDS:= +e2fsprogs
 endef
 
+define Package/e4crypt
+$(call Package/e2fsprogs)
+  TITLE:=Ext4 Filesystem encryption utility
+  DEPENDS:= +e2fsprogs
+endef
+
 define Package/filefrag
 $(call Package/e2fsprogs)
   TITLE:=Ext2 Filesystem file fragmentation report utility
@@ -281,6 +289,11 @@ define Package/e2freefrag/install
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/e2freefrag $(1)/usr/sbin/
 endef
 
+define Package/e4crypt/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/e4crypt $(1)/usr/sbin/
+endef
+
 define Package/filefrag/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/filefrag $(1)/usr/sbin/
@@ -311,6 +324,7 @@ $(eval $(call BuildPackage,resize2fs))
 $(eval $(call BuildPackage,badblocks))
 $(eval $(call BuildPackage,dumpe2fs))
 $(eval $(call BuildPackage,e2freefrag))
+$(eval $(call BuildPackage,e4crypt))
 $(eval $(call BuildPackage,filefrag))
 $(eval $(call BuildPackage,debugfs))
 $(eval $(call BuildPackage,chattr))
diff --git a/package/utils/e2fsprogs/patches/000-relocatable.patch b/package/utils/e2fsprogs/patches/000-relocatable.patch
index 017aca1b05..0bf226f9ea 100644
--- a/package/utils/e2fsprogs/patches/000-relocatable.patch
+++ b/package/utils/e2fsprogs/patches/000-relocatable.patch
@@ -1,46 +1,40 @@
 --- a/lib/et/compile_et.sh.in
 +++ b/lib/et/compile_et.sh.in
-@@ -2,9 +2,15 @@
+@@ -2,8 +2,14 @@
  #
  #
  
--datarootdir=@datarootdir@
 -AWK=@AWK@
 -DIR=@datadir@/et
 +if test "x$STAGING_DIR" = x ; then
-+	datarootdir=@datarootdir@
 +	AWK=@AWK@
 +	DIR=@datadir@/et
 +else
-+	datarootdir="$STAGING_DIR/../hostpkg/share"
 +	AWK=awk
-+	DIR="$datarootdir/et"
++	DIR="$STAGING_DIR/../hostpkg/share/et"
 +fi
++
  
  if test "$1" = "--build-tree" ; then
      shift;
 --- a/lib/ss/mk_cmds.sh.in
 +++ b/lib/ss/mk_cmds.sh.in
-@@ -1,11 +1,17 @@
- #!/bin/sh
+@@ -2,10 +2,16 @@
  #
  #
--
--datarootdir=@datarootdir@
+ 
 -DIR=@datadir@/ss
 -AWK=@AWK@
--SED=@SED@
+ SED=sed
+ 
 +if test "x$STAGING_DIR" = x ; then
-+	datarootdir=@datarootdir@
 +	DIR=@datadir@/ss
 +	AWK=@AWK@
-+	SED=@SED@
 +else
-+	datarootdir="$STAGING_DIR/../hostpkg/share"
-+	DIR="$datarootdir/ss"
++	DIR="$STAGING_DIR/../hostpkg/share/ss"
 +	AWK=awk
-+	SED=sed
 +fi
- 
++
  for as_var in \
    LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
+   LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \