Merge commit 'origin/core43'

Conflicts:
	lfs/openssl
	make.sh

diff --git a/config/rootfiles/oldcore/42/exclude b/config/rootfiles/oldcore/42/exclude
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..01b7a7f2ae19f30fe926138af409e181b810dcc4 100644 (file)
--- a/config/rootfiles/oldcore/42/exclude
+++ b/config/rootfiles/oldcore/42/exclude
@@ -0,0 +1,3 @@
+etc/ssh/ssh_config
+etc/ssh/sshd_config
+etc/ssl/openssl.cnf

diff --git a/lfs/openssl b/lfs/openssl
index 34833ef1918f99fac820cfafedf511d6a9c8e5e2..dc65ef5bc1960449cca36e0507ae6bf9f5d53271 100644 (file)
--- a/lfs/openssl
+++ b/lfs/openssl
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.9.8p
+VER        = 0.9.8q
 
 THISAPP    = openssl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 7f24047f70364c9eabc94899e356ce39
+$(DL_FILE)_MD5 = 80e67291bec9230f03eefb5cfe858998
 
 install : $(TARGET)
 

diff --git a/make.sh b/make.sh
index 4d49eaaf3ab6016d460e0abc4325a6c0414937df..979215cfd88c90e2125f8c3de3f19cfe6192a54d 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
 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