Merge remote-tracking branch 'origin/next' into thirteen
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 6 Dec 2012 18:29:29 +0000 (19:29 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 6 Dec 2012 18:29:29 +0000 (19:29 +0100)
Conflicts:
config/rootfiles/common/stage2
make.sh

1  2 
config/rootfiles/common/stage2
html/cgi-bin/vpnmain.cgi
lfs/stage2
make.sh

Simple merge
diff --cc lfs/stage2
Simple merge
diff --cc 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