Merge remote-tracking branch 'erik/sendEmail' into core67-merge

[people/teissler/ipfire-2.x.git] / make.sh

diff --git a/make.sh b/make.sh
index f2fc024cd2abc1455ced10d473a13be514840091..b92d47a5d24ce93b9b3a55677ccc77ad7eb92850 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -24,9 +24,9 @@
 
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
 
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name

-VERSION="2.13beta2"                                                    # Version number
-CORE="65"                                                      # Core Level (Filename)
-PAKFIRE_CORE="65"                                              # Core Level (PAKFIRE)
+VERSION="2.13"                                                 # Version number
+CORE="66"                                                      # Core Level (Filename)
+PAKFIRE_CORE="66"                                              # 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
 GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`             # Git Branch
 SLOGAN="www.ipfire.org"                                                # Software slogan
 CONFIG_ROOT=/var/ipfire                                                # Configuration rootdir


@@ -536,6 +536,7 @@ buildipfire() {
   ipfiremake Net-IPv4Addr
   ipfiremake Net_SSLeay
   ipfiremake IO-Stringy
   ipfiremake Net-IPv4Addr
   ipfiremake Net_SSLeay
   ipfiremake IO-Stringy

+  ipfiremake IO-Socket-SSL

   ipfiremake Unix-Syslog
   ipfiremake Mail-Tools
   ipfiremake MIME-Tools
   ipfiremake Unix-Syslog
   ipfiremake Mail-Tools
   ipfiremake MIME-Tools


@@ -754,6 +755,7 @@ buildipfire() {
   ipfiremake libstatgrab
   ipfiremake sarg
   ipfiremake fstrim
   ipfiremake libstatgrab
   ipfiremake sarg
   ipfiremake fstrim

+  ipfiremake sendEmail

   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild