Merge branch 'seventeen-geoip' into next-geoip

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

diff --git a/make.sh b/make.sh
index 9f77df59bebf7fe9846fbe56bfdfb2473e2b6006..395c21f2d7a524e76c43640b4ca6cb10657b51ac 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.17"                                                 # Version number
-CORE="87-rc1"                                                  # Core Level (Filename)
-PAKFIRE_CORE="86"                                              # Core Level (PAKFIRE)
+CORE="87"                                                      # Core Level (Filename)
+PAKFIRE_CORE="87"                                              # Core Level (PAKFIRE)
 GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`                   # Git Branch
 SLOGAN="www.ipfire.org"                                                # Software slogan
 CONFIG_ROOT=/var/ipfire                                                # Configuration rootdir
@@ -670,7 +670,6 @@ buildipfire() {
   ipfiremake lm_sensors
   ipfiremake liboping
   ipfiremake collectd
-  ipfiremake teamspeak
   ipfiremake elinks
   ipfiremake igmpproxy
   ipfiremake fbset
@@ -739,9 +738,11 @@ buildipfire() {
   ipfiremake iftop
   ipfiremake motion
   ipfiremake joe
+  ipfiremake monit
   ipfiremake nut
   ipfiremake watchdog
   ipfiremake libpri
+  ipfiremake libsrtp
   ipfiremake asterisk
   ipfiremake lcr
   ipfiremake usb_modeswitch
@@ -817,6 +818,7 @@ buildipfire() {
   ipfiremake tmux
   ipfiremake perl-Text-CSV_XS
   ipfiremake swconfig
+  ipfiremake haproxy
 }
 
 buildinstaller() {