commit: 80134effaa1cfff7c9dc6d9b72d356f5425f01d3 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Aug 17 01:57:54 2020 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Aug 17 01:58:01 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80134eff
sys-fs/ecryptfs-utils: fix musl build Include a simple patch from Alpine Linux to fix the build on musl. Closes: https://bugs.gentoo.org/715508 Package-Manager: Portage-3.0.2, Repoman-2.3.23 Signed-off-by: Sam James <sam <AT> gentoo.org> .../ecryptfs-utils/ecryptfs-utils-111_p20170609-r1.ebuild | 4 ++++ .../ecryptfs-utils/files/ecryptfs-utils-111-musl-fix.patch | 13 +++++++++++++ 2 files changed, 17 insertions(+) diff --git a/sys-fs/ecryptfs-utils/ecryptfs-utils-111_p20170609-r1.ebuild b/sys-fs/ecryptfs-utils/ecryptfs-utils-111_p20170609-r1.ebuild index 855dfb66132..d11d30dd0ff 100644 --- a/sys-fs/ecryptfs-utils/ecryptfs-utils-111_p20170609-r1.ebuild +++ b/sys-fs/ecryptfs-utils/ecryptfs-utils-111_p20170609-r1.ebuild @@ -39,6 +39,10 @@ DEPEND=" dev-libs/glib:2 " +PATCHES=( + "${FILESDIR}/${PN}-111-musl-fix.patch" +) + pkg_setup() { CONFIG_CHECK="~ECRYPT_FS" linux-info_pkg_setup diff --git a/sys-fs/ecryptfs-utils/files/ecryptfs-utils-111-musl-fix.patch b/sys-fs/ecryptfs-utils/files/ecryptfs-utils-111-musl-fix.patch new file mode 100644 index 00000000000..1d6de38e8cb --- /dev/null +++ b/sys-fs/ecryptfs-utils/files/ecryptfs-utils-111-musl-fix.patch @@ -0,0 +1,13 @@ +https://bugs.gentoo.org/715508 +https://git.alpinelinux.org/aports/tree/community/ecryptfs-utils/fix-build.patch?id=9e57b1f1197ee99b9f998472371042c42bffdc49 +--- a/src/utils/mount.ecryptfs_private.c 2016-01-22 18:04:52.000000000 +0200 ++++ b/src/utils/mount.ecryptfs_private.c 2017-01-20 08:39:31.877975729 +0200 +@@ -235,7 +235,7 @@ + * deceive other programs with a crafted /proc/self/*. See + * https://launchpad.net/bugs/1530566 for more details. + */ +- __SWORD_TYPE f_type_whitelist[] = { ++ static const uint32_t f_type_whitelist[] = { + 0x61756673 /* AUFS_SUPER_MAGIC */, + 0x9123683E /* BTRFS_SUPER_MAGIC */, + 0x00C36400 /* CEPH_SUPER_MAGIC */,
