Merge branch 'master' into next

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

diff --git a/make.sh b/make.sh
index bafbe99c239cd16e8312ccef5ec464d457424a56..4ed64a268b321959490d913199ac47ae73ecfa11 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -26,7 +26,7 @@ NAME="IPFire"                                                 # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.17"                                                 # Version number
 CORE="92"                                                      # Core Level (Filename)
-PAKFIRE_CORE="91"                                              # Core Level (PAKFIRE)
+PAKFIRE_CORE="92"                                              # 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
@@ -408,6 +408,8 @@ buildipfire() {
   ipfiremake libnfnetlink
   ipfiremake libnetfilter_queue
   ipfiremake libnetfilter_conntrack
+  ipfiremake libnetfilter_cthelper
+  ipfiremake libnetfilter_cttimeout
   ipfiremake iptables
 
   case "${TARGET_ARCH}" in
@@ -481,6 +483,7 @@ buildipfire() {
   ipfiremake sqlite
   ipfiremake libffi
   ipfiremake python
+  ipfiremake ca-certificates
   ipfiremake fireinfo
   ipfiremake libnet
   ipfiremake libnl
@@ -651,6 +654,7 @@ buildipfire() {
   ipfiremake libshout
   ipfiremake xvid
   ipfiremake libmpeg2
+  ipfiremake libarchive
   ipfiremake cmake
   ipfiremake gnump3d
   ipfiremake rsync