From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EBF751382C5 for ; Wed, 4 Apr 2018 12:08:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EB52FE0D0B; Wed, 4 Apr 2018 12:08:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id ADED3E0D0B for ; Wed, 4 Apr 2018 12:08:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3FC61335C06 for ; Wed, 4 Apr 2018 12:08:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 87494264 for ; Wed, 4 Apr 2018 12:08:54 +0000 (UTC) From: "Göktürk Yüksek" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Göktürk Yüksek" Message-ID: <1522843712.9d427990c39a9ab3cf97b6feb243e9f28620f79c.gokturk@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/ext4magic/, sys-fs/ext4magic/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/ext4magic/ext4magic-0.3.2-r1.ebuild sys-fs/ext4magic/files/ext4magic-0.3.2-i_dir_acl.patch X-VCS-Directories: sys-fs/ext4magic/ sys-fs/ext4magic/files/ X-VCS-Committer: gokturk X-VCS-Committer-Name: Göktürk Yüksek X-VCS-Revision: 9d427990c39a9ab3cf97b6feb243e9f28620f79c X-VCS-Branch: master Date: Wed, 4 Apr 2018 12:08:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 393ead9d-0bed-4ee3-87e9-bb4afdc5c78e X-Archives-Hash: 2612f06ed7f52c72d757bc404eafbe2b commit: 9d427990c39a9ab3cf97b6feb243e9f28620f79c Author: Göktürk Yüksek gentoo org> AuthorDate: Wed Apr 4 12:07:03 2018 +0000 Commit: Göktürk Yüksek gentoo org> CommitDate: Wed Apr 4 12:08:32 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d427990 sys-fs/ext4magic: fix #650074 Also bump EAPI and enable USE=expert_mode by default. Bug: https://sourceforge.net/p/ext4magic/tickets/10/ Closes: https://bugs.gentoo.org/650074 Package-Manager: Portage-2.3.27, Repoman-2.3.9 sys-fs/ext4magic/ext4magic-0.3.2-r1.ebuild | 36 ++++++++++++++++++++++ .../files/ext4magic-0.3.2-i_dir_acl.patch | 32 +++++++++++++++++++ 2 files changed, 68 insertions(+) diff --git a/sys-fs/ext4magic/ext4magic-0.3.2-r1.ebuild b/sys-fs/ext4magic/ext4magic-0.3.2-r1.ebuild new file mode 100644 index 00000000000..f26ce3b1d1d --- /dev/null +++ b/sys-fs/ext4magic/ext4magic-0.3.2-r1.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="Tool for recovery of deleted or overwritten files on ext3/ext4 filesystems" +HOMEPAGE="https://sourceforge.net/projects/ext4magic/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debug +expert-mode file-attr" + +RDEPEND="app-arch/bzip2 + >=sys-apps/file-5.04 + sys-apps/util-linux + >=sys-fs/e2fsprogs-1.41.9 + sys-libs/zlib" +DEPEND="${RDEPEND}" + +DOCS="AUTHORS ChangeLog NEWS README TODO" + +PATCHES=( + "${FILESDIR}"/${PN}-0.3.2-sysmacros.patch + "${FILESDIR}"/${PN}-0.3.2-i_dir_acl.patch +) + +src_configure() { + # build-system incorrectly recognizes '--disable-feature' options as enabled! + econf \ + $(usex debug '--enable-debug' '') \ + $(usex debug '--enable-debug-magic' '') \ + $(usex expert-mode '--enable-expert-mode' '') \ + $(usex file-attr '--enable-file-attr' '') +} diff --git a/sys-fs/ext4magic/files/ext4magic-0.3.2-i_dir_acl.patch b/sys-fs/ext4magic/files/ext4magic-0.3.2-i_dir_acl.patch new file mode 100644 index 00000000000..9c7e86a2af1 --- /dev/null +++ b/sys-fs/ext4magic/files/ext4magic-0.3.2-i_dir_acl.patch @@ -0,0 +1,32 @@ +From: Gokturk Yuksek +Subject: [PATCH] src/inode: supersede i_dir_acl with i_size_high + +The upstream has removed the macro that defined i_dir_acl as +i_size_high which causes a build failure with the later versions of +e2fsprogs. Replace every reference to inode->i_dir_acl with +inode->i_size_high. + +Bug: https://bugs.gentoo.org/650074 +Bug: https://sourceforge.net/p/ext4magic/tickets/10/ + +[0] https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/commit/?id=578fcbfd2e61e0b13ce8c7b62804c941d6c1eb8e + +--- a/src/inode.c ++++ b/src/inode.c +@@ -404,14 +404,14 @@ + fprintf(out, + "%sFile ACL: %d Directory ACL: %d Translator: %d\n", + prefix, +- inode->i_file_acl, LINUX_S_ISDIR(inode->i_mode) ? inode->i_dir_acl : 0, ++ inode->i_file_acl, LINUX_S_ISDIR(inode->i_mode) ? inode->i_size_high : 0, + inode->osd1.hurd1.h_i_translator); + else + fprintf(out, "%sFile ACL: %llu Directory ACL: %d\n", + prefix, + inode->i_file_acl | ((long long) + (inode->osd2.linux2.l_i_file_acl_high) << 32), +- LINUX_S_ISDIR(inode->i_mode) ? inode->i_dir_acl : 0); ++ LINUX_S_ISDIR(inode->i_mode) ? inode->i_size_high : 0); + if (os == EXT2_OS_LINUX) + fprintf(out, "%sLinks: %d Blockcount: %llu\n", + prefix, inode->i_links_count,