gentoo auto-resync : 17:08:2022 - 02:31:41

4 files changed, 33 insertions, 1 deletions

diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 6bad1e4af335..527c72688297 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/autofs/Manifest b/net-fs/autofs/Manifest
index ae42b24d9b94..c625c01f412f 100644
--- a/net-fs/autofs/Manifest
+++ b/net-fs/autofs/Manifest
@@ -2,6 +2,7 @@ AUX autofs-5.1.6-glibc.patch 2797 BLAKE2B b6ea2fc98c0634208103208fe562f77d3cd77e
 AUX autofs-5.1.6-musl.patch 215 BLAKE2B 885442f26b482ec28734452d3a987759d761c8d21a4e1457fe9c04be928422473f9a1743b0355c5616486e74bd457faf170eb12b7bb3f790b33314205968f20a SHA512 643fb4453d89269cb2252c9e23f09da657fde4f0c14b8933b950e03c14b8723ec848ec2d5a44da4980895ff6d1cb63c3dfc6074de629a694a370410b270b3886
 AUX autofs-5.1.6-pid.patch 453 BLAKE2B 292388f1d192a1e8763402dbc4d5738d112fbbf4409a9fc8215a3ba9987639381fa0ccc29b28f5fe794dc44c98ebc0177d3ecd28177ff6657201f8ba478febda SHA512 78dfd13e06a7adec4336b18a03a1c0bd9d651ce01bf5e716a75d5574e033db9c3fff3baf660c4a6ad757403db5242a7abecf68cdb4cc9bb4d005992b6fe44ca6
 AUX autofs-5.1.8-dmalloc.patch 1538 BLAKE2B be01cac480fa9e956e44f497ec0b06b824f54714e636e6394b10b551fa855d5f5901668d2079b424754e264d7d84417ff8f7009d52c1b6b7830ea2738f96cfbe SHA512 bba8122f1b183cfeea5556ae1761ec0607d8af88a0f26ca0e3926c8221c0902d9bf8c6c81afb8ce083850fda0fc882cc1660fd71a1a1e580fdbe5a7d76ee12a4
+AUX autofs-5.1.8-mount_conflict.patch 801 BLAKE2B a9c26656e04c2e9b3be849012c46008521111c922ea4ac40de8cd724a9defe3e8432f6919c808d165f8c45f7ccd46ec1d4fe694213879cd4763f648159d3f091 SHA512 e72cdafc793985af661633bc9c11a66b03c7dd68151a7fadefcd54039ad5a803307e6fe52a2ed178c7373f6e42747332e8b8f2b08b8b0b02005942fcde38da43
 AUX autofs-5.1.8-nfsv4-mount.patch 3512 BLAKE2B cee090bbdfc65a92ddf18ed3f34d0458c89c678520cb517aaf0d44bcd3324c1650055abeac9edd915c81bb69dd9245386e1d008aa9dc536f8777b5bd41ce7c69 SHA512 09d3a4715c2e05292c48874ab4f62ce15b3110a682bfe86986341b34b52db19d92d48ee38181072b17817dec9d180f161eb4598dcff44a3ac551d25d356ec62b
 AUX autofs5-auto.master 693 BLAKE2B b3c601beb0c41ed32c6793c00a39ee65bb1f5b47fa0de6ad1fa70f7f15ee6c882058d657fae09807b86d19f1f1017306193cb18a3ce5115e31a53a5913e29af5 SHA512 3be4e92250cb678a6d8454b5703c48f6fac14653e1e89028917a627787e8785bfae1cac5a76b2d8a030fd2ec6e491e22488c19a2034cfeedf02e98c400a228dd
 AUX autofs5.initd 1558 BLAKE2B 253ce53d2b2b46f80606cfc654a45c710ae97649343fda7698f2b5af590c6bc1bf2f15912e5c86b626759eb89a659e293fa4bf6e28b5a84dc5a6b5e1a24615e7 SHA512 956e3753dfd56146a529522ff68e311c32906815ceec28afbe5ccc4e5da995dca0296f0824f583a6b7c713e443a6b6fe819bc2f18a116c8e82f2779d0a198afa
@@ -9,5 +10,5 @@ DIST autofs-5.1.6.tar.xz 315316 BLAKE2B 0c5e2351462505c6de0b12e510f0c08a625a0235
 DIST autofs-5.1.8-patches-0.tar.xz 3476 BLAKE2B a7fb146542f9cb0a8e93240d9c3f68ff7b569f4dc0e829103ae67ced6d04e110331d320ff429f6e6af03b7265a068ee648738691cd637080cf976f441fe10444 SHA512 73023735bf269e3214e38a4841b6b3a1edff30e5d925a62d3ca9e841726835793c1e242804233e696e946e63720f522ceeb82f78449d3597d3d39b727f4b8d24
 DIST autofs-5.1.8.tar.xz 327396 BLAKE2B 22ef626cc867c1ed4f1f859aebe2547c497c35dea712967de70158e85db590f5ffc26165e1479cfc64eb8070a9c43fd06b1570a82bd8bbbac70f2930e1841718 SHA512 6ee6283c0977c82848a654dc24745ee687f6916de441c3688fa91f67ca7295e632ee3808cc2358984a4b9f19841e6e1a91ab48aad6341ac8e63827fe8c32d223
 EBUILD autofs-5.1.6-r2.ebuild 3147 BLAKE2B 27a3f75a82c7791e2e837092875d98da4c4f3a7883a345b9acdf2e13feb16d81ed0ece76a59adea0163a9c0ebcb8107b2ae7b7ea19df2e0ea8cf87ff04dcd1a4 SHA512 33f373b040b6626d294da34043e83a8a272c9de46d57e4f5a5270f0e90c5edc6232eb328f580d843f609a8e01f93121dff27cb0bed2041138b238baa623446a4
-EBUILD autofs-5.1.8-r1.ebuild 3273 BLAKE2B 513cb668835ccbb6a4d8f86a54c6dd65c277025ac519a8beab1c0498ca125cc09579b4e8ad26ee9dd1383641d1ea9f942ba926c2f8985d245ac272b2ab66ecc6 SHA512 5b1efe1e0d300e1bb85485451079ca3f08fb92af5e24639c4a5060b63785b76c7fb668652b4ba4e544f644b8b5a85a7cadbb057973e53c0024dedb45912726dc
+EBUILD autofs-5.1.8-r1.ebuild 3314 BLAKE2B b4dce5a205faff0a263336175f65939fee48e7517c899eda1cc402d149132e96ec6995761f5157d5ce1a3650187c860ad2e01cdd89f5a29e3ec2ebf55feddcb9 SHA512 9a06afc376b7d268485c71c3baa633015057f17cb105a135a85187f4b68088e6483d723f055426169cd4ad68a5bab0b57fa06e899097fd8408b3a95753636b34
 MISC metadata.xml 870 BLAKE2B d2813cbc47232ecb5d5726672d038d72e9e5dd3078e915552f566a61bb2db7909d8b4d7d135d7c3ebba9c8f827121de2f42bd25c7c9fd975190f8bb67635affd SHA512 b1ee8b21924f1b6ade69603deff4ff5dc954f4f9161dce592b1676cad1e01dc2a0b4802877f8d4922a037f3e10b2f2085128f86cd2cf21f691c568d6a1f3a25d
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.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"