gentoo resync : 22.12.2021

3 files changed, 57 insertions, 1 deletions

diff --git a/net-fs/autofs/Manifest b/net-fs/autofs/Manifest
index a769d49f6f14..c75b3ba765ef 100644
--- a/net-fs/autofs/Manifest
+++ b/net-fs/autofs/Manifest
@@ -3,6 +3,7 @@ AUX autofs-5.1.6-musl.patch 215 BLAKE2B 885442f26b482ec28734452d3a987759d761c8d2
 AUX autofs-5.1.6-pid.patch 453 BLAKE2B 292388f1d192a1e8763402dbc4d5738d112fbbf4409a9fc8215a3ba9987639381fa0ccc29b28f5fe794dc44c98ebc0177d3ecd28177ff6657201f8ba478febda SHA512 78dfd13e06a7adec4336b18a03a1c0bd9d651ce01bf5e716a75d5574e033db9c3fff3baf660c4a6ad757403db5242a7abecf68cdb4cc9bb4d005992b6fe44ca6
 AUX autofs-5.1.7-glibc-2.34.patch 3439 BLAKE2B 9ad024413e1bbb0c2d953ee9355dc6ac6fbf13d4475a14f9183c5092c4850441a7b7f1809452c96d0020b4fb4105f6724e3f04b817ad5b143b9074662f35a87b SHA512 e22fa260123823fa6109d8b2737877a39e15c696ab1e506a8bdeb2a1feebaec965a577a645c9e9edd19547a2b2237e06191f91107b8025b985b7f4f3137685fa
 AUX autofs-5.1.7-glibc.patch 2393 BLAKE2B 3b38f6c869c5dbd29ca7835e4a46b285b6f8dd9e915b8bb0a3a13978e23675b4e695c43d8404f574f4f82a71effa5cf5cad86578893b4e148d0f69241ea3e80f SHA512 6e38ba59e2ce1d3c64ca19e3766438220fb89f3880a59443b6b3dc057f90b6b7ebf003a5cdc34fb12cf1fdc4eba990b02045bf6ee6888b9c49cfb249a77305ed
+AUX autofs-5.1.8-dmalloc.patch 1538 BLAKE2B be01cac480fa9e956e44f497ec0b06b824f54714e636e6394b10b551fa855d5f5901668d2079b424754e264d7d84417ff8f7009d52c1b6b7830ea2738f96cfbe SHA512 bba8122f1b183cfeea5556ae1761ec0607d8af88a0f26ca0e3926c8221c0902d9bf8c6c81afb8ce083850fda0fc882cc1660fd71a1a1e580fdbe5a7d76ee12a4
 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
@@ -10,5 +11,5 @@ DIST autofs-5.1.7.tar.xz 327752 BLAKE2B bff290048fb2849dd4c7099718f6824eac7e4f70
 DIST autofs-5.1.8.tar.xz 327396 BLAKE2B 22ef626cc867c1ed4f1f859aebe2547c497c35dea712967de70158e85db590f5ffc26165e1479cfc64eb8070a9c43fd06b1570a82bd8bbbac70f2930e1841718 SHA512 6ee6283c0977c82848a654dc24745ee687f6916de441c3688fa91f67ca7295e632ee3808cc2358984a4b9f19841e6e1a91ab48aad6341ac8e63827fe8c32d223
 EBUILD autofs-5.1.6-r2.ebuild 3141 BLAKE2B 48811e587d6a4637f6e07e9add7e3943e5063456ad91610e18a9deb379d09187d8eb62506dcafa21f06ad932b1f3c6c3fdccbbdb18befbd33e16ae724383a5a1 SHA512 e37770f987c646a2b44477f4fa50a357e2ceece27441f4a75dc3ed8b0564d3f778ba8c162c9a7f3c6fc4c78ed41f557475dda7963c6ab5e2f3297b9fac59d75d
 EBUILD autofs-5.1.7-r1.ebuild 3239 BLAKE2B a329da93036678a45676f230d85ad83f88f473fccfada7d836b8c3cdd413dcc364eff7c5d2a7944336fbfa32c42a457a942ac1f29404e3fd6a6cdf019f11914d SHA512 f1e9e6aa768400a13663e15fa2c9b3a5dea0b427df1020bffa14cdadd4d941249c114156e6385748d2210c5d608647ab5b546c4e0e7ebc59d23a3351121b425d
-EBUILD autofs-5.1.8.ebuild 3202 BLAKE2B 738447c15b0eab2a6cca117a1af872289edf4ef3368197ecfcbcd3605adcce693c024b6f9e82c4c41494dafbfc49ff893e4e0ca006e2cdab5432565ea540c3e0 SHA512 7841ea09115c349d64ffffd5a592de59bc065a9c881bdd3636dc3d4279b08e759417a989d6c4f9b145eeb77c29b19fce7180bcdde7669f4c1405fa2a346705af
+EBUILD autofs-5.1.8.ebuild 3273 BLAKE2B 814d139eb64c83169094a0813c2244c12873ab72d0d80fab9e72d065b3db64431fd6512be2dbfca885ede59f3f5fde1c1851b9d1c7344c24eea5675af66e04dc SHA512 72f74df90fec36661642177b7d9c3a887b8a9cb7bb41acd12ae85519338c4a4c472add2972d69b461d0fae7dd2a347bdbf558526810c49a9f0208e4425af9a0b
 MISC metadata.xml 870 BLAKE2B d2813cbc47232ecb5d5726672d038d72e9e5dd3078e915552f566a61bb2db7909d8b4d7d135d7c3ebba9c8f827121de2f42bd25c7c9fd975190f8bb67635affd SHA512 b1ee8b21924f1b6ade69603deff4ff5dc954f4f9161dce592b1676cad1e01dc2a0b4802877f8d4922a037f3e10b2f2085128f86cd2cf21f691c568d6a1f3a25d
diff --git a/net-fs/autofs/autofs-5.1.8.ebuild b/net-fs/autofs/autofs-5.1.8.ebuild
index ede180337421..3c519f852c70 100644
--- a/net-fs/autofs/autofs-5.1.8.ebuild
+++ b/net-fs/autofs/autofs-5.1.8.ebuild
@@ -43,6 +43,8 @@ PATCHES=(
 	"${FILESDIR}/${PN}-5.1.7-glibc.patch"
 	"${FILESDIR}/${PN}-5.1.6-musl.patch"
 	"${FILESDIR}/${PN}-5.1.6-pid.patch"
+	"${FILESDIR}/${PN}-5.1.6-pid.patch"
+	"${FILESDIR}/${P}-dmalloc.patch"
 )
 
 pkg_setup() {
diff --git a/net-fs/autofs/files/autofs-5.1.8-dmalloc.patch b/net-fs/autofs/files/autofs-5.1.8-dmalloc.patch
new file mode 100644
index 000000000000..e2ed58fb1766
--- /dev/null
+++ b/net-fs/autofs/files/autofs-5.1.8-dmalloc.patch
@@ -0,0 +1,53 @@
+diff --git a/include/mounts.h b/include/mounts.h
+index ddb7e4c..854e1fb 100644
+--- a/include/mounts.h
++++ b/include/mounts.h
+@@ -84,7 +84,7 @@ typedef void (*tree_free_t) (struct tree_node *n);
+ struct tree_ops {
+ 	tree_new_t new;
+ 	tree_cmp_t cmp;
+-	tree_free_t free;
++	tree_free_t set_free;
+ };
+ 
+ typedef int (*tree_work_fn_t) (struct tree_node *n, void *ptr);
+diff --git a/lib/mounts.c b/lib/mounts.c
+index 4c86688..1e54a33 100644
+--- a/lib/mounts.c
++++ b/lib/mounts.c
+@@ -75,7 +75,7 @@ static void tree_mnt_free(struct tree_node *n);
+ static struct tree_ops mnt_ops = {
+ 	.new = tree_mnt_new,
+ 	.cmp = tree_mnt_cmp,
+-	.free = tree_mnt_free,
++	.set_free = tree_mnt_free,
+ };
+ static struct tree_ops *tree_mnt_ops = &mnt_ops;
+ 
+@@ -86,7 +86,7 @@ static void tree_host_free(struct tree_node *n);
+ static struct tree_ops host_ops = {
+ 	.new = tree_host_new,
+ 	.cmp = tree_host_cmp,
+-	.free = tree_host_free,
++	.set_free = tree_host_free,
+ };
+ static struct tree_ops *tree_host_ops = &host_ops;
+ 
+@@ -97,7 +97,7 @@ static void tree_mapent_free(struct tree_node *n);
+ static struct tree_ops mapent_ops = {
+ 	.new = tree_mapent_new,
+ 	.cmp = tree_mapent_cmp,
+-	.free = tree_mapent_free,
++	.set_free = tree_mapent_free,
+ };
+ static struct tree_ops *tree_mapent_ops = &mapent_ops;
+ 
+@@ -1360,7 +1360,7 @@ void tree_free(struct tree_node *root)
+ 		tree_free(root->right);
+ 	if (root->left)
+ 		tree_free(root->left);
+-	ops->free(root);
++	ops->set_free(root);
+ }
+ 
+ int tree_traverse_inorder(struct tree_node *n, tree_work_fn_t work, void *ptr)