From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Thu, 6 Dec 2012 18:29:29 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/next' into thirteen
X-Git-Tag: v2.13-beta1~13
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=d7a3254acedb43995d6a6e769562576cc7ff8639

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

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

d7a3254acedb43995d6a6e769562576cc7ff8639
diff --cc html/cgi-bin/vpnmain.cgi
index eaf6f489ac,24aeb6deae..e9d114b12f
mode 100644,100755..100755
--- a/html/cgi-bin/vpnmain.cgi
+++ b/html/cgi-bin/vpnmain.cgi
diff --cc make.sh
index 049bc0e8fa,6fb2d94734..09349098aa
--- a/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