X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fxfsprogs;h=af6ccce37cd0c8dc17229968793d61be1de401ee;hp=2a548be832f76a448098b0cb4db36d4aeba7f179;hb=15b1a3e360a277dc7481103f8ddcbf189033e3a6;hpb=9572596c47e961c6f4d970b4c4c72bd5f90920e0

diff --git a/lfs/xfsprogs b/lfs/xfsprogs
index 2a548be832..af6ccce37c 100644
--- a/lfs/xfsprogs
+++ b/lfs/xfsprogs
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2018  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,17 +24,13 @@
 
 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)
-PROG       = xfsprogs
-PAK_VER    = 1
-
-DEPS       = ""
 
 ###############################################################################
 # Top-level Rules
@@ -44,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 174683e3b86b587ed59823fdbbb96ea4
+$(DL_FILE)_MD5 = 5f80b631b68df89a8b9283307e96d2e8
 
 install : $(TARGET)
 
@@ -76,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
-	cd $(DIR_APP) && make DEBUG=-DNDEBUG INSTALL_USER=root INSTALL_GROUP=root \
-												LOCAL_CONFIGURE_OPTIONS="--enable-readline=yes"
-	cd $(DIR_APP) && make install
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && make $(MAKETUNING) DEBUG=-DNDEBUG INSTALL_USER=root INSTALL_GROUP=root \
+		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}