commit: 2f1281ade31419d6e1f9370790faab77b7a8d1f1 Author: Yixun Lan <dlan <AT> gentoo <DOT> org> AuthorDate: Tue Aug 16 09:01:31 2022 +0000 Commit: Yixun Lan <dlan <AT> gentoo <DOT> org> CommitDate: Tue Aug 16 22:53:40 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f1281ad
net-fs/autofs: fix redefinition of struct mount_attr err Closes: https://bugs.gentoo.org/863791 Signed-off-by: Yixun Lan <dlan <AT> gentoo.org> net-fs/autofs/autofs-5.1.8-r1.ebuild | 1 + .../autofs/files/autofs-5.1.8-mount_conflict.patch | 30 ++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/net-fs/autofs/autofs-5.1.8-r1.ebuild b/net-fs/autofs/autofs-5.1.8-r1.ebuild index acf7831595cd..908f5077ea02 100644 --- a/net-fs/autofs/autofs-5.1.8-r1.ebuild +++ b/net-fs/autofs/autofs-5.1.8-r1.ebuild @@ -45,6 +45,7 @@ PATCHES=( "${WORKDIR}"/${P}-patches/ "${FILESDIR}/${P}-dmalloc.patch" "${FILESDIR}/${P}-nfsv4-mount.patch" + "${FILESDIR}/${P}-mount_conflict.patch" ) pkg_setup() { diff --git a/net-fs/autofs/files/autofs-5.1.8-mount_conflict.patch b/net-fs/autofs/files/autofs-5.1.8-mount_conflict.patch new file mode 100644 index 000000000000..e2a94bf82542 --- /dev/null +++ b/net-fs/autofs/files/autofs-5.1.8-mount_conflict.patch @@ -0,0 +1,30 @@ +Avoid conflicts between sys/mount.h and linux/mount.h + +linux/fs.h includes linux/mount.h and this include file is unused so +do not include it and avoid conflict too with glibc 2.36+ see [1] + +[1] https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.k...@gmail.com> +--- a/modules/parse_amd.c ++++ b/modules/parse_amd.c +@@ -27,7 +27,6 @@ + #include <sys/utsname.h> + #include <netinet/in.h> + #include <sys/mount.h> +-#include <linux/fs.h> + + #define MODULE_PARSE + #include "automount.h" +--- a/modules/parse_sun.c ++++ b/modules/parse_sun.c +@@ -30,7 +30,6 @@ + #include <sys/utsname.h> + #include <netinet/in.h> + #include <sys/mount.h> +-#include <linux/fs.h> + + #define MODULE_PARSE + #include "automount.h"
