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.
 ec985733a532fb257e75fd75a10746fe9c8cfb80
Date: Thu, 07 Nov 2013 20:57:03 +0100
Message-ID: <20131107195704.50FB2201E1@argus.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3672166813089717789=="
List-Id: <ipfire-scm.lists.ipfire.org>

--===============3672166813089717789==
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  ec985733a532fb257e75fd75a10746fe9c8cfb80 (commit)
      from  6fb9681c24360c0c531e18215673e2ba83c53879 (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 ec985733a532fb257e75fd75a10746fe9c8cfb80
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Thu Nov 7 20:56:43 2013 +0100

    strongswan: Update to 5.1.1.

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

Summary of changes:
 config/rootfiles/common/i586/strongswan-padlock |  1 +
 config/rootfiles/common/strongswan              |  1 +
 lfs/strongswan                                  | 15 ++++++++++-----
 3 files changed, 12 insertions(+), 5 deletions(-)

Difference in files:
diff --git a/config/rootfiles/common/i586/strongswan-padlock b/config/rootfil=
es/common/i586/strongswan-padlock
index 02aa457..4ebfc75 100644
--- a/config/rootfiles/common/i586/strongswan-padlock
+++ b/config/rootfiles/common/i586/strongswan-padlock
@@ -1 +1,2 @@
 usr/lib/ipsec/plugins/libstrongswan-padlock.so
+usr/lib/ipsec/plugins/libstrongswan-rdrand.so
diff --git a/config/rootfiles/common/strongswan b/config/rootfiles/common/str=
ongswan
index 0994d07..d045c31 100644
--- a/config/rootfiles/common/strongswan
+++ b/config/rootfiles/common/strongswan
@@ -75,6 +75,7 @@ usr/lib/ipsec/plugins/libstrongswan-sha2.so
 usr/lib/ipsec/plugins/libstrongswan-socket-default.so
 usr/lib/ipsec/plugins/libstrongswan-sshkey.so
 usr/lib/ipsec/plugins/libstrongswan-stroke.so
+usr/lib/ipsec/plugins/libstrongswan-unity.so
 usr/lib/ipsec/plugins/libstrongswan-updown.so
 usr/lib/ipsec/plugins/libstrongswan-x509.so
 usr/lib/ipsec/plugins/libstrongswan-xauth-eap.so
diff --git a/lfs/strongswan b/lfs/strongswan
index b2c362e..701e3c5 100644
--- a/lfs/strongswan
+++ b/lfs/strongswan
@@ -24,7 +24,7 @@
=20
 include Config
=20
-VER        =3D 5.1.1rc1
+VER        =3D 5.1.1
=20
 THISAPP    =3D strongswan-$(VER)
 DL_FILE    =3D $(THISAPP).tar.bz2
@@ -33,9 +33,13 @@ DIR_APP    =3D $(DIR_SRC)/strongswan-$(VER)
 TARGET     =3D $(DIR_INFO)/$(THISAPP)
=20
 ifeq "$(MACHINE)" "i586"
-	PADLOCK =3D --enable-padlock
+	CONFIGURE_OPTIONS =3D \
+		--enable-padlock \
+		--enable-rdrand
 else
-	PADLOCK =3D --disable-padlock
+	CONFIGURE_OPTIONS =3D \
+		--disable-padlock \
+		--disable-rdrand
 endif
=20
 ############################################################################=
###
@@ -46,7 +50,7 @@ objects =3D $(DL_FILE)
=20
 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_MD5 =3D 69826b6a6103ae705c48b3f33b4dd3d5
+$(DL_FILE)_MD5 =3D e3af3d493d22286be3cd794533a8966a
=20
 install : $(TARGET)
=20
@@ -92,7 +96,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		--enable-eap-peap \
 		--enable-eap-mschapv2 \
 		--enable-eap-identity \
-		$(PADLOCK)
+		--enable-unity \
+		$(CONFIGURE_OPTIONS)
=20
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install


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

--===============3672166813089717789==--