Merge commit 'origin/core43'

Conflicts:
	lfs/openssl
	make.sh

diff --cc config/rootfiles/oldcore/42/exclude
Simple merge

diff --cc make.sh
index 4d49eaaf3ab6016d460e0abc4325a6c0414937df,42a188ac23bbba8611fe2f76ef059834e210419c..979215cfd88c90e2125f8c3de3f19cfe6192a54d
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -24,9 -24,9 +24,9 @@@
  
  NAME="IPFire"                                                 # Software name
  SNAME="ipfire"                                                        # Short name
 -VERSION="2.7"                                                 # Version number
 -CORE="43"                                                     # Core Level (Filename)
 +VERSION="2.8test"                                             # Version number
- CORE="43"                                                     # Core Level (Filename)
- PAKFIRE_CORE="42"                                             # Core Level (PAKFIRE)
++CORE="44"                                                     # Core Level (Filename)
+ PAKFIRE_CORE="43"                                             # 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