gentoo resync : 08.01.2021

3 files changed, 83 insertions, 2 deletions

diff --git a/sys-fs/diskdev_cmds/Manifest b/sys-fs/diskdev_cmds/Manifest
index e47b645019cc..64dba4475642 100644
--- a/sys-fs/diskdev_cmds/Manifest
+++ b/sys-fs/diskdev_cmds/Manifest
@@ -1,8 +1,9 @@
 AUX diskdev_cmds-332.14_p1-AR.patch 251 BLAKE2B 7bab604de5c1ff6ed2a78e2c7ef987bf85fc02b1a21c6996fef567086286cb1596cca61a5ddc246272570603cf0ef25050b2d6afcf8286c23f465b92e3bf096b SHA512 c81bd2bbeca3b76efb98142b9004011de923d5819d8f8bb65a9ec6afa9b1e5a594bcf69d3a733913bca614fca2ea0d456ee852beee897d7bb4799097640e8e9c
 AUX diskdev_cmds-332.14_p1-ldflags.patch 300 BLAKE2B 40b91cc8361b456f4dc62716a122971c1e87d5ca8a20154f2c9fa991db700cff67c5d7436cd38da0f1a83b712c14886ba6fc42e93f9004068379e7de167b7b56 SHA512 aa6c56cc464d18a1dbea3ddb14915605a913c786c882840c8c3b82ebf19bb768a0576aecea38a4d95853415f0756a81d7270636385ae83836ba0b7419448e3b4
+AUX diskdev_cmds-332.14_p1-musl.patch 1768 BLAKE2B 0433d95edd8f24da6bcb3d19fc34f9b32d673673fb019991332ad267cfeb32f7ff997f778ee1b9dbc3a6a53f904bef6f2679bdfa7d52db463b329b5ff6cab970 SHA512 7cfed261abec60032dee4491187f97960b50a7573760ae2f1b0bed81894fb3842c2997b45f4956a4dbb23144cfa175f424d7781231929daf82528ca9aa9790b2
 AUX diskdev_cmds-332.14_p1-no-sysctl.patch 235 BLAKE2B 4eebaa367a3c1eef94c82755ddb848958984055b26097b98e078bf162a502632f1c0a29385db17aba61730b9ec28cf7dd46539520eab2a2d8fbf6a5a42106e8f SHA512 2dca72c6d7b82804e6355fe3262762c966dfaa848f5151f97946f4f9d0d29773f43f8f134d6e2dd52cb97430f2d98e02c37066ae8c88ca75c9fb7efb94c4c8c7
 AUX diskdev_cmds-respect-cflags.patch 388 BLAKE2B 8ecaa932e3a5841bc9ace0ffd2fea2f974a42ad33f0f65551bcc4c2a873b50a4413cf16542b74f277244f578142fcd5f1bfe63063c280062bf06aed20f601385 SHA512 21325ea43ea19a06962b7123ba418d5759d712d44b1ba7d35fa982613a95d2d91d1e7cde287b497d9e6de9483658f36378f7d3d03e5780d7dc468a82e5b0da69
 DIST diskdev_cmds-332.14.tar.gz 714035 BLAKE2B 8c66509366db8067b6b3057dc8dd8c6de5f25df86a88fec8beac78e4e14d91af5319bf61671ceea206508b6abac54231e82d527a2cc79ea467e7660e10997a7f SHA512 e1df91fb5330dc01a79de99dd8b1f389a337a19c2136994d59b7cbca9c2e1cb5f7d47101366dd01db4e23a5d3d7afab41758045bf7402d739fa22182dc922044
 DIST diskdev_cmds-332.14_p1.patch.bz2 21989 BLAKE2B f7e421c164ec242e6516a4638bc4c4706a11b03587fad0e7328a311d15f47b48b4e706f819cffa8e8539d7e4eaa8efa5f9a55a838f88586872e7fc8d67c9ac8e SHA512 aaef096aa6a3f2e09bcc8c1831172c3d68994589ade505153ade00e6f4d0c49263b63212f8616ece597b1ee218a87474bb1c3812d15f34c5bc5c51fd7b72a062
-EBUILD diskdev_cmds-332.14_p1-r4.ebuild 1372 BLAKE2B 2572adf06814bd274704ad88e01651d3961d0a2a91d48842801ded31cddd5c994ba9228061d5c0a7ef5f45c3a3f4d9f4516dcaa1962294a068e5ebcd0c4a07e0 SHA512 d20db0f4f5955e468dbeeac670ea09db534820da2a5096e2fd20691dff625ca0853bb306d74b908ea0bd3b263d8fd6c16dddef9b413bd7072524a38a97054675
+EBUILD diskdev_cmds-332.14_p1-r4.ebuild 1403 BLAKE2B fa734cf80dfaa133b4223a847e15859d44b5b1e78e04332cf323f48450e8b4fe7fa42705788038755b0abd433f2fb412f22274ddcfc049ec3ca78a58affb052f SHA512 4746853b5c426a2b35c117577a48c521d98f7f5c44110df9a7c5856ed4863ae3ff02dfe042f3453baebc680f75c1f05a28f883b8dad7503b0d42763e62d37156
 MISC metadata.xml 251 BLAKE2B 9785c4729d0751280d104965bab25a268219a7fee217dcd8c01a5642a13f8abc471a3dff54ae0d34d3cf3dc8267fb483d93bd3b16aa3617e8fa8e9abd1703dfe SHA512 cc2bd3977894946ee4ea5b739cc3998bcd6017b9e7a52aa501409d0988954339a9a22fe751d0a5e967ddac9225d9b23f20b4fb1e2c62ee91d1d23c383d9776dd
diff --git a/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r4.ebuild b/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r4.ebuild
index 3fe0634bc4f6..16b057b2ea3c 100644
--- a/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r4.ebuild
+++ b/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -29,6 +29,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-AR.patch
 	"${FILESDIR}"/${P}-no-sysctl.patch
 	"${FILESDIR}"/${P}-ldflags.patch
+	"${FILESDIR}"/${P}-musl.patch
 )
 
 src_compile() {
diff --git a/sys-fs/diskdev_cmds/files/diskdev_cmds-332.14_p1-musl.patch b/sys-fs/diskdev_cmds/files/diskdev_cmds-332.14_p1-musl.patch
new file mode 100644
index 000000000000..7e7c3d1d310e
--- /dev/null
+++ b/sys-fs/diskdev_cmds/files/diskdev_cmds-332.14_p1-musl.patch
@@ -0,0 +1,79 @@
+Port to musl.
+
+Patch-by: ernsteiswuerfel
+Bug: https://bugs.gentoo.org/715862
+--- a/fsck_hfs.tproj/dfalib/CatalogCheck.c
++++ b/fsck_hfs.tproj/dfalib/CatalogCheck.c
+@@ -23,6 +23,7 @@
+ #include "Scavenger.h"
+ #include "DecompDataEnums.h"
+ #include "DecompData.h"
++#include <sys/types.h>
+ 
+ /*
+  * information collected when visiting catalog records
+--- a/fsck_hfs.tproj/dfalib/SRepair.c
++++ b/fsck_hfs.tproj/dfalib/SRepair.c
+@@ -35,6 +35,7 @@
+ #include "Scavenger.h"
+ #include <unistd.h>
+ #include <sys/stat.h>
++#include <sys/types.h>
+ #include <stdlib.h>
+ #include "../cache.h"
+ 
+--- a/fsck_hfs.tproj/dfalib/Scavenger.h
++++ b/fsck_hfs.tproj/dfalib/Scavenger.h
+@@ -44,7 +44,7 @@
+ #include <sys/kauth.h>
+ #include <sys/syslimits.h>
+ #endif
+-#include <sys/errno.h>
++#include <errno.h>
+ 
+ #ifdef __cplusplus
+ extern	"C" {
+--- a/fsck_hfs.tproj/fsck_hfs.h
++++ b/fsck_hfs.tproj/fsck_hfs.h
+@@ -24,6 +24,9 @@
+ 
+ #include "cache.h"
+ 
++#ifndef __P
++#define __P(args)       args
++#endif
+ 
+ const extern char	*cdevname;		/* name of device being checked */
+ extern char	*progname;
+--- a/newfs_hfs.tproj/makehfs.c
++++ b/newfs_hfs.tproj/makehfs.c
+@@ -35,7 +35,6 @@
+ #include <time.h>
+ #include "missing.h"
+ #endif
+-#include <sys/errno.h>
+ #include <sys/stat.h>
+ #if !LINUX
+ #include <sys/sysctl.h>
+@@ -69,6 +68,9 @@ extern Boolean _CFStringGetFileSystemRepresentation(CFStringRef string, UInt8 *b
+ #include "newfs_hfs.h"
+ #include "readme.h"
+ 
++#ifndef __P
++#define __P(args)       args
++#endif
+ 
+ #define HFS_BOOT_DATA	"/usr/share/hfsprogs/hfsbootdata"
+ 
+--- a/newfs_hfs.tproj/newfs_hfs.c
++++ b/newfs_hfs.tproj/newfs_hfs.c
+@@ -54,6 +54,9 @@
+ #else
+ #include <varargs.h>
+ #endif
++#ifndef __P
++#define __P(args)       args
++#endif
+ 
+ #define	NOVAL       (-1)
+ #define UMASK       (0755)