xfsprogs: Update to 4.18.0

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/common/xfsprogs b/config/rootfiles/common/xfsprogs
index 4c445341bb9abcad405d2c4b580c9f6c7e0b31e9..584ded0fef9d3edd9d0cf48931b622540a8c7fff 100644 (file)
--- a/config/rootfiles/common/xfsprogs
+++ b/config/rootfiles/common/xfsprogs
@@ -3,14 +3,32 @@ lib/libhandle.so.1.0.3
 sbin/fsck.xfs
 sbin/mkfs.xfs
 sbin/xfs_repair
+sbin/xfs_scrub
+sbin/xfs_scrub_all
+#usr/include/xfs
+#usr/include/xfs/handle.h
+#usr/include/xfs/jdm.h
+#usr/include/xfs/linux.h
+#usr/include/xfs/xfs.h
+#usr/include/xfs/xfs_arch.h
+#usr/include/xfs/xfs_da_format.h
+#usr/include/xfs/xfs_format.h
+#usr/include/xfs/xfs_fs.h
+#usr/include/xfs/xfs_log_format.h
+#usr/include/xfs/xfs_types.h
+#usr/include/xfs/xqm.h
+#usr/lib/libhandle.a
 #usr/lib/libhandle.la
 #usr/lib/libhandle.so
+#usr/lib/xfsprogs
+#usr/lib/xfsprogs/xfs_scrub_all.cron
 usr/sbin/xfs_admin
 usr/sbin/xfs_bmap
-usr/sbin/xfs_check
 usr/sbin/xfs_copy
 usr/sbin/xfs_db
+usr/sbin/xfs_estimate
 usr/sbin/xfs_freeze
+usr/sbin/xfs_fsr
 usr/sbin/xfs_growfs
 usr/sbin/xfs_info
 usr/sbin/xfs_io
@@ -21,22 +39,39 @@ usr/sbin/xfs_mkfile
 usr/sbin/xfs_ncheck
 usr/sbin/xfs_quota
 usr/sbin/xfs_rtcp
+usr/sbin/xfs_spaceman
 #usr/share/doc/xfsprogs
 #usr/share/doc/xfsprogs/CHANGES.gz
-#usr/share/doc/xfsprogs/COPYING
 #usr/share/doc/xfsprogs/CREDITS
-#usr/share/doc/xfsprogs/PORTING
 #usr/share/doc/xfsprogs/README
+#usr/share/locale/de/LC_MESSAGES/xfsprogs.mo
 #usr/share/locale/pl/LC_MESSAGES/xfsprogs.mo
+#usr/share/man/man2/ioctl_xfs_scrub_metadata.2
+#usr/share/man/man3/attr_list_by_handle.3
+#usr/share/man/man3/attr_multi_by_handle.3
+#usr/share/man/man3/fd_to_handle.3
+#usr/share/man/man3/free_handle.3
+#usr/share/man/man3/fssetdm_by_handle.3
+#usr/share/man/man3/getparentpaths_by_handle.3
+#usr/share/man/man3/getparents_by_handle.3
+#usr/share/man/man3/handle_to_fshandle.3
+#usr/share/man/man3/open_by_handle.3
+#usr/share/man/man3/path_to_fshandle.3
+#usr/share/man/man3/path_to_handle.3
+#usr/share/man/man3/readlink_by_handle.3
+#usr/share/man/man3/xfsctl.3
+#usr/share/man/man5/projects.5
+#usr/share/man/man5/projid.5
 #usr/share/man/man5/xfs.5
 #usr/share/man/man8/fsck.xfs.8
 #usr/share/man/man8/mkfs.xfs.8
 #usr/share/man/man8/xfs_admin.8
 #usr/share/man/man8/xfs_bmap.8
-#usr/share/man/man8/xfs_check.8
 #usr/share/man/man8/xfs_copy.8
 #usr/share/man/man8/xfs_db.8
+#usr/share/man/man8/xfs_estimate.8
 #usr/share/man/man8/xfs_freeze.8
+#usr/share/man/man8/xfs_fsr.8
 #usr/share/man/man8/xfs_growfs.8
 #usr/share/man/man8/xfs_info.8
 #usr/share/man/man8/xfs_io.8
@@ -48,3 +83,6 @@ usr/sbin/xfs_rtcp
 #usr/share/man/man8/xfs_quota.8
 #usr/share/man/man8/xfs_repair.8
 #usr/share/man/man8/xfs_rtcp.8
+#usr/share/man/man8/xfs_scrub.8
+#usr/share/man/man8/xfs_scrub_all.8
+#usr/share/man/man8/xfs_spaceman.8

diff --git a/config/rootfiles/core/125/filelists/xfsprogs b/config/rootfiles/core/125/filelists/xfsprogs
new file mode 120000 (symlink)
index 0000000..9103296
--- /dev/null
+++ b/config/rootfiles/core/125/filelists/xfsprogs
@@ -0,0 +1 @@
+../../../common/xfsprogs
\ No newline at end of file

diff --git a/lfs/xfsprogs b/lfs/xfsprogs
index c104e84903bde83f1d976e4c587f4c9868cf7564..b68e1b138f64ac70d0f24dd93db98b1991231bb6 100644 (file)
--- a/lfs/xfsprogs
+++ b/lfs/xfsprogs
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 2.9.4
+VER        = 4.18.0
 
 THISAPP    = xfsprogs-$(VER)
-DL_FILE    = xfsprogs_$(VER)-1.tar.gz
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 174683e3b86b587ed59823fdbbb96ea4
+$(DL_FILE)_MD5 = 5f80b631b68df89a8b9283307e96d2e8
 
 install : $(TARGET)
 
@@ -72,13 +72,10 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && sed -i "/include/a #include <sys\/stat.h>" \
-               libxfs/xfs_ialloc.c quota/quot.c mdrestore/xfs_mdrestore.c \
-               rtcp/xfs_rtcp.c
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && make DEBUG=-DNDEBUG INSTALL_USER=root INSTALL_GROUP=root \
-                                                                                               LOCAL_CONFIGURE_OPTIONS="--enable-readline=yes"
-       cd $(DIR_APP) && make install
+               LOCAL_CONFIGURE_OPTIONS="--enable-readline=yes"
+       cd $(DIR_APP) && make install install-dev
        cd $(DIR_APP) && install -v -m755 -D libhandle/libhandle.la /usr/lib/libhandle.la
        chmod -v 755 /lib/libhandle.so*
        rm -f /lib/libhandle.{a,la,so}