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 d7ae74183727a8f5ee99d151610099ec8ea9851d (commit) via 0cf124ab691a5502923ef69627b96069580861da (commit) via ff7aaa0721a4df126086e7b27be1519f2ab93255 (commit) via 35275bcd26cc471ae47b60e820366418f25d7823 (commit) via a3b3340bcca61cd0d0c5bc0d2e094c91c8226e79 (commit) from 49c7a4b8284bbf03019f7b1565ac7d55ba2eacec (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 d7ae74183727a8f5ee99d151610099ec8ea9851d Merge: 49c7a4b 0cf124a Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Apr 9 12:41:40 2013 +0200

Merge branch 'strongswan-next' into next

commit 0cf124ab691a5502923ef69627b96069580861da Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Apr 8 14:42:44 2013 +0200

ipsec: Set IKE/IPsec lifetime to strongswan defaults.

As suggested by Tom Rymes: https://bugzilla.ipfire.org/show_bug.cgi?id=10346

commit ff7aaa0721a4df126086e7b27be1519f2ab93255 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Apr 5 11:20:31 2013 +0200

Add strongswan update to core update 68.

commit 35275bcd26cc471ae47b60e820366418f25d7823 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Apr 5 11:19:54 2013 +0200

strongswan: Update to 5.0.3.

commit a3b3340bcca61cd0d0c5bc0d2e094c91c8226e79 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Mar 28 17:09:35 2013 +0100

strongswan: Update to 5.0.3rc1.

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

Summary of changes: config/rootfiles/{oldcore/38 => core/68}/filelists/strongswan | 0 html/cgi-bin/vpnmain.cgi | 4 ++-- lfs/strongswan | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) copy config/rootfiles/{oldcore/38 => core/68}/filelists/strongswan (100%)

Difference in files: diff --git a/config/rootfiles/core/68/filelists/strongswan b/config/rootfiles/core/68/filelists/strongswan new file mode 120000 index 0000000..90c727e --- /dev/null +++ b/config/rootfiles/core/68/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index 161df4d..bda49a3 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -1832,11 +1832,11 @@ END $cgiparams{'IKE_ENCRYPTION'} = 'aes256|aes192|aes128|3des'; #[18]; $cgiparams{'IKE_INTEGRITY'} = 'sha2_256|sha|md5'; #[19]; $cgiparams{'IKE_GROUPTYPE'} = '8192|6144|4096|3072|2048|1536|1024'; #[20]; - $cgiparams{'IKE_LIFETIME'} = '1'; #[16]; + $cgiparams{'IKE_LIFETIME'} = '3'; #[16]; $cgiparams{'ESP_ENCRYPTION'} = 'aes256|aes192|aes128|3des'; #[21]; $cgiparams{'ESP_INTEGRITY'} = 'sha2_256|sha1|md5'; #[22]; $cgiparams{'ESP_GROUPTYPE'} = ''; #[23]; - $cgiparams{'ESP_KEYLIFE'} = '8'; #[17]; + $cgiparams{'ESP_KEYLIFE'} = '1'; #[17]; $cgiparams{'COMPRESSION'} = 'on'; #[13]; $cgiparams{'ONLY_PROPOSED'} = 'off'; #[24]; $cgiparams{'PFS'} = 'on'; #[28]; diff --git a/lfs/strongswan b/lfs/strongswan index 8e75329..1b7877c 100644 --- a/lfs/strongswan +++ b/lfs/strongswan @@ -24,10 +24,10 @@

include Config

-VER = 5.0.2 +VER = 5.0.3

THISAPP = strongswan-$(VER) -DL_FILE = $(THISAPP).tar.bz2 +DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -46,7 +46,7 @@ objects = $(DL_FILE)

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

-$(DL_FILE)_MD5 = 77dc16443fd141f46183d3a4f60986ef +$(DL_FILE)_MD5 = c37d841f8b0d11b14cf7f29fcdd20621

install : $(TARGET)

@@ -75,7 +75,7 @@ $(subst %,%_MD5,$(objects)) :

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

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

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