Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next

diff --git a/config/rootfiles/core/55/filelists/openssh b/config/rootfiles/core/55/filelists/openssh
new file mode 120000 (symlink)
index 0000000..d8c77fd
--- /dev/null
+++ b/config/rootfiles/core/55/filelists/openssh
@@ -0,0 +1 @@
+../../../common/openssh
\ No newline at end of file

diff --git a/config/rootfiles/core/55/filelists/openssl b/config/rootfiles/core/55/filelists/openssl
new file mode 120000 (symlink)
index 0000000..e011a92
--- /dev/null
+++ b/config/rootfiles/core/55/filelists/openssl
@@ -0,0 +1 @@
+../../../common/openssl
\ No newline at end of file

diff --git a/config/rootfiles/core/55/update.sh b/config/rootfiles/core/55/update.sh
index 8ced59e926009437b4ea7101ed8c057669d663ee..dbdd4360b91850807b7d6027e628b691900a5e34 100644 (file)
--- a/config/rootfiles/core/55/update.sh
+++ b/config/rootfiles/core/55/update.sh
@@ -17,7 +17,7 @@
 # along with IPFire; if not, write to the Free Software                    #
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
 #                                                                          #
-# Copyright (C) 2011 IPFire-Team <info@ipfire.org>.                        #
+# Copyright (C) 2012 IPFire-Team <info@ipfire.org>.                        #
 #                                                                          #
 ############################################################################
 #
@@ -34,7 +34,8 @@ done
 
 #
 #Stop services
-
+/etc/init.d/sshd stop
+/etc/init.d/apache stop
 
 #
 #Extract files
@@ -42,6 +43,8 @@ extract_files
 
 #
 #Start services
+/etc/init.d/apache start
+/etc/init.d/sshd start
 
 
 #
@@ -64,6 +67,9 @@ extract_files
 
 sync
 
+# This update need a reboot...
+touch /var/run/need_reboot
+
 #
 #Finish
 /etc/init.d/fireinfo start

diff --git a/lfs/openssh b/lfs/openssh
index 9f1c280503d46c7420efc1a92769e8b20518fd2a..f7d129d78adec16c89e721941b761f71c80dfcf5 100644 (file)
--- a/lfs/openssh
+++ b/lfs/openssh
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2011  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2012  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        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 5.8p1
+VER        = 5.9p1
 
 THISAPP    = openssh-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 86f5e1c23b4c4845f23b9b7b493fb53d
+$(DL_FILE)_MD5 = afe17eee7e98d3b8550cc349834a85d0
 
 install : $(TARGET)
 

diff --git a/lfs/openssl b/lfs/openssl
index 285cae343bf1b7f7f56fa6d8320c75163d43c738..de39d60dbc37a31e418edc56d04338c98ef6525a 100644 (file)
--- a/lfs/openssl
+++ b/lfs/openssl
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2011  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2012  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        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.9.8r
+VER        = 0.9.8s
 
 THISAPP    = openssl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 0352932ea863bc02b056cda7c9ac5b79
+$(DL_FILE)_MD5 = fbf71e8e050bc1ec290b7468bab1a76e
 
 install : $(TARGET)
 

diff --git a/make.sh b/make.sh
index ccdb4c639065932fad717f25c1d6ac0bf58cde38..1730275b8955612b5c0b856d3b6a17ad4b068a59 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -17,7 +17,7 @@
 # along with IPFire; if not, write to the Free Software                    #
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
 #                                                                          #
-# Copyright (C) 2007-2011 IPFire-Team <info@ipfire.org>.                   #
+# Copyright (C) 2007-2012 IPFire Team <info@ipfire.org>.                   #
 #                                                                          #
 ############################################################################
 #
@@ -26,7 +26,7 @@ NAME="IPFire"                                                 # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.11"                                                 # Version number
 CORE="55"                                                      # Core Level (Filename)
-PAKFIRE_CORE="54"                                              # Core Level (PAKFIRE)
+PAKFIRE_CORE="55"                                              # 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