captive: One month is only 30 days instead of 210

[ipfire-2.x.git] / lfs / bash

diff --git a/lfs/bash b/lfs/bash
index ee1946ec019c5bf90762175041db9c912fb72f8e..e98b6fdba8a1bc3ce02cabecfc8bac065dc45a6d 100644 (file)
--- 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-2014   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        #
@@ -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) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
 
-       ln -sf bash /bin/sh
+ifeq "$(TOOLCHAIN)" "1"
+       ln -svf bash /tools/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/bin/bash $(ROOT)/bin/sh
+else
+       ln -svf bash /bin/sh
 endif
 
        @rm -rf $(DIR_APP)