xfsprogs: update to 4.16.1.

Closes #14029.

Signed-off-by: Enno Boland <gottox@voidlinux.eu>
This commit is contained in:
maxice8 2018-05-01 20:48:29 -03:00 committed by Enno Boland
parent 197d050d77
commit f530c7c7a1
No known key found for this signature in database
GPG Key ID: D09964719BDE9971
3 changed files with 3 additions and 105 deletions

View File

@ -1,11 +0,0 @@
--- fsck/xfs_fsck.sh
+++ fsck/xfs_fsck.sh
@@ -6,7 +6,7 @@
NAME=$0
# get the right return code for fsck
-function repair2fsck_code() {
+repair2fsck_code() {
case $1 in
0) return 0 # everything is ok
;;

View File

@ -1,91 +0,0 @@
--- fsr/xfs_fsr.c.orig 2016-12-21 06:36:07.000000000 +0100
+++ fsr/xfs_fsr.c 2017-01-16 15:13:16.077553350 +0100
@@ -36,6 +36,9 @@
#define _PATH_FSRLAST "/var/tmp/.fsrlast_xfs"
#define _PATH_PROC_MOUNTS "/proc/mounts"
+#ifndef _PATH_MOUNTED
+#define _PATH_MOUNTED MOUNTED
+#endif
char *progname;
--- include/linux.h.orig 2016-12-21 06:36:07.000000000 +0100
+++ include/linux.h 2017-01-16 15:15:39.600759063 +0100
@@ -40,6 +40,32 @@
# undef fsxattr
#endif
+#ifndef __uint8_t
+#define __uint8_t uint8_t
+#endif
+#ifndef __uint16_t
+#define __uint16_t uint16_t
+#endif
+#ifndef __uint32_t
+#define __uint32_t uint32_t
+#endif
+#ifndef __uint64_t
+#define __uint64_t uint64_t
+#endif
+
+#ifndef __int8_t
+#define __int8_t int8_t
+#endif
+#ifndef __int16_t
+#define __int16_t int16_t
+#endif
+#ifndef __int32_t
+#define __int32_t int32_t
+#endif
+#ifndef __int64_t
+#define __int64_t int64_t
+#endif
+
static __inline__ int xfsctl(const char *path, int fd, int cmd, void *p)
{
return ioctl(fd, cmd, p);
--- io/readdir.c.orig 2017-01-05 18:41:55.000000000 +0100
+++ io/readdir.c 2017-01-16 15:19:55.995553687 +0100
@@ -24,6 +24,18 @@
#include <sys/types.h>
#include <dirent.h>
+#if defined (__linux__)
+#ifndef _DIRENT_HAVE_D_OFF
+#define _DIRENT_HAVE_D_OFF
+#endif
+#ifndef _DIRENT_HAVE_D_RECLEN
+#define _DIRENT_HAVE_D_RECLEN
+#endif
+#ifndef _DIRENT_HAVE_D_TYPE
+#define _DIRENT_HAVE_D_TYPE
+#endif
+#endif
+
static struct cmdinfo readdir_cmd;
const char *d_type_str(unsigned int type)
--- scrub/read_verify.c
+++ scrub/read_verify.c
@@ -22,6 +22,7 @@
#include <stdbool.h>
#include <stdlib.h>
#include <sys/statvfs.h>
+#include <pthread.h>
#include "workqueue.h"
#include "path.h"
#include "xfs.h"
--- scrub/xfs_scrub.c
+++ scrub/xfs_scrub.c
@@ -195,6 +195,10 @@ usage(void)
# define RUSAGE_BOTH (-2)
#endif
+#ifndef _PATH_MOUNTED
+#define _PATH_MOUNTED MOUNTED
+#endif
+
/* Get resource usage for ourselves and all children. */
static int
scrub_getrusage(

View File

@ -1,7 +1,7 @@
# Template file for 'xfsprogs' # Template file for 'xfsprogs'
pkgname=xfsprogs pkgname=xfsprogs
version=4.16.0 version=4.16.1
revision=2 revision=1
build_style=gnu-configure build_style=gnu-configure
configure_args="--enable-readline=yes --enable-lib64=no" configure_args="--enable-readline=yes --enable-lib64=no"
hostmakedepends="libuuid-devel" hostmakedepends="libuuid-devel"
@ -11,7 +11,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="LGPL-2.1-or-later" license="LGPL-2.1-or-later"
homepage="http://xfs.org/index.php/Main_Page" homepage="http://xfs.org/index.php/Main_Page"
distfiles="${KERNEL_SITE}/utils/fs/xfs/xfsprogs/xfsprogs-${version}.tar.xz" distfiles="${KERNEL_SITE}/utils/fs/xfs/xfsprogs/xfsprogs-${version}.tar.xz"
checksum=4dedd5021eab0dcf77c2257642523546fce67fd0b017f8cf3bbe6678302e3300 checksum=3d5c2da46112b86cbd967fee43cea731d38a1b2aaf601b57674ed34e808652df
do_install() { do_install() {
make install install-dev DIST_ROOT=${DESTDIR} \ make install install-dev DIST_ROOT=${DESTDIR} \