Merge commit 'origin/master' into next

Conflicts:
	make.sh

config/rootfiles/core/43/filelists/files

@@ -0,0 +1 @@
+etc/system-release

config/rootfiles/core/43/meta

@@ -0,0 +1 @@
+DEPS=""

config/rootfiles/core/43/update.sh

@@ -0,0 +1,48 @@
+#!/bin/bash
+############################################################################
+#                                                                          #
+# This file is part of the IPFire Firewall.                                #
+#                                                                          #
+# IPFire is free software; you can redistribute it and/or modify           #
+# it under the terms of the GNU General Public License as published by     #
+# the Free Software Foundation; either version 3 of the License, or        #
+# (at your option) any later version.                                      #
+#                                                                          #
+# IPFire is distributed in the hope that it will be useful,                #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of           #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
+# GNU General Public License for more details.                             #
+#                                                                          #
+# You should have received a copy of the GNU General Public License        #
+# along with IPFire; if not, write to the Free Software                    #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
+#                                                                          #
+# Copyright (C) 2010 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+#
+#Stop services
+
+#
+#Extract files
+extract_files
+
+#
+#Start services
+
+#
+#Update Language cache
+#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+
+#Rebuild module dep's
+#depmod 2.6.32.15-ipfire
+#depmod 2.6.32.15-ipfire-xen
+
+#
+#Finish
+#Don't report the exitcode last command
+exit 0

lfs/openssl

@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.9.8o
+VER        = 0.9.8p
 
 THISAPP    = openssl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz