X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fbash;h=09b4e71e689f1120f3060e003f70ae4a80331e63;hb=5f9bf17d76e43b1ee0bb4b880a9aa001844e4d4a;hp=ee1946ec019c5bf90762175041db9c912fb72f8e;hpb=56a435a001c4c33e72e4e8b412ba512b4d5fc796;p=ipfire-2.x.git

diff --git a/lfs/bash b/lfs/bash
index ee1946ec01..09b4e71e68 100644
--- a/lfs/bash
+++ b/lfs/bash
@@ -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        #
@@ -31,15 +31,15 @@ DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
-# Normal build or /tools build.
+# Normal build or $(TOOLS_DIR) build.
 #
 ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
-  CONFIGURE_OPTIONS = --prefix=/usr --bindir=/bin \
-    --with-installed-readline
+  CONFIGURE_OPTIONS = \
+	--bindir=/bin \
+	--with-installed-readline
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
-  CONFIGURE_OPTIONS = --prefix=/tools
 endif
 
 CONFIGURE_OPTIONS += \
@@ -87,27 +87,25 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	sed -e "s/filename, RTLD_LAZY/filename, RTLD_NOW/" \
 		-i $(DIR_APP)/builtins/enable.def
 
-	for i in $$(seq 1 18); do \
+	for i in $$(seq 1 30); do \
 		cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/bash/bash43-$$(printf "%03d" "$${i}") || exit 1; \
 	done
 
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/bash-4.0-paths-1.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/bash-4.0-profile-1.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/bash-3.2-ssh_source_bash.patch
-	cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/bash-4.3-CVE-2014-6271.patch
-	cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/bash-3.2-CVE-2014-7169.patch
 
-	cd $(DIR_APP) && ./configure $(CONFIGURE_OPTIONS)
+	cd $(DIR_APP) && ./configure --prefix=$(PREFIX) $(CONFIGURE_OPTIONS)
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 
-	ln -sf bash /bin/sh
+ifeq "$(TOOLCHAIN)" "1"
+	ln -svf bash $(TOOLS_DIR)/bin/sh
 
-ifneq "$(ROOT)" ""
-	-mkdir -p $(ROOT)/bin
-	-mkdir -p $(ROOT)/usr/bin
-	ln -sf bash /tools/bin/sh
-	-ln -sf /tools/bin/bash $(ROOT)/bin/sh
+	mkdir -pv $(ROOT)/bin
+	ln -svf ..$(TOOLS_DIR)/bin/bash $(ROOT)/bin/sh
+else
+	ln -svf bash /bin/sh
 endif
 
 	@rm -rf $(DIR_APP)