core132: Ship updated apache configuration

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

diff --git a/make.sh b/make.sh
index b4d5ea7a39dbfc6d688aed44034fb1c621df3dbe..bfcc83709fb1d4917562b34eee33d3fe72a1d02b 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -24,10 +24,9 @@
 
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
-<<<<<<< HEAD
 VERSION="2.23"                                                 # Version number
-CORE="131"                                                     # Core Level (Filename)
-PAKFIRE_CORE="130"                                             # Core Level (PAKFIRE)
+CORE="132"                                                     # Core Level (Filename)
+PAKFIRE_CORE="131"                                             # 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
@@ -1411,6 +1410,7 @@ buildipfire() {
   lfsmake2 spice
   lfsmake2 sdl
   lfsmake2 libusbredir
+  lfsmake2 libseccomp
   lfsmake2 qemu
   lfsmake2 sane
   lfsmake2 netpbm