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 504d7a75581d39ef8fbff8a5da33f1efabc8b7f3 (commit) via 923ad92ac18cf39f93ca909faa3bac0505c09462 (commit) via 70618607ef700161b5ad688338424e79334ef3ff (commit) via a0f97ae456f43cb4281312c30dff72fa22db16e9 (commit) via 4f495b1f235540017027fa1b1ba38adecb11f00b (commit) via 2a931aa1cd04752e60cfeb77e7b14158f38712e7 (commit) via 6970b26252acfd41e43f323f5fc121e1c8fa775e (commit) via fe8324f4518988ed0dec28f6493332a2efc22626 (commit) from 3717a205a61b582ba5426da008a548bf98085742 (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 504d7a75581d39ef8fbff8a5da33f1efabc8b7f3 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Jul 12 07:41:50 2011 +0200

core-next: add missing pl language file to updater.

commit 923ad92ac18cf39f93ca909faa3bac0505c09462 Merge: 4f495b1 7061860 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Jul 12 07:40:37 2011 +0200

Merge branch 'master' into next

Conflicts: make.sh

commit 4f495b1f235540017027fa1b1ba38adecb11f00b Merge: 3717a20 2a931aa Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Jul 12 07:37:16 2011 +0200

Merge branch 'strong-dr' into next

commit 2a931aa1cd04752e60cfeb77e7b14158f38712e7 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Jul 12 07:35:49 2011 +0200

strongswan: update to 3.5.3dr7.

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

Summary of changes: config/rootfiles/core/50/update.sh | 7 ++++++- config/rootfiles/core/next/filelists/files | 1 + lfs/squid | 4 ++-- lfs/strongswan | 5 ++--- make.sh | 4 ++-- .../strongswan-4.5.2-force_kill_charon.patch | 20 -------------------- 6 files changed, 13 insertions(+), 28 deletions(-) delete mode 100644 src/patches/strongswan-4.5.2-force_kill_charon.patch

Difference in files: diff --git a/config/rootfiles/core/50/update.sh b/config/rootfiles/core/50/update.sh index 2882684..b114ded 100644 --- a/config/rootfiles/core/50/update.sh +++ b/config/rootfiles/core/50/update.sh @@ -34,13 +34,18 @@ done

# #Stop services - +/etc/init.d/apache stop +/etc/init.d/collectd stop +/etc/init.d/squid stop # #Extract files extract_files

# #Start services +/etc/init.d/squid start +/etc/init.d/collectd start +/etc/init.d/apache start

# #Update Language cache diff --git a/config/rootfiles/core/next/filelists/files b/config/rootfiles/core/next/filelists/files index d645513..30727a5 100644 --- a/config/rootfiles/core/next/filelists/files +++ b/config/rootfiles/core/next/filelists/files @@ -8,5 +8,6 @@ var/ipfire/langs/de.pl var/ipfire/langs/en.pl var/ipfire/langs/es.pl var/ipfire/langs/fr.pl +var/ipfire/langs/pl.pl usr/local/bin/ipsecctrl usr/local/bin/vpn-watch diff --git a/lfs/squid b/lfs/squid index ef676a2..f85b5e9 100644 --- a/lfs/squid +++ b/lfs/squid @@ -24,7 +24,7 @@

include Config

-VER = 3.1.13 +VER = 3.1.14

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

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

-$(DL_FILE)_MD5 = 78e756135c2bd6bbaf52eb5520f8b934 +$(DL_FILE)_MD5 = 8f82a451b04c3bf3c29202c548d2f2dd

install : $(TARGET)

diff --git a/lfs/strongswan b/lfs/strongswan index 1d009b8..7f92c19 100644 --- a/lfs/strongswan +++ b/lfs/strongswan @@ -24,7 +24,7 @@

include Config

-VER = 4.5.2 +VER = 4.5.3dr7

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

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

-$(DL_FILE)_MD5 = ac33b8f849a274127f84df0838cae953 +$(DL_FILE)_MD5 = 72036d309e254c0b3cad8e5473d68218

install : $(TARGET)

@@ -72,7 +72,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)

cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-4.4.0_ipfire.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-4.5.2-force_kill_charon.patch

cd $(DIR_APP) && ./configure --prefix="/usr" --sysconfdir="/etc" \ --enable-cisco-quirks \ diff --git a/make.sh b/make.sh index 6d1e423..8c08fc3 100755 --- a/make.sh +++ b/make.sh @@ -25,8 +25,8 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.10" # Version number -CORE="50" # Core Level (Filename) -PAKFIRE_CORE="49" # Core Level (PAKFIRE) +CORE="51" # Core Level (Filename) +PAKFIRE_CORE="50" # 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 diff --git a/src/patches/strongswan-4.5.2-force_kill_charon.patch b/src/patches/strongswan-4.5.2-force_kill_charon.patch deleted file mode 100644 index d2f3561..0000000 --- a/src/patches/strongswan-4.5.2-force_kill_charon.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -Naur strongswan-4.5.2.org/src/ipsec/ipsec.in strongswan-4.5.2/src/ipsec/ipsec.in ---- strongswan-4.5.2.org/src/ipsec/ipsec.in 2010-12-18 17:19:05.000000000 +0100 -+++ strongswan-4.5.2/src/ipsec/ipsec.in 2011-07-03 11:39:39.501501334 +0200 -@@ -326,7 +326,7 @@ - if [ -n "$spid" ] - then - kill $spid 2>/dev/null -- loop=5 -+ loop=30 - while [ $loop -gt 0 ] ; do - kill -0 $spid 2>/dev/null || break - sleep 1 -@@ -335,6 +335,7 @@ - if [ $loop -eq 0 ] - then - kill -KILL $spid 2>/dev/null -+ killall -KILL charon 2>/dev/null - rm -f $IPSEC_STARTER_PID - fi - fi

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