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 f17f51e87361efe5c687690e0614636384657b9d (commit) via e360e50ac4cf04717281344382d5ee243091bb50 (commit) from 2cce1559f2da9b986a4288159478b1b999710457 (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 f17f51e87361efe5c687690e0614636384657b9d Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Feb 7 14:59:50 2014 +0100
fireinfo: Fix finding the root device.
commit e360e50ac4cf04717281344382d5ee243091bb50 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Feb 7 14:49:03 2014 +0100
strongswan: Update to 5.1.2dr3.
-----------------------------------------------------------------------
Summary of changes: lfs/fireinfo | 1 + lfs/strongswan | 5 ++-- ...-mounted-filesystems-from-proc-mounts-ins.patch | 30 +++++++++++++++++++ src/patches/strongswan-5.1.1-delay-dpd.patch | 35 ---------------------- 4 files changed, 33 insertions(+), 38 deletions(-) create mode 100644 src/patches/fireinfo-2.1.8-Revert-Read-mounted-filesystems-from-proc-mounts-ins.patch delete mode 100644 src/patches/strongswan-5.1.1-delay-dpd.patch
Difference in files: diff --git a/lfs/fireinfo b/lfs/fireinfo index 0c5d313..802f485 100644 --- a/lfs/fireinfo +++ b/lfs/fireinfo @@ -71,6 +71,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/fireinfo-2.1.8-Revert-Read-mounted-filesystems-from-proc-mounts-ins.patch cd $(DIR_APP) && [ -x "configure" ] || sh ./autogen.sh cd $(DIR_APP) && ./configure --prefix=/usr cd $(DIR_APP) && make $(MAKETUNING) diff --git a/lfs/strongswan b/lfs/strongswan index 7583c62..2c2c0d7 100644 --- a/lfs/strongswan +++ b/lfs/strongswan @@ -24,7 +24,7 @@
include Config
-VER = 5.1.1 +VER = 5.1.2dr3
THISAPP = strongswan-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -48,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = e3af3d493d22286be3cd794533a8966a +$(DL_FILE)_MD5 = 0a2aba6b0682cc01eb4f9bbeb94bc481
install : $(TARGET)
@@ -79,7 +79,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-5.0.2_ipfire.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-5.1.1-delay-dpd.patch
cd $(DIR_APP) && [ -x "configure" ] || ./autogen.sh cd $(DIR_APP) && ./configure \ diff --git a/src/patches/fireinfo-2.1.8-Revert-Read-mounted-filesystems-from-proc-mounts-ins.patch b/src/patches/fireinfo-2.1.8-Revert-Read-mounted-filesystems-from-proc-mounts-ins.patch new file mode 100644 index 0000000..86e30cb --- /dev/null +++ b/src/patches/fireinfo-2.1.8-Revert-Read-mounted-filesystems-from-proc-mounts-ins.patch @@ -0,0 +1,30 @@ +From 758f624a9862b214f39c9106137a61e2d6b14544 Mon Sep 17 00:00:00 2001 +From: Michael Tremer michael.tremer@ipfire.org +Date: Fri, 7 Feb 2014 14:56:14 +0100 +Subject: [PATCH] Revert "Read mounted filesystems from /proc/mounts instead of + /etc/mtab." + +This reverts commit c916f644c57b638b3128d0e882c32bf50ea29631. + +For some reason, the output of /etc/mtab and /proc/mounts is not +identical and the root device is missing in /proc/mounts on IPFire. +--- + src/fireinfo/system.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/fireinfo/system.py b/src/fireinfo/system.py +index 800032e..40ff7b0 100644 +--- a/src/fireinfo/system.py ++++ b/src/fireinfo/system.py +@@ -364,7 +364,7 @@ class System(object): + """ + Return the dev node of the root disk. + """ +- with open("/proc/mounts", "r") as f: ++ with open("/etc/mtab", "r") as f: + dev, mountpoint, fs, rest = f.readline().split(" ", 3) + if mountpoint == "/" and not fs == "rootfs": + # Cut off /dev +-- +1.8.3.1 + diff --git a/src/patches/strongswan-5.1.1-delay-dpd.patch b/src/patches/strongswan-5.1.1-delay-dpd.patch deleted file mode 100644 index db3d664..0000000 --- a/src/patches/strongswan-5.1.1-delay-dpd.patch +++ /dev/null @@ -1,35 +0,0 @@ -From b76e96e2ef4d56c863b36c8d3c39e3c2efcf4a7c Mon Sep 17 00:00:00 2001 -From: Martin Willi martin@revosec.ch -Date: Fri, 1 Nov 2013 11:28:53 +0100 -Subject: [PATCH] ike: Don't immediately DPD after deferred DELETEs following IKE_SA rekeying - -Some peers seem to defer DELETEs a few seconds after rekeying the IKE_SA, which -is perfectly valid. For short(er) DPD delays, this leads to the situation where -we send a DPD request during set_state(), but the IKE_SA has no hosts set yet. -Avoid that DPD by resetting the INBOUND timestamp during set_state(). ---- - src/libcharon/sa/ike_sa.c | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) - -diff --git a/src/libcharon/sa/ike_sa.c b/src/libcharon/sa/ike_sa.c -index 0282087..d482f8b 100644 ---- a/src/libcharon/sa/ike_sa.c -+++ b/src/libcharon/sa/ike_sa.c -@@ -687,6 +687,14 @@ METHOD(ike_sa_t, set_state, void, - DBG1(DBG_IKE, "maximum IKE_SA lifetime %ds", t); - } - trigger_dpd = this->peer_cfg->get_dpd(this->peer_cfg); -+ if (trigger_dpd) -+ { -+ /* Some peers delay the DELETE after rekeying an IKE_SA. -+ * If this delay is longer than our DPD delay, we would -+ * send a DPD request here. The IKE_SA is not ready to do -+ * so yet, so prevent that. */ -+ this->stats[STAT_INBOUND] = this->stats[STAT_ESTABLISHED]; -+ } - } - break; - } --- -1.7.4.1 -
hooks/post-receive -- IPFire 2.x development tree