X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fe2fsprogs;h=8fda71389f62fe057b908d429b0284a4902e10d8;hp=28f74f2a60adcc4f13098e3015807c7d67d07f96;hb=61424e9c67334f2940ec8be66612b0a6b4df7adb;hpb=cd1a2927226c734d96478e12bb768256fb64a06a

diff --git a/lfs/e2fsprogs b/lfs/e2fsprogs
index 28f74f2a60..8fda71389f 100644
--- a/lfs/e2fsprogs
+++ b/lfs/e2fsprogs
@@ -1,28 +1,20 @@
 ###############################################################################
-# This file is part of the IPCop Firewall.                                    #
 #                                                                             #
-# IPCop is free software; you can redistribute it and/or modify               #
+# IPFire.org - A linux based firewall                                         #
+# 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        #
-# the Free Software Foundation; either version 2 of the License, or           #
+# the Free Software Foundation, either version 3 of the License, or           #
 # (at your option) any later version.                                         #
 #                                                                             #
-# IPCop is distributed in the hope that it will be useful,                    #
+# This program is distributed in the hope that it will be useful,             #
 # but WITHOUT ANY WARRANTY; without even the implied warranty of              #
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
 # GNU General Public License for more details.                                #
 #                                                                             #
 # You should have received a copy of the GNU General Public License           #
-# along with IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
-#                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: e2fsprogs,v 1.7.2.4 2005/02/05 15:38:14 gespinasse Exp $
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -32,17 +24,13 @@
 
 include Config
 
-VER      = 1.35
+VER      = 1.44.4
 
 THISAPP    = e2fsprogs-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_SFNET)/e2fsprogs
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
-ifeq "$(LFS_PASS)" "install"
-  TARGET     = $(DIR_INFO)/$(THISAPP)-install
-else
-  TARGET     = $(DIR_INFO)/$(THISAPP)
-endif
+TARGET     = $(DIR_INFO)/$(THISAPP)
 
 ###############################################################################
 # Top-level Rules
@@ -52,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 8d25ffd60d405ef32d341704a2323807
+$(DL_FILE)_MD5 = 156e94a6169ca1fa3f0c6749ae5921b9
 
 install : $(TARGET)
 
@@ -81,29 +69,18 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) $(DIR_SRC)/e2fsprogs-build && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-ifeq "$(LFS_PASS)" "install"
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-install.patch
-	-mkdir -p /install/misc/bin
-	cd $(DIR_APP) && CFLAGS="-Os -fomit-frame-pointer" ./configure --disable-nls
-	cd $(DIR_APP)/util && CC=/usr/bin/gcc BUILD_CC=/usr/bin/gcc make -e
-	cd $(DIR_APP) && make lib/blkid/blkid_types.h
-	cd $(DIR_APP) && make lib/ext2fs/ext2_types.h
-	cd $(DIR_APP) && make lib/uuid/uuid_types.h
-	cd $(DIR_APP)/lib/blkid && make
-	cd $(DIR_APP)/lib/et && make
-	cd $(DIR_APP)/lib/ext2fs && make
-	cd $(DIR_APP)/lib/e2p && make
-	cd $(DIR_APP)/lib/uuid && make
-	cd $(DIR_APP)/misc && make mke2fs
-	cd $(DIR_APP) && install -m 0755 misc/mke2fs /install/misc/bin
-else
-	cd $(DIR_SRC) && mkdir e2fsprogs-build
-	cd $(DIR_SRC)/e2fsprogs-build && $(DIR_APP)/configure --prefix=/usr --disable-nls \
-	    --with-root-prefix="" --enable-elf-shlibs --disable-evms
-	cd $(DIR_SRC)/e2fsprogs-build && make
-	cd $(DIR_SRC)/e2fsprogs-build && make install
-	cd $(DIR_SRC)/e2fsprogs-build && make install-libs
-endif
-	@rm -rf $(DIR_APP) $(DIR_SRC)/e2fsprogs-build
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	-mkdir -pv $(DIR_APP)/build
+	cd $(DIR_APP)/build && \
+		$(DIR_APP)/configure \
+			--prefix=/usr \
+			--with-root-prefix="" \
+			--enable-elf-shlibs \
+			--disable-nls
+
+	cd $(DIR_APP)/build && make $(MAKETUNING)
+	cd $(DIR_APP)/build && make install
+	cd $(DIR_APP)/build && make install-libs
+	chmod -v u+w /usr/lib/{libcom_err,libe2p,libext2fs,libss}.a
+	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)