| 1 |
commit: 2f1281ade31419d6e1f9370790faab77b7a8d1f1 |
| 2 |
Author: Yixun Lan <dlan <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Aug 16 09:01:31 2022 +0000 |
| 4 |
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Aug 16 22:53:40 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f1281ad |
| 7 |
|
| 8 |
net-fs/autofs: fix redefinition of struct mount_attr err |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/863791 |
| 11 |
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org> |
| 12 |
|
| 13 |
net-fs/autofs/autofs-5.1.8-r1.ebuild | 1 + |
| 14 |
.../autofs/files/autofs-5.1.8-mount_conflict.patch | 30 ++++++++++++++++++++++ |
| 15 |
2 files changed, 31 insertions(+) |
| 16 |
|
| 17 |
diff --git a/net-fs/autofs/autofs-5.1.8-r1.ebuild b/net-fs/autofs/autofs-5.1.8-r1.ebuild |
| 18 |
index acf7831595cd..908f5077ea02 100644 |
| 19 |
--- a/net-fs/autofs/autofs-5.1.8-r1.ebuild |
| 20 |
+++ b/net-fs/autofs/autofs-5.1.8-r1.ebuild |
| 21 |
@@ -45,6 +45,7 @@ PATCHES=( |
| 22 |
"${WORKDIR}"/${P}-patches/ |
| 23 |
"${FILESDIR}/${P}-dmalloc.patch" |
| 24 |
"${FILESDIR}/${P}-nfsv4-mount.patch" |
| 25 |
+ "${FILESDIR}/${P}-mount_conflict.patch" |
| 26 |
) |
| 27 |
|
| 28 |
pkg_setup() { |
| 29 |
|
| 30 |
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 |
| 31 |
new file mode 100644 |
| 32 |
index 000000000000..e2a94bf82542 |
| 33 |
--- /dev/null |
| 34 |
+++ b/net-fs/autofs/files/autofs-5.1.8-mount_conflict.patch |
| 35 |
@@ -0,0 +1,30 @@ |
| 36 |
+Avoid conflicts between sys/mount.h and linux/mount.h |
| 37 |
+ |
| 38 |
+linux/fs.h includes linux/mount.h and this include file is unused so |
| 39 |
+do not include it and avoid conflict too with glibc 2.36+ see [1] |
| 40 |
+ |
| 41 |
+[1] https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E |
| 42 |
+ |
| 43 |
+Upstream-Status: Pending |
| 44 |
+ |
| 45 |
+Signed-off-by: Khem Raj <raj.khem@×××××.com> |
| 46 |
+--- a/modules/parse_amd.c |
| 47 |
++++ b/modules/parse_amd.c |
| 48 |
+@@ -27,7 +27,6 @@ |
| 49 |
+ #include <sys/utsname.h> |
| 50 |
+ #include <netinet/in.h> |
| 51 |
+ #include <sys/mount.h> |
| 52 |
+-#include <linux/fs.h> |
| 53 |
+ |
| 54 |
+ #define MODULE_PARSE |
| 55 |
+ #include "automount.h" |
| 56 |
+--- a/modules/parse_sun.c |
| 57 |
++++ b/modules/parse_sun.c |
| 58 |
+@@ -30,7 +30,6 @@ |
| 59 |
+ #include <sys/utsname.h> |
| 60 |
+ #include <netinet/in.h> |
| 61 |
+ #include <sys/mount.h> |
| 62 |
+-#include <linux/fs.h> |
| 63 |
+ |
| 64 |
+ #define MODULE_PARSE |
| 65 |
+ #include "automount.h" |
Archives