package/ecryptfs-utils: bump version to 109
PATCH 1/2 package/ecryptfs-utils: bump version to 109
Signed-off-by Bernd Kuhls <[email protected]>
--- package/ecryptfs-utils/ecryptfs-utils.hash | 4 ++-- package/ecryptfs-utils/ecryptfs-utils.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
package/ecryptfs-utils/ecryptfs-utils.hash +2 -2
@@ -1,2 +1,2 @@ -# From https://launchpad.net/ecryptfs/trunk/104/+download/ecryptfs-utils_104.orig.tar.gz/+md5 -md5 6ae93822bcf0d15470516c30a3deee32 ecryptfs-utils_104.orig.tar.gz +# From https://launchpad.net/ecryptfs/trunk/109/+download/ecryptfs-utils_109.orig.tar.gz/+md5 +md5 8e33f096c8cb8288f9c29a9936cd0d28 ecryptfs-utils_109.orig.tar.gz
package/ecryptfs-utils/ecryptfs-utils.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -ECRYPTFS_UTILS_VERSION = 104 +ECRYPTFS_UTILS_VERSION = 109 ECRYPTFS_UTILS_SOURCE = ecryptfs-utils_$(ECRYPTFS_UTILS_VERSION).orig.tar.gz ECRYPTFS_UTILS_SITE = https://launchpad.net/ecryptfs/trunk/$(ECRYPTFS_UTILS_VERSION)/+download ECRYPTFS_UTILS_LICENSE = GPLv2+
Signature · 1 line
2.7.0.rc3
PATCH 2/2 package/ecryptfs-utils: fix musl build
The autobuilders did not catch the error yet because they failed earlier with other packages, but I am continuing the build based on the defconfig from:
http://autobuild.buildroot.net/results/6fb/6fbe96af007803acfe9deacf26399cb19e5f2b47/defconfig
Signed-off-by Bernd Kuhls <[email protected]>
--- package/ecryptfs-utils/0001-musl.patch | 35 ++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 package/ecryptfs-utils/0001-musl.patch
package/ecryptfs-utils/0001-musl.patch new file +35 -0
@@ -0,0 +1,35 @@ +fix musl build + +Patch inspired by +https://github.com/kraj/meta-musl/blob/master/recipes-core/util-linux/util-linux-2.25/0001-switch_root-use-typeof-instead-of-__SWORD_TYPE-for-s.patch + +Signed-off-by: Bernd Kuhls <[email protected]> + +diff -uNr ecryptfs-utils-109.org/src/utils/mount.ecryptfs_private.c ecryptfs-utils-109/src/utils/mount.ecryptfs_private.c +--- ecryptfs-utils-109.org/src/utils/mount.ecryptfs_private.c 2016-01-22 17:04:52.000000000 +0100 ++++ ecryptfs-utils-109/src/utils/mount.ecryptfs_private.c 2016-01-24 16:52:37.000000000 +0100 +@@ -224,6 +224,7 @@ + + static int check_cwd_f_type() + { ++ struct statfs buf; + /** + * This is *not* a list of compatible lower filesystems list for + * eCryptfs. This is a list of filesystems that we reasonably expect to +@@ -235,7 +236,7 @@ + * deceive other programs with a crafted /proc/self/*. See + * https://launchpad.net/bugs/1530566 for more details. + */ +- __SWORD_TYPE f_type_whitelist[] = { ++ typeof(buf.f_type) f_type_whitelist[] = { + 0x61756673 /* AUFS_SUPER_MAGIC */, + 0x9123683E /* BTRFS_SUPER_MAGIC */, + 0x00C36400 /* CEPH_SUPER_MAGIC */, +@@ -259,7 +260,6 @@ + 0x58465342 /* XFS_SB_MAGIC */, + 0x2FC12FC1 /* ZFS_SUPER_MAGIC */, + }; +- struct statfs buf; + size_t i, whitelist_len; + + if (statfs(".", &buf) != 0) {
Signature · 1 line
2.7.0.rc3
PATCH 1/2 package/ecryptfs-utils: bump version to 109
In reply to Bernd KuhlsDear Bernd Kuhls,
Quoted 5 lines · Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>--- package/ecryptfs-utils/ecryptfs-utils.hash | 4 ++-- package/ecryptfs-utils/ecryptfs-utils.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
Both applied. Please submit the patch in PATCH 2/2 to the upstream project. It is really important that as many as those musl fixes flow into the upstream projects, as we don't want to keep hundreds of patches in Buildroot.
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com