xfsprogs: update to 4.12.0
Commit Message
Signed-off-by: Marcel Lorenz <marcel.lorenz@ipfire.org>
---
config/rootfiles/common/xfsprogs | 13 ++++++++++---
lfs/xfsprogs | 21 +++++++++++----------
2 files changed, 21 insertions(+), 13 deletions(-)
@@ -3,14 +3,16 @@ lib/libhandle.so.1.0.3
sbin/fsck.xfs
sbin/mkfs.xfs
sbin/xfs_repair
+#usr/include/xfs
#usr/lib/libhandle.la
#usr/lib/libhandle.so
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 +23,26 @@ 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/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 +54,4 @@ 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_spaceman.8
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
+# Copyright (C) 2007-2017 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,10 +24,10 @@
include Config
-VER = 2.9.4
+VER = 4.12.0
THISAPP = xfsprogs-$(VER)
-DL_FILE = xfsprogs_$(VER)-1.tar.gz
+DL_FILE = xfsprogs-$(VER).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 = e348b0e1d7bd1cd82d64b91ff37e727e
install : $(TARGET)
@@ -72,16 +72,17 @@ $(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
- cd $(DIR_APP) && make DEBUG=-DNDEBUG INSTALL_USER=root INSTALL_GROUP=root \
- LOCAL_CONFIGURE_OPTIONS="--enable-readline=yes"
+ @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"
cd $(DIR_APP) && make install
cd $(DIR_APP) && install -v -m755 -D libhandle/libhandle.la /usr/lib/libhandle.la
chmod -v 755 /lib/libhandle.so*
+ rm -f /usr/lib/libhandle.a
rm -f /lib/libhandle.{a,la,so}
ln -svf ../../lib/libhandle.so.1 /usr/lib/libhandle.so
+ sed -i "s@libdir='/lib@libdir='/usr/lib@" /usr/lib/libhandle.la
@rm -rf $(DIR_APP)
@$(POSTBUILD)