###############################################################################
-# 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 Michael Tremer & Christian Schmidt #
+# #
+# 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> #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
# #
###############################################################################
include Config
-VER = 2.05b
+VER = 3.2
THISAPP = bash-$(VER)
DL_FILE = $(THISAPP).tar.gz
#
ifeq "$(ROOT)" ""
TARGET = $(DIR_INFO)/$(THISAPP)
- EXTRA_CONFIG = --prefix=/usr --bindir=/bin --disable-nls
+ EXTRA_CONFIG = --prefix=/usr --bindir=/bin \
+ --without-bash-malloc --with-installed-readline \
+ --disable-nls
EXTRA_MAKE =
EXTRA_INSTALL =
else
TARGET = $(DIR_INFO)/$(THISAPP)-tools
- EXTRA_CONFIG = --prefix=/tools --disable-nls
+ EXTRA_CONFIG = --prefix=/tools --without-bash-malloc \
+ --disable-nls
EXTRA_MAKE =
EXTRA_INSTALL =
endif
+EXTRA_CONFIG += ac_cv_func_working_mktime=yes
+
###############################################################################
# Top-level Rules
###############################################################################
-objects = $(DL_FILE) $(THISAPP)-2.patch
+
+objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(THISAPP)-2.patch = $(URL_LFS)/bash/$(THISAPP)-2.patch
-$(DL_FILE)_MD5 = 5238251b4926d778dfe162f6ce729733
-$(THISAPP)-2.patch_MD5 = dfc7399bb57798e18fbb99f9edce4da0
+$(DL_FILE)_MD5 = 00bfa16d58e034e3c2aa27f390390d30
install : $(TARGET)
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && patch -Np1 < $(DIR_DL)/$(THISAPP)-2.patch
+
+ for i in $$(seq 1 51); do \
+ cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/bash/bash32-$$(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) && ./configure $(EXTRA_CONFIG)
cd $(DIR_APP) && make $(EXTRA_MAKE)
cd $(DIR_APP) && make $(EXTRA_INSTALL) install
-mkdir -p $(ROOT)/usr/bin
ln -sf bash /tools/bin/sh
-ln -sf /tools/bin/bash $(ROOT)/bin/sh
- echo "#!/bin/sh" > $(ROOT)/usr/bin/which
- echo "type -p \$$1" >> $(ROOT)/usr/bin/which
- chmod 755 $(ROOT)/usr/bin/which
endif
@rm -rf $(DIR_APP)
@$(POSTBUILD)