Merge remote-tracking branch 'glotzi/monit' into next

diff --combined make.sh
index f42dc25004cc5e155adab2a00e6c39def35654c7,5183940c9efa6622ff63d650d13833e886ea72f0..ec88abade8f8f105e7ea283d9a856c169c72159c
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -408,7 -408,6 +408,7 @@@ buildipfire() 
        i586)
                # x86-pae (Native and new XEN) kernel build
                ipfiremake linux                        KCFG="-pae"
 +              ipfiremake backports                    KCFG="-pae"
                ipfiremake cryptodev                    KCFG="-pae"
                ipfiremake e1000e                       KCFG="-pae"
                ipfiremake igb                          KCFG="-pae"
@@@ -417,7 -416,6 +417,7 @@@
  
                # x86 kernel build
                ipfiremake linux                        KCFG=""
 +              ipfiremake backports                    KCFG=""
                ipfiremake cryptodev                    KCFG=""
                ipfiremake e1000e                       KCFG=""
                ipfiremake igb                          KCFG=""
@@@ -428,13 -426,11 +428,13 @@@
        armv5tel)
                # arm-rpi (Raspberry Pi) kernel build
                ipfiremake linux                        KCFG="-rpi"
 +              ipfiremake backports                    KCFG="-rpi"
                ipfiremake cryptodev                    KCFG="-rpi"
                ipfiremake linux-initrd                 KCFG="-rpi"
  
                # arm multi platform (Panda, Wandboard ...) kernel build
                ipfiremake linux                        KCFG="-multi"
 +              ipfiremake backports                    KCFG="-multi"
                ipfiremake cryptodev                    KCFG="-multi"
                ipfiremake e1000e                       KCFG="-multi"
                ipfiremake igb                          KCFG="-multi"
@@@ -443,7 -439,6 +443,7 @@@
  
                # arm-kirkwood (Dreamplug, ICY-Box ...) kernel build
                ipfiremake linux                        KCFG="-kirkwood"
 +              ipfiremake backports                    KCFG="-kirkwood"
                ipfiremake cryptodev                    KCFG="-kirkwood"
                ipfiremake e1000e                       KCFG="-kirkwood"
                ipfiremake igb                          KCFG="-kirkwood"
@@@ -733,6 -728,7 +733,7 @@@
    ipfiremake iftop
    ipfiremake motion
    ipfiremake joe
+   ipfiremake monit
    ipfiremake nut
    ipfiremake watchdog
    ipfiremake libpri