Merge remote-tracking branch 'origin/next' into install-raid

Conflicts:
	lfs/bash

diff --combined config/rootfiles/common/bash
index 84f587f3cdb458ab43f156b7d985f57a1fe2ec4f,6afa0e45ec4bf0029d8835743d47364adac262c0..a2b6a87e3d8fe670b81f062dc9340c998381940a
--- 1/config/rootfiles/common/bash
--- 2/config/rootfiles/common/bash
+++ b/config/rootfiles/common/bash
@@@ -13,47 -13,44 +13,86 @@@ bin/bas
  #usr/share/doc/bash/bash.html
  #usr/share/doc/bash/bashref.html
  #usr/share/info/bash.info
 +#usr/share/locale/af/LC_MESSAGES/bash.mo
 +#usr/share/locale/bg/LC_MESSAGES/bash.mo
 +#usr/share/locale/ca/LC_MESSAGES/bash.mo
 +#usr/share/locale/cs/LC_MESSAGES/bash.mo
 +#usr/share/locale/da/LC_MESSAGES/bash.mo
 +#usr/share/locale/de/LC_MESSAGES/bash.mo
 +#usr/share/locale/el/LC_MESSAGES/bash.mo
 +#usr/share/locale/en@boldquot
 +#usr/share/locale/en@boldquot/LC_MESSAGES
 +#usr/share/locale/en@boldquot/LC_MESSAGES/bash.mo
 +#usr/share/locale/en@quot
 +#usr/share/locale/en@quot/LC_MESSAGES
 +#usr/share/locale/en@quot/LC_MESSAGES/bash.mo
 +#usr/share/locale/eo/LC_MESSAGES/bash.mo
 +#usr/share/locale/es/LC_MESSAGES/bash.mo
 +#usr/share/locale/et/LC_MESSAGES/bash.mo
 +#usr/share/locale/fi/LC_MESSAGES/bash.mo
 +#usr/share/locale/fr/LC_MESSAGES/bash.mo
 +#usr/share/locale/ga/LC_MESSAGES/bash.mo
 +#usr/share/locale/gl/LC_MESSAGES/bash.mo
 +#usr/share/locale/hr/LC_MESSAGES/bash.mo
 +#usr/share/locale/hu/LC_MESSAGES/bash.mo
 +#usr/share/locale/id/LC_MESSAGES/bash.mo
 +#usr/share/locale/it/LC_MESSAGES/bash.mo
 +#usr/share/locale/ja/LC_MESSAGES/bash.mo
 +#usr/share/locale/lt/LC_MESSAGES/bash.mo
 +#usr/share/locale/nl/LC_MESSAGES/bash.mo
 +#usr/share/locale/pl/LC_MESSAGES/bash.mo
 +#usr/share/locale/pt_BR/LC_MESSAGES/bash.mo
 +#usr/share/locale/ro/LC_MESSAGES/bash.mo
 +#usr/share/locale/ru/LC_MESSAGES/bash.mo
 +#usr/share/locale/sk/LC_MESSAGES/bash.mo
 +#usr/share/locale/sl/LC_MESSAGES/bash.mo
 +#usr/share/locale/sr
 +#usr/share/locale/sr/LC_MESSAGES
 +#usr/share/locale/sr/LC_MESSAGES/bash.mo
 +#usr/share/locale/sv/LC_MESSAGES/bash.mo
 +#usr/share/locale/tr/LC_MESSAGES/bash.mo
 +#usr/share/locale/uk/LC_MESSAGES/bash.mo
 +#usr/share/locale/vi/LC_MESSAGES/bash.mo
 +#usr/share/locale/zh_CN/LC_MESSAGES/bash.mo
 +#usr/share/locale/zh_TW/LC_MESSAGES/bash.mo
  #usr/share/man/man1/bash.1
  #usr/share/man/man1/bashbug.1
+ #usr/share/locale/af
+ #usr/share/locale/af/LC_MESSAGES
+ #usr/share/locale/af/LC_MESSAGES/bash.mo
+ #usr/share/locale/bg/LC_MESSAGES/bash.mo
+ #usr/share/locale/ca/LC_MESSAGES/bash.mo
+ #usr/share/locale/cs/LC_MESSAGES/bash.mo
+ #usr/share/locale/da/LC_MESSAGES/bash.mo
+ #usr/share/locale/de/LC_MESSAGES/bash.mo
+ #usr/share/locale/el/LC_MESSAGES/bash.mo
+ #usr/share/locale/en@boldquot
+ #usr/share/locale/en@boldquot/LC_MESSAGES
+ #usr/share/locale/en@boldquot/LC_MESSAGES/bash.mo
+ #usr/share/locale/en@quot/LC_MESSAGES/bash.mo
+ #usr/share/locale/eo/LC_MESSAGES/bash.mo
+ #usr/share/locale/es/LC_MESSAGES/bash.mo
+ #usr/share/locale/et/LC_MESSAGES/bash.mo
+ #usr/share/locale/fi/LC_MESSAGES/bash.mo
+ #usr/share/locale/fr/LC_MESSAGES/bash.mo
+ #usr/share/locale/ga/LC_MESSAGES/bash.mo
+ #usr/share/locale/gl/LC_MESSAGES/bash.mo
+ #usr/share/locale/hr/LC_MESSAGES/bash.mo
+ #usr/share/locale/hu/LC_MESSAGES/bash.mo
+ #usr/share/locale/id/LC_MESSAGES/bash.mo
+ #usr/share/locale/it/LC_MESSAGES/bash.mo
+ #usr/share/locale/ja/LC_MESSAGES/bash.mo
+ #usr/share/locale/lt/LC_MESSAGES/bash.mo
+ #usr/share/locale/nl/LC_MESSAGES/bash.mo
+ #usr/share/locale/pl/LC_MESSAGES/bash.mo
+ #usr/share/locale/pt_BR/LC_MESSAGES/bash.mo
+ #usr/share/locale/ro/LC_MESSAGES/bash.mo
+ #usr/share/locale/ru/LC_MESSAGES/bash.mo
+ #usr/share/locale/sk/LC_MESSAGES/bash.mo
+ #usr/share/locale/sl/LC_MESSAGES/bash.mo
+ #usr/share/locale/sr
+ #usr/share/locale/sr/LC_MESSAGES
+ #usr/share/locale/sr/LC_MESSAGES/bash.mo
+ #usr/share/locale/sv/LC_MESSAGES/bash.mo
+ #usr/share/locale/tr/LC_MESSAGES/bash.mo
+ #usr/share/locale/uk/LC_MESSAGES/bash.mo

diff --combined lfs/bash
index ae5a2837ace18fbd0ba1c0414984ad67ff3cfcbb,e6c8d5eb23ce59d033b2e57a83fcc23e741bccbd..79dce52880edd3f5dd5dee9544f3fe3cabbd17c2
--- 1/lfs/bash
--- 2/lfs/bash
+++ b/lfs/bash
@@@ -1,7 -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,7 -87,7 +87,7 @@@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(
        sed -e "s/filename, RTLD_LAZY/filename, RTLD_NOW/" \
                -i $(DIR_APP)/builtins/enable.def
  
-       for i in $$(seq 1 26); do \
+       for i in $$(seq 1 27); do \
                cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/bash/bash43-$$(printf "%03d" "$${i}") || exit 1; \
        done
  

diff --combined make.sh
index 8a2ecc6e1b5ab59d1e8a7f2b3f5504b8f0d79231,23ef2b66e4cbd56ed7fbc0712360dd049d0999a9..a9c2da16c3422456a9542c295a320aafe695cbba
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -25,8 -25,8 +25,8 @@@
  NAME="IPFire"                                                 # Software name
  SNAME="ipfire"                                                        # Short name
  VERSION="2.15"                                                        # Version number
- CORE="82"                                                     # Core Level (Filename)
- PAKFIRE_CORE="82"                                             # Core Level (PAKFIRE)
+ CORE="84"                                                     # Core Level (Filename)
+ PAKFIRE_CORE="83"                                             # Core Level (PAKFIRE)
  GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`                  # Git Branch
  SLOGAN="www.ipfire.org"                                               # Software slogan
  CONFIG_ROOT=/var/ipfire                                               # Configuration rootdir
@@@ -362,6 -362,7 +362,6 @@@ buildbase() 
      lfsmake2 less
      lfsmake2 make
      lfsmake2 man
 -    lfsmake2 mktemp
      lfsmake2 kmod
      lfsmake2 net-tools
      lfsmake2 patch
@@@ -376,6 -377,7 +376,6 @@@
      lfsmake2 vim
      lfsmake2 xz
      lfsmake2 paxctl
 -    lfsmake2 grub
  }
  
  buildipfire() {
@@@ -396,13 -398,6 +396,13 @@@
    ipfiremake rpi-firmware
    ipfiremake bc
    ipfiremake u-boot
 +  ipfiremake cpio
 +  ipfiremake mdadm
 +  ipfiremake dracut
 +  ipfiremake lvm2
 +  ipfiremake multipath-tools
 +  ipfiremake freetype
 +  ipfiremake grub
  
    case "${TARGET_ARCH}" in
        i586)
@@@ -471,6 -466,8 +471,6 @@@
    ipfiremake dhcpcd
    ipfiremake boost
    ipfiremake linux-atm
 -  ipfiremake cpio
 -  ipfiremake dracut
    ipfiremake expat
    ipfiremake gdbm
    ipfiremake pam
@@@ -489,12 -486,12 +489,12 @@@
    ipfiremake libpng
    ipfiremake libtiff
    ipfiremake libart
 -  ipfiremake freetype
    ipfiremake gd
    ipfiremake popt
    ipfiremake pcre
    ipfiremake slang
    ipfiremake newt
 +  ipfiremake libsmooth
    ipfiremake attr
    ipfiremake acl
    ipfiremake libcap
@@@ -750,6 -747,7 +750,6 @@@
    ipfiremake usb_modeswitch
    ipfiremake usb_modeswitch_data
    ipfiremake zerofree
 -  ipfiremake mdadm
    ipfiremake pound
    ipfiremake minicom
    ipfiremake ddrescue
@@@ -816,7 -814,6 +816,7 @@@
    ipfiremake batctl
    ipfiremake perl-PDF-API2
    ipfiremake squid-accounting
 +  ipfiremake pigz
  }
  
  buildinstaller() {
@@@ -826,6 -823,7 +826,6 @@@
    ipfiremake memtest
    ipfiremake installer
    installmake strip
 -  ipfiremake initrd
  }
  
  buildpackages() {
@@@ -862,7 -860,6 +862,7 @@@
    modprobe loop 2>/dev/null
    if [ $BUILD_IMAGES == 1 ] && ([ -e /dev/loop/0 ] || [ -e /dev/loop0 ] || [ -e "/dev/loop-control" ]); then
        ipfiremake flash-images
 +      ipfiremake flash-images SCON=1
    fi
  
    mv $LFS/install/images/{*.iso,*.tgz,*.img.gz,*.bz2} $BASEDIR >> $LOGFILE 2>&1