From b3f10d2285fa68da210c03aaecb21a739a1afd96 Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Wed, 7 Oct 2020 12:29:21 -0700 Subject: ecryptfs-utils: fix musl build Signed-off-by: Armin Kuster --- recipes-security/ecryptfs-utils/ecryptfs-utils_111.bb | 1 + .../ecryptfs-utils/files/define_musl_sword_type.patch | 15 +++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 recipes-security/ecryptfs-utils/files/define_musl_sword_type.patch (limited to 'recipes-security/ecryptfs-utils') diff --git a/recipes-security/ecryptfs-utils/ecryptfs-utils_111.bb b/recipes-security/ecryptfs-utils/ecryptfs-utils_111.bb index d8cd06f..4a99b5a 100644 --- a/recipes-security/ecryptfs-utils/ecryptfs-utils_111.bb +++ b/recipes-security/ecryptfs-utils/ecryptfs-utils_111.bb @@ -16,6 +16,7 @@ SRC_URI = "\ file://ecryptfs-utils-CVE-2016-6224.patch \ file://0001-avoid-race-condition.patch \ file://ecryptfs.service \ + file://define_musl_sword_type.patch \ " SRC_URI[md5sum] = "83513228984f671930752c3518cac6fd" diff --git a/recipes-security/ecryptfs-utils/files/define_musl_sword_type.patch b/recipes-security/ecryptfs-utils/files/define_musl_sword_type.patch new file mode 100644 index 0000000..3b29be0 --- /dev/null +++ b/recipes-security/ecryptfs-utils/files/define_musl_sword_type.patch @@ -0,0 +1,15 @@ +Index: ecryptfs-utils-111/src/utils/mount.ecryptfs_private.c +=================================================================== +--- ecryptfs-utils-111.orig/src/utils/mount.ecryptfs_private.c ++++ ecryptfs-utils-111/src/utils/mount.ecryptfs_private.c +@@ -45,6 +45,10 @@ + #include + #include "../include/ecryptfs.h" + ++#ifndef __SWORD_TYPE ++typedef __typeof__( ((struct statfs *)0)->f_type ) __SWORD_TYPE; ++#endif ++ + /* Perhaps a future version of this program will allow these to be configurable + * by the system administrator (or user?) at run time. For now, these are set + * to reasonable values to reduce the burden of input validation. -- cgit v1.2.2-1-g5e49