From a41302651055f03f27c8132526a3bd5520875555 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Tue, 3 Jan 2012 21:21:26 +0100 Subject: [PATCH 1/5] make.sh: fix wrong md5sum messages at wrong arch packages. --- make.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/make.sh b/make.sh index 1edcf1571..ccdb4c639 100755 --- a/make.sh +++ b/make.sh @@ -1002,6 +1002,7 @@ downloadsrc) ERROR=0 for i in *; do if [ -f "$i" -a "$i" != "Config" ]; then + lfsmakecommoncheck ${i} > /dev/null || continue make -s -f $i LFS_BASEDIR=$BASEDIR MACHINE=$MACHINE \ MESSAGE="$i\t " md5 >> $LOGFILE 2>&1 if [ $? -ne 0 ]; then From 5d098ffb5ae8c501f53ccca6e12fd0711d477c8c Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Thu, 5 Jan 2012 14:31:26 +0100 Subject: [PATCH 2/5] openssl: security update to 0.9.8s. DTLS Plaintext Recovery Attack (CVE-2011-4108) Double-free in Policy Checks (CVE-2011-4109) Uninitialized SSL 3.0 Padding (CVE-2011-4576) Malformed RFC 3779 Data Can Cause Assertion Failures (CVE-2011-4577) Affected users should upgrade to OpenSSL 1.0.0f or 0.9.8s. SGC Restart DoS Attack (CVE-2011-4619) http://www.openssl.org/news/secadv_20120104.txt --- config/rootfiles/core/55/filelists/openssl | 1 + lfs/openssl | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) create mode 120000 config/rootfiles/core/55/filelists/openssl diff --git a/config/rootfiles/core/55/filelists/openssl b/config/rootfiles/core/55/filelists/openssl new file mode 120000 index 000000000..e011a9266 --- /dev/null +++ b/config/rootfiles/core/55/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/lfs/openssl b/lfs/openssl index 285cae343..de39d60db 100644 --- a/lfs/openssl +++ b/lfs/openssl @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team # +# Copyright (C) 2007-2012 IPFire Team # # # # 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) From 8384f58553215c523a89afa06949888b35ecd275 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Thu, 5 Jan 2012 14:38:01 +0100 Subject: [PATCH 3/5] openssh: update to 5.9p1. --- lfs/openssh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/openssh b/lfs/openssh index 9f1c28050..f7d129d78 100644 --- a/lfs/openssh +++ b/lfs/openssh @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team # +# Copyright (C) 2007-2012 IPFire Team # # # # 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) From 0bd6df5798d8cb6f3f64e94ede16c0ad3e15028b Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Thu, 5 Jan 2012 14:50:25 +0100 Subject: [PATCH 4/5] core55: add openssh to updater. --- config/rootfiles/core/55/filelists/openssh | 1 + 1 file changed, 1 insertion(+) create mode 120000 config/rootfiles/core/55/filelists/openssh diff --git a/config/rootfiles/core/55/filelists/openssh b/config/rootfiles/core/55/filelists/openssh new file mode 120000 index 000000000..d8c77fd8e --- /dev/null +++ b/config/rootfiles/core/55/filelists/openssh @@ -0,0 +1 @@ +../../../common/openssh \ No newline at end of file From 9ad2f534d91ca02ad0bbaab6751eb8bd395ece0f Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Thu, 5 Jan 2012 14:51:05 +0100 Subject: [PATCH 5/5] finish core55. --- config/rootfiles/core/55/update.sh | 10 ++++++++-- make.sh | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/config/rootfiles/core/55/update.sh b/config/rootfiles/core/55/update.sh index 8ced59e92..dbdd4360b 100644 --- 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 . # +# Copyright (C) 2012 IPFire-Team . # # # ############################################################################ # @@ -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/make.sh b/make.sh index ccdb4c639..1730275b8 100755 --- 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 . # +# Copyright (C) 2007-2012 IPFire Team . # # # ############################################################################ # @@ -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