| 1 |
commit: 80134effaa1cfff7c9dc6d9b72d356f5425f01d3 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Aug 17 01:57:54 2020 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Aug 17 01:58:01 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80134eff |
| 7 |
|
| 8 |
sys-fs/ecryptfs-utils: fix musl build |
| 9 |
|
| 10 |
Include a simple patch from Alpine Linux |
| 11 |
to fix the build on musl. |
| 12 |
|
| 13 |
Closes: https://bugs.gentoo.org/715508 |
| 14 |
Package-Manager: Portage-3.0.2, Repoman-2.3.23 |
| 15 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 16 |
|
| 17 |
.../ecryptfs-utils/ecryptfs-utils-111_p20170609-r1.ebuild | 4 ++++ |
| 18 |
.../ecryptfs-utils/files/ecryptfs-utils-111-musl-fix.patch | 13 +++++++++++++ |
| 19 |
2 files changed, 17 insertions(+) |
| 20 |
|
| 21 |
diff --git a/sys-fs/ecryptfs-utils/ecryptfs-utils-111_p20170609-r1.ebuild b/sys-fs/ecryptfs-utils/ecryptfs-utils-111_p20170609-r1.ebuild |
| 22 |
index 855dfb66132..d11d30dd0ff 100644 |
| 23 |
--- a/sys-fs/ecryptfs-utils/ecryptfs-utils-111_p20170609-r1.ebuild |
| 24 |
+++ b/sys-fs/ecryptfs-utils/ecryptfs-utils-111_p20170609-r1.ebuild |
| 25 |
@@ -39,6 +39,10 @@ DEPEND=" |
| 26 |
dev-libs/glib:2 |
| 27 |
" |
| 28 |
|
| 29 |
+PATCHES=( |
| 30 |
+ "${FILESDIR}/${PN}-111-musl-fix.patch" |
| 31 |
+) |
| 32 |
+ |
| 33 |
pkg_setup() { |
| 34 |
CONFIG_CHECK="~ECRYPT_FS" |
| 35 |
linux-info_pkg_setup |
| 36 |
|
| 37 |
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 |
| 38 |
new file mode 100644 |
| 39 |
index 00000000000..1d6de38e8cb |
| 40 |
--- /dev/null |
| 41 |
+++ b/sys-fs/ecryptfs-utils/files/ecryptfs-utils-111-musl-fix.patch |
| 42 |
@@ -0,0 +1,13 @@ |
| 43 |
+https://bugs.gentoo.org/715508 |
| 44 |
+https://git.alpinelinux.org/aports/tree/community/ecryptfs-utils/fix-build.patch?id=9e57b1f1197ee99b9f998472371042c42bffdc49 |
| 45 |
+--- a/src/utils/mount.ecryptfs_private.c 2016-01-22 18:04:52.000000000 +0200 |
| 46 |
++++ b/src/utils/mount.ecryptfs_private.c 2017-01-20 08:39:31.877975729 +0200 |
| 47 |
+@@ -235,7 +235,7 @@ |
| 48 |
+ * deceive other programs with a crafted /proc/self/*. See |
| 49 |
+ * https://launchpad.net/bugs/1530566 for more details. |
| 50 |
+ */ |
| 51 |
+- __SWORD_TYPE f_type_whitelist[] = { |
| 52 |
++ static const uint32_t f_type_whitelist[] = { |
| 53 |
+ 0x61756673 /* AUFS_SUPER_MAGIC */, |
| 54 |
+ 0x9123683E /* BTRFS_SUPER_MAGIC */, |
| 55 |
+ 0x00C36400 /* CEPH_SUPER_MAGIC */, |
Archives