xfsprogs: update to 4.7.0

4 files changed, 2 insertions, 151 deletions

diff --git a/package/xfsprogs/Makefile b/package/xfsprogs/Makefile
index 59a729cc3..3f65ebca5 100644
--- a/package/xfsprogs/Makefile
+++ b/package/xfsprogs/Makefile
@@ -4,9 +4,9 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		xfsprogs
-PKG_VERSION:=		4.3.0
+PKG_VERSION:=		4.7.0
 PKG_RELEASE:=		1
-PKG_HASH:=		3e570ad51153e4be3792f42b2c805ddbd46b55d166eba3102ec87d5006d4cb5c
+PKG_HASH:=		88580bb3e6847c3edef436703a4fae403fc19b20739db4c31166ee4b256178d7
 PKG_DESCR:=		utilities for xfs filesystems
 PKG_SECTION:=		sys/fs
 PKG_BUILDDEP:=		e2fsprogs ncurses
diff --git a/package/xfsprogs/patches/patch-copy_xfs_copy_c b/package/xfsprogs/patches/patch-copy_xfs_copy_c
deleted file mode 100644
index 2e98a5f54..000000000
--- a/package/xfsprogs/patches/patch-copy_xfs_copy_c
+++ /dev/null
@@ -1,82 +0,0 @@
---- xfsprogs-4.3.0.orig/copy/xfs_copy.c	2015-10-15 23:31:26.000000000 +0200
-+++ xfsprogs-4.3.0/copy/xfs_copy.c	2015-11-27 06:04:00.000000000 +0100
-@@ -236,6 +236,10 @@ handler(int sig)
- {
- 	pid_t	pid;
- 	int	status, i;
-+	struct sigaction action;
-+
-+	action.sa_handler = handler;
-+	action.sa_flags = 0;
- 
- 	pid = wait(&status);
- 
-@@ -268,7 +272,7 @@ handler(int sig)
- 					pthread_exit(NULL);
- 				}
- 
--				signal(SIGCHLD, handler);
-+				sigaction(SIGCHLD, &action, NULL);
- 				return;
- 			} else  {
- 				/* it just croaked it bigtime, log it */
-@@ -290,7 +294,7 @@ handler(int sig)
- 	do_warn(_("%s: Unknown child died (should never happen!)\n"), progname);
- 	die_perror();
- 	pthread_exit(NULL);
--	signal(SIGCHLD, handler);
-+	sigaction(SIGCHLD, &action, NULL);
- }
- 
- void
-@@ -466,6 +470,11 @@ void
- write_wbuf(void)
- {
- 	int		i;
-+	sigset_t        unblock, initial;
-+
-+	sigemptyset(&unblock);
-+	sigaddset(&unblock, SIGCHLD);
-+
- 
- 	/* verify target threads */
- 	for (i = 0; i < num_targets; i++)
-@@ -477,9 +486,9 @@ write_wbuf(void)
- 		if (target[i].state != INACTIVE)
- 			pthread_mutex_unlock(&targ[i].wait);	/* wake up */
- 
--	sigrelse(SIGCHLD);
-+	sigprocmask(SIG_UNBLOCK, &unblock, &initial);
- 	pthread_mutex_lock(&mainwait);
--	sighold(SIGCHLD);
-+	sigprocmask(SIG_SETMASK, &initial, NULL);
- }
- 
- void
-@@ -551,6 +560,12 @@ main(int argc, char **argv)
- 	libxfs_init_t	xargs;
- 	thread_args	*tcarg;
- 	struct stat64	statbuf;
-+	struct sigaction saction;
-+	sigset_t        sigblock, initial;
-+
-+	saction.sa_handler = handler;
-+	saction.sa_flags = 0;
-+
- 
- 	progname = basename(argv[0]);
- 
-@@ -892,8 +907,11 @@ main(int argc, char **argv)
- 
- 	/* set up sigchild signal handler */
- 
--	signal(SIGCHLD, handler);
--	sighold(SIGCHLD);
-+	sigaction(SIGCHLD, &saction, NULL);
-+	sigemptyset(&sigblock);
-+	sigaddset(&sigblock, SIGCHLD);
-+	sigprocmask(SIG_BLOCK, &sigblock, &initial);
-+
- 
- 	/* make children */
- 
diff --git a/package/xfsprogs/patches/patch-fsr_xfs_fsr_c b/package/xfsprogs/patches/patch-fsr_xfs_fsr_c
deleted file mode 100644
index c650575a1..000000000
--- a/package/xfsprogs/patches/patch-fsr_xfs_fsr_c
+++ /dev/null
@@ -1,57 +0,0 @@
---- xfsprogs-4.3.0.orig/fsr/xfs_fsr.c	2015-11-23 05:24:24.000000000 +0100
-+++ xfsprogs-4.3.0/fsr/xfs_fsr.c	2015-11-27 06:04:00.000000000 +0100
-@@ -30,7 +30,6 @@
- #include <sys/ioctl.h>
- #include <sys/wait.h>
- #include <sys/statvfs.h>
--#include <sys/xattr.h>
- 
- #ifndef XFS_XFLAG_NODEFRAG
- #define XFS_XFLAG_NODEFRAG 0x00002000 /* src dependancy, remove later */
-@@ -1044,6 +1043,7 @@ fsr_setup_attr_fork(
- 	 * use the old method if we have attr1 or the kernel does not yet
- 	 * support passing the fork offset in the bulkstat data.
- 	 */
-+#if 0
- 	if (!(fsgeom.flags & XFS_FSOP_GEOM_FLAGS_ATTR2) ||
- 	    bstatp->bs_forkoff == 0) {
- 		/* attr1 */
-@@ -1054,6 +1054,7 @@ fsr_setup_attr_fork(
- 		}
- 		goto out;
- 	}
-+#endif
- 
- 	/* attr2 w/ fork offsets */
- 
-@@ -1095,6 +1096,7 @@ fsr_setup_attr_fork(
- 		 * If there is no attribute, then we need to create one to get
- 		 * an attribute fork at the default location.
- 		 */
-+#if 0
- 		if (!tbstat.bs_forkoff) {
- 			ASSERT(i == 0);
- 			ret = fsetxattr(tfd, name, "XX", 2, XATTR_CREATE);
-@@ -1141,7 +1143,7 @@ fsr_setup_attr_fork(
- 				continue;
- 			}
- 		}
--
-+#endif
- 		/*
- 		 * make a progress check so we don't get stuck trying to extend
- 		 * a large btree form attribute fork.
-@@ -1177,11 +1179,13 @@ fsr_setup_attr_fork(
- 		}
- 
- 		/* we need to grow the attr fork, so create another attr */
-+#if 0
- 		ret = fsetxattr(tfd, name, "XX", 2, XATTR_CREATE);
- 		if (ret) {
- 			fsrprintf(_("could not set ATTR\n"));
- 			return -1;
- 		}
-+#endif
- 
- 	} while (++i < 100); /* don't go forever */
- 
diff --git a/package/xfsprogs/patches/patch-include_linux_h b/package/xfsprogs/patches/patch-include_linux_h
deleted file mode 100644
index d7836e61e..000000000
--- a/package/xfsprogs/patches/patch-include_linux_h
+++ /dev/null
@@ -1,10 +0,0 @@
---- xfsprogs-4.3.0.orig/include/linux.h	2015-11-10 20:54:46.000000000 +0100
-+++ xfsprogs-4.3.0/include/linux.h	2015-11-27 06:29:33.000000000 +0100
-@@ -29,6 +29,7 @@
- #include <errno.h>
- #include <endian.h>
- #include <stdbool.h>
-+#include <stdio.h>
- #include <asm/types.h>
- #include <mntent.h>
-