summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYixun Lan <dlan@gentoo.org>2022-08-16 17:01:31 +0800
committerYixun Lan <dlan@gentoo.org>2022-08-17 06:53:40 +0800
commit2f1281ade31419d6e1f9370790faab77b7a8d1f1 (patch)
treef035d0c1448e2299ec9421a933100736145a4925 /net-fs/autofs
parentdev-util/yamllint: drop 1.26.3-r1 (diff)
downloadgentoo-2f1281ade31419d6e1f9370790faab77b7a8d1f1.tar.gz
gentoo-2f1281ade31419d6e1f9370790faab77b7a8d1f1.tar.bz2
gentoo-2f1281ade31419d6e1f9370790faab77b7a8d1f1.zip
net-fs/autofs: fix redefinition of struct mount_attr err
Closes: https://bugs.gentoo.org/863791 Signed-off-by: Yixun Lan <dlan@gentoo.org>
Diffstat (limited to 'net-fs/autofs')
-rw-r--r--net-fs/autofs/autofs-5.1.8-r1.ebuild1
-rw-r--r--net-fs/autofs/files/autofs-5.1.8-mount_conflict.patch30
2 files changed, 31 insertions, 0 deletions
diff --git a/net-fs/autofs/autofs-5.1.8-r1.ebuild b/net-fs/autofs/autofs-5.1.8-r1.ebuild
index acf7831595c..908f5077ea0 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 00000000000..e2a94bf8254
--- /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.khem@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"