Fix patches for xfsdump-3.1.8 to apply cleanly

3 files changed, 99 insertions, 4 deletions

diff --git a/sys-fs/xfsdump/Manifest b/sys-fs/xfsdump/Manifest
index 85be93ac..f073dac6 100644
--- a/sys-fs/xfsdump/Manifest
+++ b/sys-fs/xfsdump/Manifest
@@ -1,2 +1,2 @@
-DIST xfsdump-3.1.6.tar.gz 848698 SHA256 7f78c11ca527477d90e5e62b0778f3ad96f2b71c19173044e9aca9515fff42d0 SHA512 6d8eff10c65e0a0893525590953ccb7ec0095ba528725ffe3f18260e6cb8f66dd3945c60477500e84421a9ed57fae9e8f0f25c3c0900be3671f30ca6951ed5e7 WHIRLPOOL 87182e97a5676be6ad36cf74e37d9ca312d742d20eb5396917a156842fe62a23c582e16862fb384fe7706097d9f0c7a6a8faced06fec0a999ac06ceb426eb7e3
-DIST xfsdump-3.1.8.tar.xz 603304 SHA256 ed14e67ae5b273c2698e767b43a46f033d361e540fe13feaaf9b110ee0edc585 SHA512 84720c83627647c75b42c59d180bb31cbb6e064568bef18b73641cf821fa7d39e6f7e0df4a6c7ffd36fba63296ab88cb83f0effdb1f6aa98f4b593ca0e658e0b WHIRLPOOL f75004400387916cd461a49500fa72ff878a9112f7550dd7c14f8b39e8f52678ca6721c298d536631c1649f989f7c007625e72c1136dabe60d9235bb5f8900d4
+DIST xfsdump-3.1.6.tar.gz 848698 BLAKE2B c87738640f2d5f424d8e8e9df50a75b2424c1f2741a47cd94f1e63d18b460946f1cb0ff362d2a00345db8fcc8e3518faa720e6495b138aaa51fe4e8d2d1bd24a SHA512 6d8eff10c65e0a0893525590953ccb7ec0095ba528725ffe3f18260e6cb8f66dd3945c60477500e84421a9ed57fae9e8f0f25c3c0900be3671f30ca6951ed5e7
+DIST xfsdump-3.1.8.tar.xz 603304 BLAKE2B 8f923ca267f648e88e4e964bcafcfd3bfde0fdb4e6753a9c21bbb8a1ae0f63e868cdad3da4eed5e95ffda861278eaaad49758701384681f3b0a19b93e07a232d SHA512 84720c83627647c75b42c59d180bb31cbb6e064568bef18b73641cf821fa7d39e6f7e0df4a6c7ffd36fba63296ab88cb83f0effdb1f6aa98f4b593ca0e658e0b
diff --git a/sys-fs/xfsdump/files/xfsdump-3.0.5-prompt-overflow.patch b/sys-fs/xfsdump/files/xfsdump-3.0.5-prompt-overflow.patch
index 053615c8..bd7fb3f4 100644
--- a/sys-fs/xfsdump/files/xfsdump-3.0.5-prompt-overflow.patch
+++ b/sys-fs/xfsdump/files/xfsdump-3.0.5-prompt-overflow.patch
@@ -1,8 +1,8 @@
 http://oss.sgi.com/bugzilla/show_bug.cgi?id=876
 https://bugs.gentoo.org/335115
 
---- dump/content.c
-+++ dump/content.c
+--- a/dump/content.c
++++ b/dump/content.c
 @@ -6460,7 +6460,7 @@
  Media_prompt_erase( drive_t *drivep )
  {
diff --git a/sys-fs/xfsdump/files/xfsdump-3.1.8-musl.patch b/sys-fs/xfsdump/files/xfsdump-3.1.8-musl.patch
new file mode 100644
index 00000000..a2450d7f
--- /dev/null
+++ b/sys-fs/xfsdump/files/xfsdump-3.1.8-musl.patch
@@ -0,0 +1,95 @@
+From 1fb0b21870179c3ab5350b29217e0c01cd77c13e Mon Sep 17 00:00:00 2001
+From: "Jory A. Pratt" <anarchy@gentoo.org>
+Date: Sun, 20 May 2018 17:24:30 -0500
+Subject: [PATCH] misc musl fixes
+
+Signed-off-by: Jory A. Pratt <anarchy@gentoo.org>
+---
+ common/drive.c   | 1 +
+ common/main.c    | 4 ++++
+ common/types.h   | 3 +++
+ dump/content.c   | 1 +
+ dump/var.c       | 1 +
+ invutil/invidx.c | 1 +
+ 6 files changed, 11 insertions(+)
+
+diff --git a/common/drive.c b/common/drive.c
+index 5fe6867..9e10b63 100644
+--- a/common/drive.c
++++ b/common/drive.c
+@@ -17,6 +17,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <unistd.h>
+ #include <sys/stat.h>
+ #include <time.h>
+diff --git a/common/main.c b/common/main.c
+index d3bdcf3..b6ba0a6 100644
+--- a/common/main.c
++++ b/common/main.c
+@@ -56,6 +56,10 @@
+ #include "content.h"
+ #include "inventory.h"
+ 
++#ifndef RLIM64_INFINITY
++#define RLIM64_INFINITY (~0ULL)
++#endif
++
+ #ifdef DUMP
+ /* main.c - main for dump
+  */
+diff --git a/common/types.h b/common/types.h
+index 424b47a..0c58ab5 100644
+--- a/common/types.h
++++ b/common/types.h
+@@ -47,6 +47,9 @@
+ /* integers
+  */
+ typedef uint32_t size32_t;
++#ifndef __uint32_t
++#define __uint32_t uint32_t
++#endif
+ typedef uint64_t size64_t;
+ typedef char char_t;
+ typedef unsigned char u_char_t;
+diff --git a/dump/content.c b/dump/content.c
+index bee4e65..f9da485 100644
+--- a/dump/content.c
++++ b/dump/content.c
+@@ -38,6 +38,7 @@
+ #ifdef linux
+ #include <linux/limits.h>
+ #include <xfs/xqm.h>
++#include <linux/limits.h>
+ #endif
+ 
+ #include <attr/attributes.h>
+diff --git a/dump/var.c b/dump/var.c
+index 6e3ead0..be2f310 100644
+--- a/dump/var.c
++++ b/dump/var.c
+@@ -16,6 +16,7 @@
+  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+  */
+ 
++#include <limits.h>
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include <sys/stat.h>
+diff --git a/invutil/invidx.c b/invutil/invidx.c
+index 82d89d9..dba88fc 100644
+--- a/invutil/invidx.c
++++ b/invutil/invidx.c
+@@ -19,6 +19,7 @@
+ #include <xfs/xfs.h>
+ #include <xfs/jdm.h>
+ 
++#include <fcntl.h>
+ #include <stdio.h>
+ #include <fcntl.h>
+ #include <unistd.h>
+-- 
+2.17.0
+