commit: bb308db0ee272efd4ed2906a385936f9b3bfab4e
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Sat Mar 18 17:26:03 2017 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Sat Mar 18 17:26:03 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=bb308db0
sys-fs/xfsdump: fix patch
sys-fs/xfsdump/Manifest | 4 +-
.../xfsdump/files/xfsdump-3.1.4-compat-musl.patch | 36 ----------
sys-fs/xfsdump/files/xfsdump-3.1.6-musl.patch | 82 ++++++++++++++++++++++
sys-fs/xfsdump/xfsdump-3.1.6.ebuild | 2 +-
4 files changed, 85 insertions(+), 39 deletions(-)
diff --git a/sys-fs/xfsdump/Manifest b/sys-fs/xfsdump/Manifest
index 7fc20d0..5b7f5f2 100644
--- a/sys-fs/xfsdump/Manifest
+++ b/sys-fs/xfsdump/Manifest
@@ -1,7 +1,7 @@
AUX xfsdump-3.0.4-no-symlink.patch 721 SHA256
b3ccccfce2b7f36263a8b3611724560ae768a3371dcc6e19045abae8df8052a3 SHA512
8b8feddfbdd76bebe61a8d06e174f5bef6edd05d0ce3b96731c234f58f36c73182e411a6f7b30f4e2bbc48b13b675edaf9ba30434e414b2bf2c7dbf431c1b819
WHIRLPOOL
576a5f0324ac20b80fe946f1b0390b9e70860b9f350811e41c7ccbbbb06ef8439ca1946b4d7db88b2d106ad4d67b9bf82cb46636e52d362b304c6d78bb35f142
AUX xfsdump-3.0.5-prompt-overflow.patch 333 SHA256
80684664bae903256dd1b6355da9e88b727b8b42a559a6131aa2d24a6ce08428 SHA512
73f2a2f29b1f0e8585f49ac510b4da18deebbb799e428519fedf936f46dbd602c1cf6d300fd4e416ae4e6af1e6ce726798dec710c01d73c263782cb01ab21ba2
WHIRLPOOL
33e53b9b2690791df7374e8c7b9ff893850e076f936be86c2164798ae98ba33b35d9f2955c060d487688cb6dc9818591a05e1a74ce0792c40afd5d5989e514c7
-AUX xfsdump-3.1.4-compat-musl.patch 1023 SHA256
2983ea5405e6ebee2a595345b7c519f48f1202d8d557daff6f709ced65759801 SHA512
350638c7a214f565ea1ffbe7753ed01e8d6cee873f73a45c58fc99d49122099d6e83c55fe2966b5595bcffcc2bdb895d765dfa6874f02d2b4d0d1b75e75904f7
WHIRLPOOL
34178b7e079d6125031e677e2090a7409695ab3dccfdfa76b98c7111c3ab16687fc6e6f92aeef85157644ea04815eab3070deb4c87f49360cebc3f06d50eeb72
AUX xfsdump-3.1.6-linguas.patch 975 SHA256
16152976e972f32921a4b34636736f041d49d656111b43aee31b9c83da582992 SHA512
2fe49c6985eca950890d952b6e33c7f9d7687dfaeb52077895e92994d930f0026bb8fdc31ad3f31d072b8a5023a9e0e3d99c301cb34802d7657a93b964aa6c8e
WHIRLPOOL
c2c8d255fe0d01407bf1f5282c9f854794a521d165945944cbf092517745a94907fab1de7c5a11dcb7090eaac6aed5fc020574aa81d03f222c2df87a74c90320
+AUX xfsdump-3.1.6-musl.patch 2503 SHA256
9fc0b5d9f02904473af1cd6d8b98c3ffec8293ba3582420beea6b5ca7b4bb15f SHA512
de4c912603a415ba6a4bb2e023f7389a0428b08c3e57d087acc05a7e14c71394d555152cc7f505a36be508a33d44c77df9650bc58f3c22c0f434bbe15cc85727
WHIRLPOOL
a87e8d0348b251a42111dcc7cef619c89695ffadfbd85662b34b9f4152ff9f106ce521ed42cf9f2f220b9cee1c36817730b1ee2cd80b427ac80504a2df335b75
DIST xfsdump-3.1.6.tar.gz 848698 SHA256
7f78c11ca527477d90e5e62b0778f3ad96f2b71c19173044e9aca9515fff42d0 SHA512
6d8eff10c65e0a0893525590953ccb7ec0095ba528725ffe3f18260e6cb8f66dd3945c60477500e84421a9ed57fae9e8f0f25c3c0900be3671f30ca6951ed5e7
WHIRLPOOL
87182e97a5676be6ad36cf74e37d9ca312d742d20eb5396917a156842fe62a23c582e16862fb384fe7706097d9f0c7a6a8faced06fec0a999ac06ceb426eb7e3
-EBUILD xfsdump-3.1.6.ebuild 1500 SHA256
25b81f03d481458ac1eadbe986611b39e5d925eea5efb10baf2489413b0e75b1 SHA512
b38a8c0c176ff7278c14bfd9de5550739c871c73dd61d2abffcf4963f7cbfbd8dc298989381f58f88c3b7c61778e4d954ea31168358583b0eecc8fedc86743df
WHIRLPOOL
7d3bfe0f5c108cff713ab3b45cdfbabfbf80e073a01e91c1b851f56f201aedc2449d467d856892be432b08f1a317639b597e7c6b24d745f1b31376a801e54344
+EBUILD xfsdump-3.1.6.ebuild 1493 SHA256
3dbf78f2ddbc5d00cd99578f8e21de1144df81f7f59e47fb2678116615e29bfd SHA512
7af4a4f9f8733f565d74b9b586d6607d36d9239cf013fc23ae44e98204899bf9609f246f1c3861f8df9a1cb9ea08e8069a1eb630bd9cd8363dcc23efb695828d
WHIRLPOOL
396e14a973fcd605f495eeb75eb70ca1c27dd843446ced9fbded4e47c0c90ae884a384754df24e6bf0a85739deee673e67ca7e0f9671eac1e23ccbb7421c77ec
MISC metadata.xml 253 SHA256
d82c33ef453113a5c1ebe250dcba373c22934a69b0a86c6ab15a5ca589c25b91 SHA512
54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
WHIRLPOOL
e5aee23acff864609953a1e4de768f0e4aef704b44c53c021f28573e1ca5c99f1a46d92935ecec2449f7b4419a36d8373127d0ecfa8d7bae72d835e1839eb3f8
diff --git a/sys-fs/xfsdump/files/xfsdump-3.1.4-compat-musl.patch
b/sys-fs/xfsdump/files/xfsdump-3.1.4-compat-musl.patch
deleted file mode 100644
index 643fba6..0000000
--- a/sys-fs/xfsdump/files/xfsdump-3.1.4-compat-musl.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naurp xfsdump-3.1.4.orig/common/main.c xfsdump-3.1.4.mod/common/main.c
---- xfsdump-3.1.4.orig/common/main.c 2012-10-09 20:42:33.000000000 +0000
-+++ xfsdump-3.1.4.mod/common/main.c 2015-05-10 20:14:36.255773000 +0000
-@@ -50,6 +50,10 @@
- #include "content.h"
- #include "inventory.h"
-
-+#ifndef RLIM64_INFINITY
-+#define RLIM64_INFINITY (~0ULL)
-+#endif
-+
- #ifdef DUMP
- /* main.c - main for dump
- */
-@@ -2220,7 +2224,10 @@ static sig_printmap_t sig_printmap[ ] =
- {SIGTERM, "SIGTERM"},
- {SIGUSR1, "SIGUSR1"},
- {SIGUSR2, "SIGUSR2"},
-+ {SIGCHLD, "SIGCHLD"},
-+#ifdef SIGCLD
- {SIGCLD, "SIGCLD"},
-+#endif
- {SIGPWR, "SIGPWR"},
- {SIGURG, "SIGURG"},
- {SIGPOLL, "SIGPOLL"},
-diff -Naurp xfsdump-3.1.4.orig/dump/content.c xfsdump-3.1.4.mod/dump/content.c
---- xfsdump-3.1.4.orig/dump/content.c 2015-05-10 19:45:58.915773000 +0000
-+++ xfsdump-3.1.4.mod/dump/content.c 2015-05-10 22:23:10.705773000 +0000
-@@ -33,6 +33,7 @@
-
- #ifdef linux
- #include <xfs/xqm.h>
-+#include <linux/limits.h>
- #endif
-
- #include <attr/attributes.h>
diff --git a/sys-fs/xfsdump/files/xfsdump-3.1.6-musl.patch
b/sys-fs/xfsdump/files/xfsdump-3.1.6-musl.patch
new file mode 100644
index 0000000..12ca39e
--- /dev/null
+++ b/sys-fs/xfsdump/files/xfsdump-3.1.6-musl.patch
@@ -0,0 +1,82 @@
+diff -Naur xfsdump-3.1.6.orig/common/drive.c xfsdump-3.1.6/common/drive.c
+--- xfsdump-3.1.6.orig/common/drive.c 2017-03-18 10:15:09.015308629 -0700
++++ xfsdump-3.1.6/common/drive.c 2017-03-18 10:19:56.248906871 -0700
+@@ -17,6 +17,7 @@
+ */
+
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <unistd.h>
+ #include <sys/stat.h>
+ #include <time.h>
+diff -Naur xfsdump-3.1.6.orig/common/main.c xfsdump-3.1.6/common/main.c
+--- xfsdump-3.1.6.orig/common/main.c 2017-03-18 10:15:09.012308611 -0700
++++ xfsdump-3.1.6/common/main.c 2017-03-18 10:20:21.938159790 -0700
+@@ -55,6 +55,10 @@
+ #include "content.h"
+ #include "inventory.h"
+
++#ifndef RLIM64_INFINITY
++#define RLIM64_INFINITY (~0ULL)
++#endif
++
+ #ifdef DUMP
+ /* main.c - main for dump
+ */
+@@ -2225,7 +2229,10 @@
+ {SIGTERM, "SIGTERM"},
+ {SIGUSR1, "SIGUSR1"},
+ {SIGUSR2, "SIGUSR2"},
++ {SIGCHLD, "SIGCHLD"},
++#ifdef SIGCLD
+ {SIGCLD, "SIGCLD"},
++#endif
+ {SIGPWR, "SIGPWR"},
+ {SIGURG, "SIGURG"},
+ {SIGPOLL, "SIGPOLL"},
+diff -Naur xfsdump-3.1.6.orig/common/types.h xfsdump-3.1.6/common/types.h
+--- xfsdump-3.1.6.orig/common/types.h 2017-03-18 10:15:09.011308605 -0700
++++ xfsdump-3.1.6/common/types.h 2017-03-18 10:19:43.429780663 -0700
+@@ -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 -Naur xfsdump-3.1.6.orig/dump/content.c xfsdump-3.1.6/dump/content.c
+--- xfsdump-3.1.6.orig/dump/content.c 2017-03-18 10:15:09.036308756 -0700
++++ xfsdump-3.1.6/dump/content.c 2017-03-18 10:20:21.940159810 -0700
+@@ -37,6 +37,7 @@
+ #include <xfs/jdm.h>
+ #ifdef linux
+ #include <xfs/xqm.h>
++#include <linux/limits.h>
+ #endif
+
+ #include <attr/attributes.h>
+diff -Naur xfsdump-3.1.6.orig/dump/var.c xfsdump-3.1.6/dump/var.c
+--- xfsdump-3.1.6.orig/dump/var.c 2017-03-18 10:15:09.036308756 -0700
++++ xfsdump-3.1.6/dump/var.c 2017-03-18 10:23:04.657759448 -0700
+@@ -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 -Naur xfsdump-3.1.6.orig/invutil/invidx.c xfsdump-3.1.6/invutil/invidx.c
+--- xfsdump-3.1.6.orig/invutil/invidx.c 2017-03-18 10:15:09.029308713
-0700
++++ xfsdump-3.1.6/invutil/invidx.c 2017-03-18 10:16:19.135769322 -0700
+@@ -19,6 +19,7 @@
+ #include <xfs/xfs.h>
+ #include <xfs/jdm.h>
+
++#include <fcntl.h>
+ #include <stdio.h>
+ #include <unistd.h>
+ #include <stdlib.h>
diff --git a/sys-fs/xfsdump/xfsdump-3.1.6.ebuild
b/sys-fs/xfsdump/xfsdump-3.1.6.ebuild
index 5807035..f033a9d 100644
--- a/sys-fs/xfsdump/xfsdump-3.1.6.ebuild
+++ b/sys-fs/xfsdump/xfsdump-3.1.6.ebuild
@@ -38,7 +38,7 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-3.0.5-prompt-overflow.patch #335115
epatch "${FILESDIR}"/${PN}-3.0.4-no-symlink.patch #311881
epatch "${FILESDIR}"/${PN}-3.1.6-linguas.patch #561664
- epatch "${FILESDIR}"/${PN}-3.1.4-compat-musl.patch #549116
+ epatch "${FILESDIR}"/${PN}-3.1.6-musl.patch #549116
}
src_configure() {
