From 9d427990c39a9ab3cf97b6feb243e9f28620f79c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=B6kt=C3=BCrk=20Y=C3=BCksek?= Date: Wed, 4 Apr 2018 08:07:03 -0400 Subject: 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 --- .../files/ext4magic-0.3.2-i_dir_acl.patch | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 sys-fs/ext4magic/files/ext4magic-0.3.2-i_dir_acl.patch (limited to 'sys-fs/ext4magic/files/ext4magic-0.3.2-i_dir_acl.patch') 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 000000000000..9c7e86a2af15 --- /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, -- cgit v1.2.3