[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 5e7474d8f10ac5115cd34b4708798a48b814e71d

[git@ipfire.org]

[-- Attachment #1: Type: text/plain, Size: 4045 bytes --]

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 3.x development tree".

The branch, master has been updated
       via  5e7474d8f10ac5115cd34b4708798a48b814e71d (commit)
       via  6354a60df151a200d77e98e4f52cf3cc808a181d (commit)
       via  11893672cea6eab0ee2b900e0b2baaa606a7cf36 (commit)
      from  f390687c60fffd55b24ae67b977d60bd89d4d5a2 (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 5e7474d8f10ac5115cd34b4708798a48b814e71d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Thu Jul 9 23:25:39 2015 +0200

    strongswan: Update to version 5.3.2
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 6354a60df151a200d77e98e4f52cf3cc808a181d
Merge: 1189367 f390687
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Thu Jul 9 23:25:05 2015 +0200

    Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x

commit 11893672cea6eab0ee2b900e0b2baaa606a7cf36
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Jul 6 00:52:17 2015 +0200

    tzdata: Fix installation location of the files
    
    The files were installed in a wrong sub-directory
    and therefore could not be properly found by programs
    using time.
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

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

Summary of changes:
 strongswan/strongswan.nm | 36 ++++++++++++++++++++++--------------
 tzdata/tzdata.nm         |  4 ++--
 2 files changed, 24 insertions(+), 16 deletions(-)

Difference in files:
diff --git a/strongswan/strongswan.nm b/strongswan/strongswan.nm
index 18b305a..b386083 100644
--- a/strongswan/strongswan.nm
+++ b/strongswan/strongswan.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = strongswan
-version    = 5.0.1
+version    = 5.3.2
 release    = 1
 
 groups     = Networking/VPN
@@ -24,6 +24,8 @@ sources    = %{thisapp}.tar.bz2
 
 build
 	requires
+		autoconf
+		automake
 		bison
 		flex
 		gmp-devel
@@ -46,24 +48,30 @@ build
 		--enable-openssl \
 		--enable-sqlite \
 		--enable-gcrypt \
-		--with-capabilities=libcap
+		--enable-ccm \
+		--enable-ctr \
+		--enable-gcm \
+		--enable-xauth-eap \
+		--enable-xauth-noauth \
+		--enable-eap-radius \
+		--enable-eap-tls \
+		--enable-eap-ttls \
+		--enable-eap-peap \
+		--enable-eap-mschapv2 \
+		--enable-eap-identity \
+		--with-capabilities=libcap \
+		--enable-swanctl \
+		--enable-kernel-libipsec
 
 	if "%{DISTRO_ARCH}" == "i686"
 		configure_options += --enable-padlock
 	end
 
-	test
-		make check
-	end
-
-	install_cmds
-		# Make the shared libraries available to the runtime linker.
-		# (RPATH issues, whatever...)
-		cd %{BUILDROOT}%{libdir}
-		for lib in libcharon.so.0 libhydra.so.0 libstrongswan.so.0; do
-			ln -svf ipsec/${lib} .
-		done
-	end
+	# The testsuite does not run through in the build system
+	# on ARM systems.
+	#test
+	#	make check
+	#end
 end
 
 packages
diff --git a/tzdata/tzdata.nm b/tzdata/tzdata.nm
index 434fb68..8a5abd3 100644
--- a/tzdata/tzdata.nm
+++ b/tzdata/tzdata.nm
@@ -8,7 +8,7 @@ tzcode_version = 2014j
 
 name       = tzdata
 version    = %{tzdata_version}
-release    = 1
+release    = 2
 arch       = noarch
 
 groups     = System/Base
@@ -63,7 +63,7 @@ build
 
 	install
 		mkdir -pv %{BUILDROOT}%{datadir}/zoneinfo
-		cp -prd zoneinfo %{BUILDROOT}%{datadir}/zoneinfo
+		cp -prd zoneinfo/* %{BUILDROOT}%{datadir}/zoneinfo
 
 		install -p -m 644 zone.tab iso3166.tab \
 			%{BUILDROOT}%{datadir}/zoneinfo


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