This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, next has been updated via b8db3d70ed8e535fda15b60330bcce557e4f07bb (commit) via dc29e3d019407db10bffe64ac0accd17c8dd42d8 (commit) via 9ad2f534d91ca02ad0bbaab6751eb8bd395ece0f (commit) via 0bd6df5798d8cb6f3f64e94ede16c0ad3e15028b (commit) via 8384f58553215c523a89afa06949888b35ecd275 (commit) via 5d098ffb5ae8c501f53ccca6e12fd0711d477c8c (commit) from d49c2573b1b880249b16b6f80002f7b8dd565780 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit b8db3d70ed8e535fda15b60330bcce557e4f07bb Merge: dc29e3d d49c257 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Jan 5 15:00:04 2012 +0100

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

commit dc29e3d019407db10bffe64ac0accd17c8dd42d8 Merge: f4afa6d 9ad2f53 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Jan 5 14:59:54 2012 +0100

Merge branch 'master' into next

-----------------------------------------------------------------------

Summary of changes: .../{oldcore/36 => core/55}/filelists/openssh | 0 .../{oldcore/28 => core/55}/filelists/openssl | 0 config/rootfiles/core/55/update.sh | 10 ++++++++-- lfs/openssh | 6 +++--- lfs/openssl | 6 +++--- make.sh | 4 ++-- 6 files changed, 16 insertions(+), 10 deletions(-) copy config/rootfiles/{oldcore/36 => core/55}/filelists/openssh (100%) copy config/rootfiles/{oldcore/28 => core/55}/filelists/openssl (100%)

Difference in files: diff --git a/config/rootfiles/core/55/filelists/openssh b/config/rootfiles/core/55/filelists/openssh new file mode 120000 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 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 8ced59e..dbdd436 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 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 9f1c280..f7d129d 100644 --- 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 285cae3..de39d60 100644 --- 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 ccdb4c6..1730275 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 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

hooks/post-receive -- IPFire 2.x development tree