Merge branch 'next' into fifteen

diff --combined lfs/strongswan
index 9ac2e68c7e74163b4af2fe6bf4df8ebd70c6642e,1aed31feca4c560ab4040202becc72422f204964..f573cd851041cc28a5ff7be8eba70c084ef77de5
--- 1/lfs/strongswan
--- 2/lfs/strongswan
+++ b/lfs/strongswan
@@@ -24,7 -24,7 +24,7 @@@
  
  include Config
  
- VER        = 5.1.0
+ VER        = 5.1.1dr4
  
  THISAPP    = strongswan-$(VER)
  DL_FILE    = $(THISAPP).tar.bz2
@@@ -46,7 -46,7 +46,7 @@@ objects = $(DL_FILE
  
  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
  
- $(DL_FILE)_MD5 = c1cd0a3ba9960f590cae28c8470800e8
+ $(DL_FILE)_MD5 = 05899faa9b8a8f253474af809b283ef9
  
  install : $(TARGET)
  
@@@ -76,7 -76,8 +76,7 @@@ $(subst %,%_MD5,$(objects)) 
  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 -
 -      cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-4.5.3_ipfire.patch
 +      cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-5.0.2_ipfire.patch
  
        cd $(DIR_APP) && [ -x "configure" ] || ./autogen.sh
        cd $(DIR_APP) && ./configure \

diff --combined make.sh
index 61308921c8e88cc78bc30517f7470b9fd7b787a6,7184ed74ac9e82e79a5b21b0c747695b1f68201a..0101bb090a20257d646ef574c7ba2c60fd4fd9ea
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -32,12 -32,12 +32,12 @@@ SLOGAN="www.ipfire.org"                                            # Softwar
  CONFIG_ROOT=/var/ipfire                                               # Configuration rootdir
  NICE=10                                                               # Nice level
  MAX_RETRIES=1                                                 # prefetch/check loop
 -BUILD_IMAGES=1                                                        # Build USB, Flash and Xen Images
 +BUILD_IMAGES=1                                                        # Flash and Xen Downloader
  KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'`
  MACHINE=`uname -m`
  GIT_TAG=$(git tag | tail -1)                                  # Git Tag
  GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8)        # Last commit
 -TOOLCHAINVER=6
 +TOOLCHAINVER=7
  
  BUILDMACHINE=$MACHINE
      if [ "$MACHINE" = "x86_64" ]; then
@@@ -83,22 -83,6 +83,22 @@@ if [ -z $EDITOR ]; the
        [ -z $EDITOR ] && exiterror "You should have installed an editor."
  fi
  
 +# Prepare string for /etc/system-release.
 +SYSTEM_RELEASE="${NAME} ${VERSION} (${MACHINE})"
 +if [ "$(git status -s | wc -l)" == "0" ]; then
 +      GIT_STATUS=""
 +else
 +      GIT_STATUS="-dirty"
 +fi
 +case "$GIT_BRANCH" in
 +      core*|beta?|rc?)
 +              SYSTEM_RELEASE="${SYSTEM_RELEASE} - $GIT_BRANCH$GIT_STATUS"
 +              ;;
 +      *)
 +              SYSTEM_RELEASE="${SYSTEM_RELEASE} - Development Build: $GIT_BRANCH/$GIT_LASTCOMMIT$GIT_STATUS"
 +              ;;
 +esac
 +
  prepareenv() {
      ############################################################################
      #                                                                          #
@@@ -373,7 -357,6 +373,7 @@@ buildbase() 
      lfsmake2 util-linux
      lfsmake2 vim
      lfsmake2 xz
 +    lfsmake2 paxctl
      lfsmake2 grub
  }
  
@@@ -386,6 -369,7 +386,7 @@@ buildipfire() 
    ipfiremake dhcp
    ipfiremake dhcpcd
    ipfiremake libusb
+   ipfiremake libusbx
    ipfiremake libpcap
    ipfiremake ppp
    ipfiremake pptp
@@@ -395,60 -379,75 +396,60 @@@
    ipfiremake dvb-firmwares
    ipfiremake zd1211-firmware
    ipfiremake rpi-firmware
 +  ipfiremake bc
    ipfiremake u-boot
  
    if [ "${MACHINE_TYPE}" != "arm" ]; then
  
 -    # x86-xen (Legacy XEN) kernel build
 -    ipfiremake linux2                 KCFG="-xen"
 -    ipfiremake v4l-dvb                        KCFG="-xen"
 -    ipfiremake mISDN                  KCFG="-xen"
 -    ipfiremake cryptodev              KCFG="-xen"
 -    ipfiremake compat-drivers         KCFG="-xen"
 -    ipfiremake r8169                  KCFG="-xen"
 -    ipfiremake r8168                  KCFG="-xen"
 -    ipfiremake r8101                  KCFG="-xen"
 -    ipfiremake e1000                  KCFG="-xen"
 -    ipfiremake e1000e                 KCFG="-xen"
 -    ipfiremake igb                    KCFG="-xen"
 -
      # x86-pae (Native and new XEN) kernel build
      ipfiremake linux                  KCFG="-pae"
 -    ipfiremake kvm-kmod                       KCFG="-pae"
 -    ipfiremake v4l-dvb                        KCFG="-pae"
 -    ipfiremake mISDN                  KCFG="-pae"
 +#    ipfiremake kvm-kmod                      KCFG="-pae"
 +#    ipfiremake v4l-dvb                       KCFG="-pae"
 +#    ipfiremake mISDN                 KCFG="-pae"
      ipfiremake cryptodev              KCFG="-pae"
 -    ipfiremake compat-drivers         KCFG="-pae"
 -    ipfiremake r8169                  KCFG="-pae"
 -    ipfiremake r8168                  KCFG="-pae"
 -    ipfiremake r8101                  KCFG="-pae"
 -    ipfiremake e1000e                 KCFG="-pae"
 -    ipfiremake igb                    KCFG="-pae"
 +#    ipfiremake compat-drivers                KCFG="-pae"
 +#    ipfiremake r8169                 KCFG="-pae"
 +#    ipfiremake r8168                 KCFG="-pae"
 +#    ipfiremake r8101                 KCFG="-pae"
 +#    ipfiremake e1000e                        KCFG="-pae"
 +#    ipfiremake igb                   KCFG="-pae"
  
      # x86 kernel build
      ipfiremake linux                  KCFG=""
 -    ipfiremake kvm-kmod                       KCFG=""
 -    ipfiremake v4l-dvb                        KCFG=""
 -    ipfiremake mISDN                  KCFG=""
 +#    ipfiremake kvm-kmod                      KCFG=""
 +#    ipfiremake v4l-dvb                       KCFG=""
 +#    ipfiremake mISDN                 KCFG=""
      ipfiremake cryptodev              KCFG=""
 -    ipfiremake compat-drivers         KCFG=""
 -    ipfiremake r8169                  KCFG=""
 -    ipfiremake r8168                  KCFG=""
 -    ipfiremake r8101                  KCFG=""
 -    ipfiremake e1000e                 KCFG=""
 -    ipfiremake igb                    KCFG=""
 +#    ipfiremake compat-drivers                KCFG=""
 +#    ipfiremake r8169                 KCFG=""
 +#    ipfiremake r8168                 KCFG=""
 +#    ipfiremake r8101                 KCFG=""
 +#    ipfiremake e1000e                        KCFG=""
 +#    ipfiremake igb                   KCFG=""
  
    else
      # arm-rpi (Raspberry Pi) kernel build
      ipfiremake linux                  KCFG="-rpi"
 -    ipfiremake v4l-dvb                        KCFG="-rpi"
 -    ipfiremake mISDN                  KCFG="-rpi" NOPCI=1
 +#    ipfiremake v4l-dvb                       KCFG="-rpi"
 +#    ipfiremake mISDN                 KCFG="-rpi" NOPCI=1
      ipfiremake cryptodev              KCFG="-rpi"
 -    ipfiremake compat-drivers         KCFG="-rpi"
 +#    ipfiremake compat-drivers                KCFG="-rpi"
  
 -    # arm-omap (Panda Board) kernel build
 -    ipfiremake linux                  KCFG="-omap"
 -    ipfiremake v4l-dvb                        KCFG="-omap"
 -    ipfiremake mISDN                  KCFG="-omap" NOPCI=1
 -    ipfiremake cryptodev              KCFG="-omap"
 -    ipfiremake compat-drivers         KCFG="-omap"
 +    # arm multi platform (Panda, Wandboard ...) kernel build
 +    ipfiremake linux                  KCFG="-multi"
 +    ipfiremake cryptodev              KCFG="-multi"
  
      # arm-kirkwood (Dreamplug, ICY-Box ...) kernel build
      ipfiremake linux                  KCFG="-kirkwood"
 -    ipfiremake v4l-dvb                        KCFG="-kirkwood"
 -    ipfiremake mISDN                  KCFG="-kirkwood"
 +#    ipfiremake v4l-dvb                       KCFG="-kirkwood"
 +#    ipfiremake mISDN                 KCFG="-kirkwood"
      ipfiremake cryptodev              KCFG="-kirkwood"
 -    ipfiremake compat-drivers         KCFG="-kirkwood"
 -    ipfiremake r8169                  KCFG="-kirkwood"
 -    ipfiremake r8168                  KCFG="-kirkwood"
 -    ipfiremake r8101                  KCFG="-kirkwood"
 -#    ipfiremake e1000e                        KCFG="-kirkwood"
 -    ipfiremake igb                    KCFG="-kirkwood"
 +#    ipfiremake compat-drivers                KCFG="-kirkwood"
 +#    ipfiremake r8169                 KCFG="-kirkwood"
 +#    ipfiremake r8168                 KCFG="-kirkwood"
 +#    ipfiremake r8101                 KCFG="-kirkwood"
 +#   ipfiremake e1000e                 KCFG="-kirkwood"
 +#    ipfiremake igb                   KCFG="-kirkwood"
  
    fi
    ipfiremake pkg-config
@@@ -493,7 -492,6 +494,7 @@@
    ipfiremake apache2
    ipfiremake php
    ipfiremake apache2                  PASS=C
 +  ipfiremake jquery
    ipfiremake arping
    ipfiremake beep
    ipfiremake dvdrtools
@@@ -594,6 -592,8 +595,8 @@@
    ipfiremake lzo
    ipfiremake openvpn
    ipfiremake pammysql
+   ipfiremake mpage
+   ipfiremake dbus
    ipfiremake cups
    ipfiremake ghostscript
    ipfiremake foomatic
@@@ -682,6 -682,7 +685,6 @@@
    ipfiremake mpc
    ipfiremake git
    ipfiremake squidclamav
 -  ipfiremake bc
    ipfiremake vnstat
    ipfiremake vnstati
    ipfiremake iw
@@@ -692,7 -693,6 +695,6 @@@
    ipfiremake syslinux
    ipfiremake tftpd
    ipfiremake cpufrequtils
-   ipfiremake dbus
    ipfiremake bluetooth
    ipfiremake gutenprint
    ipfiremake apcupsd
@@@ -789,13 -789,36 +791,13 @@@
    ipfiremake arm
    ipfiremake wavemon
    ipfiremake iptraf-ng
 -  echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
 -  cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
 -  echo >> $BASEDIR/build/var/ipfire/firebuild
 -  git log -1 >> $BASEDIR/build/var/ipfire/firebuild
 -  echo >> $BASEDIR/build/var/ipfire/firebuild
 -  git status >> $BASEDIR/build/var/ipfire/firebuild
 -  echo >> $BASEDIR/build/var/ipfire/firebuild
 -  cat /proc/cpuinfo >> $BASEDIR/build/var/ipfire/firebuild
 -  echo $PAKFIRE_CORE > $BASEDIR/build/opt/pakfire/db/core/mine
 -  if [ "$(git status -s | wc -l)" == "0" ]; then
 -      GIT_STATUS=""
 -  else
 -      GIT_STATUS="-dirty"
 -  fi
 -  case "$GIT_BRANCH" in
 -      core*|beta?|rc?)
 -          echo "$NAME $VERSION ($MACHINE) - $GIT_BRANCH$GIT_STATUS" > $BASEDIR/build/etc/system-release
 -          ;;
 -      *)
 -          echo "$NAME $VERSION ($MACHINE) - Development Build: $GIT_BRANCH/$GIT_LASTCOMMIT$GIT_STATUS" > $BASEDIR/build/etc/system-release
 -          ;;
 -  esac
 +  ipfiremake iotop
  }
  
  buildinstaller() {
    # Run installer scripts one by one
    LOGFILE="$BASEDIR/log/_build.installer.log"
    export LOGFILE
 -  ipfiremake as86
 -  ipfiremake mbr
    ipfiremake memtest
    ipfiremake installer
    installmake strip
@@@ -834,6 -857,9 +836,6 @@@ buildpackages() 
  
    # Check if there is a loop device for building in virtual environments
    if [ $BUILD_IMAGES == 1 ] && ([ -e /dev/loop/0 ] || [ -e /dev/loop0 ]); then
 -      if [ "${MACHINE_TYPE}" != "arm" ]; then
 -              ipfiremake usb-stick
 -      fi
        ipfiremake flash-images
    fi
  
@@@ -841,7 -867,16 +843,7 @@@
  
    ipfirepackages
  
 -  # Check if there is a loop device for building in virtual environments
 -  if [ $BUILD_IMAGES == 1 ] && ([ -e /dev/loop/0 ] || [ -e /dev/loop0 ]) && [ "${MACHINE_TYPE}" != "arm" ]; then
 -        cp -f $BASEDIR/packages/linux-xen-*.ipfire $LFS/install/packages/
 -        cp -f $BASEDIR/packages/meta-linux-xen $LFS/install/packages/
 -        cp -f $BASEDIR/packages/linux-pae-*.ipfire $LFS/install/packages/
 -        cp -f $BASEDIR/packages/meta-linux-pae $LFS/install/packages/
 -      ipfiremake xen-image
 -      rm -rf $LFS/install/packages/linux-xen-*.ipfire
 -      rm -rf $LFS/install/packages/meta-linux-xen
 -  fi
 +  ipfiremake xen-image
    mv $LFS/install/images/*.bz2 $BASEDIR >> $LOGFILE 2>&1
  
    cd $BASEDIR