Merge remote-tracking branch 'origin/next' into thirteen

Conflicts:
	config/rootfiles/common/stage2
	make.sh

diff --cc config/rootfiles/common/stage2
Simple merge

diff --cc html/cgi-bin/vpnmain.cgi
index eaf6f489aca6873e4b3f860c3c1138ab7a5f7996,24aeb6deaea1d691296d0eeb6b6e060f8d3f563a..e9d114b12f36a9f368c50e212adc7038b9524047
mode 100644,100755..100755
--- 1/html/cgi-bin/vpnmain.cgi
--- 2/html/cgi-bin/vpnmain.cgi
+++ b/html/cgi-bin/vpnmain.cgi

diff --cc lfs/stage2
Simple merge

diff --cc make.sh
index 049bc0e8fa13335173975db2b05e5e01c00ad709,6fb2d94734cc811cc44bb18e094285dd0de08813..09349098aa467848bbcba8bb0ddd5d952b0c4ef9
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -24,9 -24,9 +24,9 @@@
  
  NAME="IPFire"                                                 # Software name
  SNAME="ipfire"                                                        # Short name
 -VERSION="2.11"                                                        # Version number
 +VERSION="2.13"                                                        # Version number
- CORE="64"                                                     # Core Level (Filename)
- PAKFIRE_CORE="64"                                             # Core Level (PAKFIRE)
+ CORE="65"                                                     # Core Level (Filename)
+ PAKFIRE_CORE="65"                                             # Core Level (PAKFIRE)
  GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`            # Git Branch
  SLOGAN="www.ipfire.org"                                               # Software slogan
  CONFIG_ROOT=/var/ipfire                                               # Configuration rootdir
@@@ -739,14 -770,11 +739,17 @@@ buildipfire() 
    ipfiremake mtr
    ipfiremake tcpick
    ipfiremake minidlna
 +  ipfiremake acpid
    ipfiremake fping
    ipfiremake telnet
 +  ipfiremake libgpg-error
 +  ipfiremake libassuan
 +  ipfiremake gpgme
 +  ipfiremake pygpgme
 +  ipfiremake pakfire3
+   ipfiremake stress
+   ipfiremake libstatgrab
+   ipfiremake sarg
    echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
    cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
    echo >> $BASEDIR/build/var/ipfire/firebuild