From: "akuster" <akuster808@gmail.com>
To: yocto@lists.yoctoproject.org
Subject: [meta-security][PATCH 3/7] ecryptfs-utils: fix musl build
Date: Fri, 9 Oct 2020 07:08:08 -0700 [thread overview]
Message-ID: <20201009140812.21765-3-akuster808@gmail.com> (raw)
In-Reply-To: <20201009140812.21765-1-akuster808@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../ecryptfs-utils/ecryptfs-utils_111.bb | 1 +
.../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
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 <values.h>
+ #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.
--
2.17.1
next prev parent reply other threads:[~2020-10-09 14:08 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-09 14:08 [meta-security][PATCH 1/7] apparmor: fix build for on musl akuster
2020-10-09 14:08 ` [meta-security][PATCH 2/7] gitlab-ci: add qemux86 and qemuarm64 musl builds akuster
2020-10-09 14:08 ` akuster [this message]
2020-10-09 14:08 ` [meta-security][PATCH 4/7] libest: fix musl build akuster
2020-10-09 14:08 ` [meta-security][PATCH 5/7] sssd: update to latest ltm 1.16.5 akuster
2020-10-09 14:08 ` [meta-security][PATCH 6/7] packagegroup-core-security: remove clamav from musl image akuster
2020-10-09 14:08 ` [meta-security][PATCH 7/7] suricata: update to 4.1.9 akuster
[not found] ` <163C5828A1566392.8231@lists.yoctoproject.org>
2020-10-09 14:27 ` [yocto] [meta-security][PATCH 5/7] sssd: update to latest ltm 1.16.5 akuster
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201009140812.21765-3-akuster808@gmail.com \
--to=akuster808@gmail.com \
--cc=yocto@lists.yoctoproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox