From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Tue, 16 Nov 2010 23:51:39 +0000 (+0100)
Subject: Merge commit 'origin/master' into next
X-Git-Tag: v2.9-beta1~48^2~5^2~2^2~20
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=08d5192eb1ac55711e9c880096f024d1515bd08b;hp=508b73104f689672260d4f464325c3dc35a32945

Merge commit 'origin/master' into next
---

diff --git a/config/rootfiles/core/42/filelists/files b/config/rootfiles/core/42/filelists/files
index 0037af1833..ef6c2e7e60 100644
--- a/config/rootfiles/core/42/filelists/files
+++ b/config/rootfiles/core/42/filelists/files
@@ -1 +1,3 @@
 etc/system-release
+srv/web/ipfire/html/images/urlfilter/copy.gif
+srv/web/ipfire/cgi-bin/ids.cgi
diff --git a/config/rootfiles/core/42/filelists/openssh b/config/rootfiles/core/42/filelists/openssh
new file mode 120000
index 0000000000..d8c77fd8e7
--- /dev/null
+++ b/config/rootfiles/core/42/filelists/openssh
@@ -0,0 +1 @@
+../../../common/openssh
\ No newline at end of file
diff --git a/config/rootfiles/core/42/filelists/openssl b/config/rootfiles/core/42/filelists/openssl
new file mode 120000
index 0000000000..e011a9266c
--- /dev/null
+++ b/config/rootfiles/core/42/filelists/openssl
@@ -0,0 +1 @@
+../../../common/openssl
\ No newline at end of file
diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi
index 1b70ca693b..62e6c70a1d 100644
--- a/html/cgi-bin/ids.cgi
+++ b/html/cgi-bin/ids.cgi
@@ -271,7 +271,7 @@ if ($snortsettings{'RULES'} eq 'subscripted') {
 	$url=" http://www.snort.org/reg-rules/snortrules-snapshot-2861.tar.gz/$snortsettings{'OINKCODE'}";
 	#$url="http://www.snort.org/pub-bin/oinkmaster.cgi/$snortsettings{'OINKCODE'}/snortrules-snapshot-2.8.tar.gz";
 } else {
-	$url="http://www.emergingthreats.net/rules/emerging.rules.tar.gz";
+	$url="http://rules.emergingthreats.net/open/snort-2.8.6/emerging.rules.tar.gz";
 }
 
 if ($snortsettings{'ACTION'} eq $Lang::tr{'save'} && $snortsettings{'ACTION2'} eq "snort" )
diff --git a/lfs/openssh b/lfs/openssh
index ffcf476818..c9ce7148bb 100644
--- a/lfs/openssh
+++ b/lfs/openssh
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 5.4p1
+VER        = 5.6p1
 
 THISAPP    = openssh-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = da10af8a789fa2e83e3635f3a1b76f5e
+$(DL_FILE)_MD5 = e6ee52e47c768bf0ec42a232b5d18fb0
 
 install : $(TARGET)
 
diff --git a/lfs/openssl b/lfs/openssl
index 5c8b41398e..38e2b38504 100644
--- a/lfs/openssl
+++ b/lfs/openssl
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2010  IPFire Team  <info@ipfire.org>                          #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 63ddc5116488985e820075e65fbe6aa4
+$(DL_FILE)_MD5 = 7f24047f70364c9eabc94899e356ce39
 
 install : $(TARGET)
 
diff --git a/make.sh b/make.sh
index 4bec05b9bf..36211fec68 100755
--- a/make.sh
+++ b/make.sh
@@ -26,7 +26,7 @@ NAME="IPFire"							# Software name
 SNAME="ipfire"							# Short name
 VERSION="2.8test"						# Version number
 CORE="42"							# Core Level (Filename)
-PAKFIRE_CORE="41"						# Core Level (PAKFIRE)
+PAKFIRE_CORE="42"						# 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