Merge commit 'origin/master' into next

diff --git a/config/rootfiles/core/42/filelists/files b/config/rootfiles/core/42/filelists/files
index 0037af183326a74f3cbb5f65b2cf4c007eea7bed..ef6c2e7e6059956216b0724b2afa036f1514b815 100644 (file)
--- 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 (symlink)
index 0000000..d8c77fd
--- /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 (symlink)
index 0000000..e011a92
--- /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 1b70ca693b7b173d547beb19897c39bf2d66b6a8..62e6c70a1de92fe38d6c365d5503d09f92f1ccf5 100644 (file)
--- 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 ffcf476818a914b8a4c2d63a827d5c7d9e07760b..c9ce7148bb842fe775087a7de1c26a32d9cf3908 100644 (file)
--- 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 5c8b41398e3f2ba065202847f60cd9d488f1ee31..38e2b3850476e5b1876954ee2732fcf2752fb000 100644 (file)
--- 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 4bec05b9bf29432da98900b08047e451ebe41e26..36211fec68bb14a19402f2fd703c758e7f75f438 100755 (executable)
--- 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