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

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

diff --git a/make.sh b/make.sh
index b32dfd207c597eba55c76136bcf3c5a45a9eb8d1..e8def816cda36ced5a1eb56a2f2e81662b1f0851 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,7 +25,7 @@
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.19"                                                 # Version number
-CORE="100"                                                     # Core Level (Filename)
+CORE="101"                                                     # Core Level (Filename)
 PAKFIRE_CORE="100"                                             # Core Level (PAKFIRE)
 GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`                   # Git Branch
 SLOGAN="www.ipfire.org"                                                # Software slogan
@@ -550,6 +550,7 @@ buildipfire() {
   ipfiremake GD-TextUtil
   ipfiremake perl-Device-SerialPort
   ipfiremake perl-Device-Modem
+  ipfiremake perl-Apache-Htpasswd
   ipfiremake gnupg
   ipfiremake hdparm
   ipfiremake sdparm
@@ -679,6 +680,8 @@ buildipfire() {
   ipfiremake libevent2
   ipfiremake portmap
   ipfiremake nfs
+  ipfiremake gnu-netcat
+  ipfiremake ncat
   ipfiremake nmap
   ipfiremake ncftp
   ipfiremake etherwake
@@ -749,7 +752,7 @@ buildipfire() {
   ipfiremake gutenprint
   ipfiremake apcupsd
   ipfiremake iperf
-  ipfiremake netcat
+  ipfiremake iperf3
   ipfiremake 7zip
   ipfiremake lynis
   ipfiremake streamripper
@@ -857,6 +860,7 @@ buildipfire() {
   ipfiremake dnsdist
   ipfiremake bird
   ipfiremake dmidecode
+  ipfiremake mcelog
 }
 
 buildinstaller() {