From patchwork Fri Jan 11 20:26:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 1023765 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="poDJA/g0"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="iGtivdxm"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43bvXV0x56z9sDT for ; Sat, 12 Jan 2019 07:26:29 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:Message-Id:Date:To: From:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=wUYvoXre6UcfH3ehOnn3QcmOGhZ2khmUrUOjjuJ4Pw8=; b=poDJA/g05WxyzW PAI71gKWjCc4SDEQ3E26ohHsyLrNkR3oY+8e3dBJfhuUtI/LZTecegzsrkXu3W7lpLe/cWPwTk03c 4MQjCttus2ewHDHpNrq2x6NWfvxEnYjsgkBki+AVnJmHtd13IZSuAggwIJ3CDfLaXWUHE/X5ACiMr zPEAVoAKIgtNKiGCTX1lBYIWtys5mp2nviGylOr30ocBxWKYNvJ4EdfZhyVNHGqA3sSWEeOgMjfpv 6ANIMn4/y/2YcvNBfxzniPtqTe9ni0QbnZMilbImxLg1zA4LzrziG316wZXL9PG6g88jHySuRNbj0 Jy0biRAQLKBHPK2isMnA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gi3Nl-0006Hl-Fc; Fri, 11 Jan 2019 20:26:21 +0000 Received: from mail-pg1-x542.google.com ([2607:f8b0:4864:20::542]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gi3Nh-0006HJ-Tz for openwrt-devel@lists.openwrt.org; Fri, 11 Jan 2019 20:26:19 +0000 Received: by mail-pg1-x542.google.com with SMTP id n2so6765544pgm.3 for ; Fri, 11 Jan 2019 12:26:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=EQ9x18i7/tAFNO2K9rr75Bmqrz945JbQIK22mbyFAyo=; b=iGtivdxmZ5oeRMYtxEn4y8e458VtkRkim11LuynyAH/CoqrVMcioB8gx786z/adnIJ 8DiA5a8T4+8khM13Tdi/rYDhT1ZGb96C4aWla2KaHzO/hnY29iReM1ygHi8Fp3Y9/gFl fM1ERIzslE3wfmltDvME2IlkrIC01Slgf9P5Eww08MnptDPHMACa7kkGM6chXd1vR0G/ T7JoDHjO6EZ5K1+XTzgj/rlr1E9mnlTWbTNxEFmdMcuX3LAxJSPGQpx6emrCQ/vsOBW0 vrizzjhUv5grLPIILnZaTP7IbjIpTPckNawREQA1Il4w72Q5ANUvjOnOt7JMCcBiNhls N6SQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=EQ9x18i7/tAFNO2K9rr75Bmqrz945JbQIK22mbyFAyo=; b=U+keXOtmzgKQ1W1N8rqeNhgjsswANUxwFmOB1uEoWjKaiJiAYfZo2cejzK7pzPDj2h ZMriF6ONyp+3SExHYwjc4b2Q4bH9Ti9IckOZ1rfgCZQLv71CDG5na79zPzAkND89V1J4 ZP/hbYq1Dl2i7oCHa00Li0asHJOlkuXGvmG8SVXVEoz5AU/SGvekUHNXD/f3HcgOoOid aaZxDOyhfnboL6rPTXi6iJ6jRMCWoFDz31NuYn2kXT/Afu2j2e+5FZB2RWgnIB47DyNW vdPrqOC92K7YOtto3pCYnOIjck8iKRd6k6bPBjZY79yrFQ8tFO+eEDIsGPEssjZV81fE Bwig== X-Gm-Message-State: AJcUukdZnbU53iEJUcACmmNAS0ob/lHGKh8+a6p3Ny2U8C2M2x1dSpY4 OX97pgCqZxdhqL5zqT0uHUyny08BmTg= X-Google-Smtp-Source: ALg8bN4nWHTP2c5viDX2K3s0L5HqI1/98gc1f/DJHaXfpobrpop/fp6xy2psdOJ8NQi7LRihEsogHQ== X-Received: by 2002:a65:520a:: with SMTP id o10mr15089137pgp.276.1547238374765; Fri, 11 Jan 2019 12:26:14 -0800 (PST) Received: from mangix-pc.lan (astound-69-42-16-32.ca.astound.net. [69.42.16.32]) by smtp.gmail.com with ESMTPSA id a18sm104647291pgj.30.2019.01.11.12.26.13 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Jan 2019 12:26:14 -0800 (PST) From: Rosen Penev To: openwrt-devel@lists.openwrt.org Date: Fri, 11 Jan 2019 12:26:12 -0800 Message-Id: <20190111202612.15508-1-rosenp@gmail.com> X-Mailer: git-send-email 2.17.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190111_122617_966806_FC1E00E2 X-CRM114-Status: UNSURE ( 9.24 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:542 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (rosenp[at]gmail.com) -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid Subject: [OpenWrt-Devel] [PATCH] e2fsprogs: Update to 1.43.5 X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org 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 Remove patch 000-relocatable.patch as it seems to be no longer needed. Some top-level reorganization for consistency between packages. Tested on GnuBee PC1 (mt7621). Signed-off-by: Rosen Penev --- package/utils/e2fsprogs/Makefile | 18 +++++++- .../e2fsprogs/patches/000-relocatable.patch | 46 ------------------- 2 files changed, 16 insertions(+), 48 deletions(-) delete mode 100644 package/utils/e2fsprogs/patches/000-relocatable.patch diff --git a/package/utils/e2fsprogs/Makefile b/package/utils/e2fsprogs/Makefile index 48f812a30c..edb9acfc76 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_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 @@ -107,6 +109,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 @@ -278,6 +286,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/ @@ -308,6 +321,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 deleted file mode 100644 index 017aca1b05..0000000000 --- a/package/utils/e2fsprogs/patches/000-relocatable.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- a/lib/et/compile_et.sh.in -+++ b/lib/et/compile_et.sh.in -@@ -2,9 +2,15 @@ - # - # - --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" -+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 - # - # -- --datarootdir=@datarootdir@ --DIR=@datadir@/ss --AWK=@AWK@ --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" -+ AWK=awk -+ SED=sed -+fi - - for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \