Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into monit

diff --combined make.sh
index e94e8556de199cb71f25293999fb0b3bf99f32e2,5bff402a4bf65e2ef8ccbb0029819a03a362ece7..2f5292a3bb1fbae615e1fcbd7c3f9cab938e291c
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -25,7 -25,7 +25,7 @@@
  NAME="IPFire"                                                 # Software name
  SNAME="ipfire"                                                        # Short name
  VERSION="2.15"                                                        # Version number
- CORE="77-rc1"                                                 # Core Level (Filename)
+ CORE="77"                                                     # Core Level (Filename)
  PAKFIRE_CORE="77"                                             # Core Level (PAKFIRE)
  GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`                  # Git Branch
  SLOGAN="www.ipfire.org"                                               # Software slogan
@@@ -638,9 -638,6 +638,6 @@@ buildipfire() 
    ipfiremake libmpeg2
    ipfiremake cmake
    ipfiremake gnump3d
-   ipfiremake libsigc++
-   ipfiremake libtorrent
-   ipfiremake rtorrent
    ipfiremake rsync
    ipfiremake tcpwrapper
    ipfiremake libevent
@@@ -730,7 -727,6 +727,7 @@@
    ipfiremake iftop
    ipfiremake motion
    ipfiremake joe
 +  ipfiremake monit
    ipfiremake nut
    ipfiremake watchdog
    ipfiremake libpri
@@@ -800,6 -796,7 +797,7 @@@
    ipfiremake wavemon
    ipfiremake iptraf-ng
    ipfiremake iotop
+   ipfiremake stunnel
  }
  
  buildinstaller() {
@@@ -843,7 -840,8 +841,8 @@@ buildpackages() 
    ipfiremake cdrom
  
    # Check if there is a loop device for building in virtual environments
-   if [ $BUILD_IMAGES == 1 ] && ([ -e /dev/loop/0 ] || [ -e /dev/loop0 ]); then
+   modprobe loop 2>/dev/null
+   if [ $BUILD_IMAGES == 1 ] && ([ -e /dev/loop/0 ] || [ -e /dev/loop0 ] || [ -e "/dev/loop-control" ]); then
        ipfiremake flash-images
    fi