From mboxrd@z Thu Jan  1 00:00:00 1970
From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated.
 8235f17df5bdc1d5131c10bdfd40b40741bdebce
Date: Sat, 03 Oct 2015 20:18:14 +0200
Message-ID: <20151003181814.E7CDF2120C@argus.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5571444092146345153=="
List-Id: <ipfire-scm.lists.ipfire.org>

--===============5571444092146345153==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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  8235f17df5bdc1d5131c10bdfd40b40741bdebce (commit)
      from  75ccb6a6935506245f8957a386635b3db2e192fd (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 8235f17df5bdc1d5131c10bdfd40b40741bdebce
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sat Oct 3 19:15:36 2015 +0100

    strongswan: Update to 5.3.3
   =20
    ChaCha is disabled since our kernel does not support it yet
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

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

Summary of changes:
 config/rootfiles/common/strongswan                                   | 1 +
 .../{oldcore/91 =3D> core/95}/filelists/i586/strongswan-padlock        | 0
 config/rootfiles/{oldcore/91 =3D> core/95}/filelists/strongswan        | 0
 config/rootfiles/core/95/update.sh                                   | 4 ++++
 lfs/strongswan                                                       | 5 +++=
--
 5 files changed, 8 insertions(+), 2 deletions(-)
 copy config/rootfiles/{oldcore/91 =3D> core/95}/filelists/i586/strongswan-pa=
dlock (100%)
 copy config/rootfiles/{oldcore/91 =3D> core/95}/filelists/strongswan (100%)

Difference in files:
diff --git a/config/rootfiles/common/strongswan b/config/rootfiles/common/str=
ongswan
index 7564d38..f51cc3a 100644
--- a/config/rootfiles/common/strongswan
+++ b/config/rootfiles/common/strongswan
@@ -153,6 +153,7 @@ usr/libexec/ipsec/starter
 usr/libexec/ipsec/stroke
 usr/sbin/ipsec
 #usr/share/man/man1/pki---acert.1
+#usr/share/man/man1/pki---dn.1
 #usr/share/man/man1/pki---gen.1
 #usr/share/man/man1/pki---issue.1
 #usr/share/man/man1/pki---keyid.1
diff --git a/config/rootfiles/core/95/filelists/i586/strongswan-padlock b/con=
fig/rootfiles/core/95/filelists/i586/strongswan-padlock
new file mode 120000
index 0000000..2412824
--- /dev/null
+++ b/config/rootfiles/core/95/filelists/i586/strongswan-padlock
@@ -0,0 +1 @@
+../../../../common/i586/strongswan-padlock
\ No newline at end of file
diff --git a/config/rootfiles/core/95/filelists/strongswan b/config/rootfiles=
/core/95/filelists/strongswan
new file mode 120000
index 0000000..90c727e
--- /dev/null
+++ b/config/rootfiles/core/95/filelists/strongswan
@@ -0,0 +1 @@
+../../../common/strongswan
\ No newline at end of file
diff --git a/config/rootfiles/core/95/update.sh b/config/rootfiles/core/95/up=
date.sh
index 388e18d..a34a3fe 100644
--- a/config/rootfiles/core/95/update.sh
+++ b/config/rootfiles/core/95/update.sh
@@ -36,6 +36,7 @@ rm -f /etc/rc.d/init.d/network-vlans
 rm -f /etc/rc.d/rcsysinit.d/S91network-vlans
=20
 # Stop services
+/etc/init.d/ipsec stop
=20
 # Extract files
 extract_files
@@ -44,6 +45,9 @@ extract_files
 /usr/local/bin/update-lang-cache
=20
 # Start services
+if [ `grep "ENABLED=3Don" /var/ipfire/vpn/settings` ]; then
+	/etc/init.d/ipsec start
+fi
=20
 # This update need a reboot...
 #touch /var/run/need_reboot
diff --git a/lfs/strongswan b/lfs/strongswan
index b4438dd..2a181a3 100644
--- a/lfs/strongswan
+++ b/lfs/strongswan
@@ -24,7 +24,7 @@
=20
 include Config
=20
-VER        =3D 5.3.2
+VER        =3D 5.3.3
=20
 THISAPP    =3D strongswan-$(VER)
 DL_FILE    =3D $(THISAPP).tar.bz2
@@ -48,7 +48,7 @@ objects =3D $(DL_FILE)
=20
 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_MD5 =3D fab014be1477ef4ebf9a765e10f8802c
+$(DL_FILE)_MD5 =3D 5a25f3d1c31a77ef44d14a2e7b3eaad0
=20
 install : $(TARGET)
=20
@@ -99,6 +99,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		--enable-eap-peap \
 		--enable-eap-mschapv2 \
 		--enable-eap-identity \
+		--disable-chapoly \
 		$(CONFIGURE_OPTIONS)
=20
 	cd $(DIR_APP) && make $(MAKETUNING)


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

--===============5571444092146345153==--