gentoo resync : 22.05.2021

4 files changed, 17 insertions, 2 deletions

diff --git a/net-fs/autofs/Manifest b/net-fs/autofs/Manifest
index dec1c0ff20d2..0a93e2d8396d 100644
--- a/net-fs/autofs/Manifest
+++ b/net-fs/autofs/Manifest
@@ -1,10 +1,11 @@
 AUX autofs-5.1.6-glibc.patch 2797 BLAKE2B b6ea2fc98c0634208103208fe562f77d3cd77e212215a0a346b2a1b9997fd1dc95bf8b42bd899884fd12d735219801308e0934a31553dfda275dc3eef9e07db0 SHA512 83d4808c4f5fe811d675372f7af59c6369d93818bfdb5aac26d5372baf1ef45f71208206fe6176b577294df8ce0dac145d7afe335f028f0a0cf3e6787dfb0bbc
+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.7-glibc.patch 2393 BLAKE2B 3b38f6c869c5dbd29ca7835e4a46b285b6f8dd9e915b8bb0a3a13978e23675b4e695c43d8404f574f4f82a71effa5cf5cad86578893b4e148d0f69241ea3e80f SHA512 6e38ba59e2ce1d3c64ca19e3766438220fb89f3880a59443b6b3dc057f90b6b7ebf003a5cdc34fb12cf1fdc4eba990b02045bf6ee6888b9c49cfb249a77305ed
 AUX autofs5-auto.master 693 BLAKE2B b3c601beb0c41ed32c6793c00a39ee65bb1f5b47fa0de6ad1fa70f7f15ee6c882058d657fae09807b86d19f1f1017306193cb18a3ce5115e31a53a5913e29af5 SHA512 3be4e92250cb678a6d8454b5703c48f6fac14653e1e89028917a627787e8785bfae1cac5a76b2d8a030fd2ec6e491e22488c19a2034cfeedf02e98c400a228dd
 AUX autofs5.initd 1558 BLAKE2B 253ce53d2b2b46f80606cfc654a45c710ae97649343fda7698f2b5af590c6bc1bf2f15912e5c86b626759eb89a659e293fa4bf6e28b5a84dc5a6b5e1a24615e7 SHA512 956e3753dfd56146a529522ff68e311c32906815ceec28afbe5ccc4e5da995dca0296f0824f583a6b7c713e443a6b6fe819bc2f18a116c8e82f2779d0a198afa
 DIST autofs-5.1.6.tar.xz 315316 BLAKE2B 0c5e2351462505c6de0b12e510f0c08a625a0235e1ff8eeaff825946c4530c258449d26aaf6a3794aa82a97e8860711226168f434dd31bfb8a4e70287beb3ca4 SHA512 dc8b2bd86c140905dd1bc461bfc469f92363d9c2687fe422e1e751cc7ad64c0733b011c80bf4840e510e5909176cd1a066968b9a5ba835b62c4cf27537863cf2
 DIST autofs-5.1.7.tar.xz 327752 BLAKE2B bff290048fb2849dd4c7099718f6824eac7e4f700909342f82b79a3baa752c4efe7f45be3492578fa15df6d959751be5d7fae5aafe129b52425c0d9ab19eaccc SHA512 cf994d0e68d5f6a5647235000743811a791150ece0a90ed9e1cb9bb131259f52769371c6a06d968b7191b10e709c9c90de611cc3ee310fbbea87f60034b3d4e1
-EBUILD autofs-5.1.6-r1.ebuild 3071 BLAKE2B 5c64c0658a1241bd58699cac218c5b7812e211b385377fd33055d1599abf2062f5fa74fa4b9baa1e7c94d61aaa0b2115c1e328b885c4a1761b5c1d1835ac3d71 SHA512 e08b9bbf3cf13f170ddf32fde3029a68d02a8843c7a392f448cf543ed5936d017e3e3473673f35c37259909c479f81f6d39e45e52458e78a8f35cb412c50c2c6
-EBUILD autofs-5.1.7.ebuild 3084 BLAKE2B 13858264dacc7da28d78c3aa037254b19ad7fa949d514b636283378a25f8eff68ae3408de0c72b35f2c176f02ee81e626ccf221c53d7c0066b491efd7d7dfeb1 SHA512 d446d1cbb0a5e5ffcd3e87092b8a4fff0eb733fa2cc964ed0f1f2d277eda79a8df87e04543c2b86c4aa4243f2e6b1045c381c006322ab0dce755243e145dbc5e
+EBUILD autofs-5.1.6-r1.ebuild 3102 BLAKE2B 1d9d5e20ec8f600d959187f163753fe24026726380537f83bc9a589dfa65b7a115d4fc646fa83cae036a0c4b8d5f546b9858c191cd2b98c6cee3c706f61078f5 SHA512 47f7d7785141b2a7952c95a7bc6724e051ac85fc93e14f93409780bff1b439c5402b4e907607751ae5e5d98ebc1a7621d32be6fab4cb3d21893315d844460aae
+EBUILD autofs-5.1.7.ebuild 3122 BLAKE2B 7fd047471280fe272b08e7be184bd313430328b903bc303c58f93d279f0fc56729feb44b24725b5eed4858565b99bc7c0b4665382d7f8f8903a89276411fd777 SHA512 db40c839b8dc699760b7d0bd6c33f654e80a9f85ba8686ee1e953c87f68819a27d6a5a2af82ecdb1cb443f0b3855af8e43e92ffeeae674d3beeabdb864a92ec1
 MISC metadata.xml 869 BLAKE2B a111ebef7acf2c20483b6fc26c50b7c388728a6be2198815467a8e3fd9bc34e1f623cbb62558c9a97a0fcc84db91741e1435e29235a06577c5bcb07a7dab4af5 SHA512 1e6ca7144a39f77cf1e14f0fe05de23c2887b37cc4445696affc938eb340747af33a01981cec7b88ba6bfcac2a7d465e38d78fd39dadf825fd2783c5698a590f
diff --git a/net-fs/autofs/autofs-5.1.6-r1.ebuild b/net-fs/autofs/autofs-5.1.6-r1.ebuild
index 3422926b94dd..743ec6519497 100644
--- a/net-fs/autofs/autofs-5.1.6-r1.ebuild
+++ b/net-fs/autofs/autofs-5.1.6-r1.ebuild
@@ -38,6 +38,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/${P}-glibc.patch"
+	"${FILESDIR}/${P}-musl.patch"
 	"${FILESDIR}/${P}-pid.patch"
 )
 
diff --git a/net-fs/autofs/autofs-5.1.7.ebuild b/net-fs/autofs/autofs-5.1.7.ebuild
index 5dfef5feafa3..5387d293f411 100644
--- a/net-fs/autofs/autofs-5.1.7.ebuild
+++ b/net-fs/autofs/autofs-5.1.7.ebuild
@@ -38,6 +38,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/${P}-glibc.patch"
+	"${FILESDIR}/${PN}-5.1.6-musl.patch"
 	"${FILESDIR}/${PN}-5.1.6-pid.patch"
 )
 
diff --git a/net-fs/autofs/files/autofs-5.1.6-musl.patch b/net-fs/autofs/files/autofs-5.1.6-musl.patch
new file mode 100644
index 000000000000..bdcc0db9a9f3
--- /dev/null
+++ b/net-fs/autofs/files/autofs-5.1.6-musl.patch
@@ -0,0 +1,12 @@
+--- a/include/automount.h
++++ b/include/automount.h
+@@ -25,6 +25,9 @@
+ #include "list.h"
+ 
+ #include <linux/auto_fs4.h>
++#ifndef __GLIBC__
++#include <bits/reg.h>
++#endif
+ 
+ #include "defaults.h"
+ #include "state.h"