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, master has been updated via 104a00cb8aaa9fe0d09d78913437d5adcc7d9d6d (commit) via 51cac9a1ce8b4baa0a214f7674d8a915a8030560 (commit) via 20651e22d4df1e8c5f38a1be63d3fb3826c27dcc (commit) via 6d29812d42fd09a1a1be4a8fa086e2d64d36e72f (commit) via 296e037fb1f404c7703508f5643b59832cf0bf81 (commit) from 473725f5b006ecfb13d08c17e03ef8c5c0d66b3a (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 104a00cb8aaa9fe0d09d78913437d5adcc7d9d6d Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Dec 3 18:57:59 2010 +0100

Updated ipfireseeder to core43.

commit 51cac9a1ce8b4baa0a214f7674d8a915a8030560 Merge: 473725f 20651e2 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Dec 3 18:56:37 2010 +0100

Merge commit 'origin/core43'

Conflicts: lfs/openssl make.sh

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

Summary of changes: config/rootfiles/oldcore/42/exclude | 3 +++ config/rootfiles/packages/ipfireseeder | 2 +- lfs/ipfireseeder | 8 ++++---- lfs/openssl | 4 ++-- make.sh | 4 ++-- 5 files changed, 12 insertions(+), 9 deletions(-)

Difference in files: diff --git a/config/rootfiles/oldcore/42/exclude b/config/rootfiles/oldcore/42/exclude index e69de29..01b7a7f 100644 --- a/config/rootfiles/oldcore/42/exclude +++ b/config/rootfiles/oldcore/42/exclude @@ -0,0 +1,3 @@ +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf diff --git a/config/rootfiles/packages/ipfireseeder b/config/rootfiles/packages/ipfireseeder index e1c32b7..e31f42c 100644 --- a/config/rootfiles/packages/ipfireseeder +++ b/config/rootfiles/packages/ipfireseeder @@ -1,5 +1,5 @@ etc/rc.d/init.d/ipfireseeder #var/ipfire/seeder -var/ipfire/seeder/ipfire-2.7.i586-full-core42.iso.torrent +var/ipfire/seeder/ipfire-2.7.i586-full-core43.iso.torrent #var/log/seeder var/log/seeder/info diff --git a/lfs/ipfireseeder b/lfs/ipfireseeder index ab0b7e2..37ba3d1 100644 --- a/lfs/ipfireseeder +++ b/lfs/ipfireseeder @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2010 IPFire Team info@ipfire.org # +# Copyright (C) 2009 Michael Tremer & Christian Schmidt # # # # 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 # @@ -27,13 +27,13 @@ include Config VER = 1.00

THISAPP = ipfireseeder-$(VER) -DL_FILE = ipfire-2.7.i586-full-core42.iso.torrent +DL_FILE = ipfire-2.7.i586-full-core43.iso.torrent

DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = ipfireseeder -PAK_VER = 17 +PAK_VER = 18

DEPS = "rtorrent"

@@ -45,7 +45,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 7355dd415df3a3f28dc9223f79b5e053 +$(DL_FILE)_MD5 = 0a8d7e52332c12d29847b0a7ab263bc3

install : $(TARGET)

diff --git a/lfs/openssl b/lfs/openssl index 34833ef..dc65ef5 100644 --- a/lfs/openssl +++ b/lfs/openssl @@ -24,7 +24,7 @@

include Config

-VER = 0.9.8p +VER = 0.9.8q

THISAPP = openssl-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 7f24047f70364c9eabc94899e356ce39 +$(DL_FILE)_MD5 = 80e67291bec9230f03eefb5cfe858998

install : $(TARGET)

diff --git a/make.sh b/make.sh index 4d49eaa..979215c 100755 --- a/make.sh +++ b/make.sh @@ -25,8 +25,8 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.8test" # Version number -CORE="43" # Core Level (Filename) -PAKFIRE_CORE="42" # Core Level (PAKFIRE) +CORE="44" # Core Level (Filename) +PAKFIRE_CORE="43" # 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