[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 592efb85b898498361bd0b698cee18ec8dd35041 - IPFire-SCM

1 Aug 2013

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  592efb85b898498361bd0b698cee18ec8dd35041 (commit)
       via  7f532e3725cba38c96a1cc0d0bd75802f8732994 (commit)
       via  ae99d423b9ed13c2b7960833b81becd781a1ac58 (commit)
       via  72417e2f7bdffa0c53510215f7dfd866a9da2f38 (commit)
       via  6b0a04c0f81ff33793783752aa8275974b12fdd5 (commit)
       via  e877f684918ff5007d8b441736ecad3012829529 (commit)
       via  4f64e2090f61fd68dadbaec989b6cb38ba9d9604 (commit)
       via  05f4061d10a1bacb9a3c60205d8d88b84f216d29 (commit)
       via  15fbfae62747088414e48ad0bc380a488265af1f (commit)
       via  5e9b7dd2c3c0d242c06a48450fef81fcfb5fa29a (commit)
       via  e0cdf670a3d79b6d607f7eade6d99743f5cd5769 (commit)
       via  f4dd02f2b6b5b74ca71160d76039c06af7b1992f (commit)
       via  82efdd4f22af3a3f37c99444c1ee65934920ea24 (commit)
       via  bf9a484fb83ecf2e5d9d67f6f58d48b6b262fc67 (commit)
       via  3f7ae7b7158e6d15a273815c676e63794346fffe (commit)
       via  d1347595abe451baa2ad4b1a81c15e160135ecf0 (commit)
      from  d154ab5899fc6f380be7d42148c2803e7dc3017f (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 592efb85b898498361bd0b698cee18ec8dd35041
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Thu Aug 1 19:41:21 2013 +0200
core72: Add strongswan update.
commit 7f532e3725cba38c96a1cc0d0bd75802f8732994
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Thu Aug 1 19:38:50 2013 +0200
strongswan: Update to 5.1.0.
commit ae99d423b9ed13c2b7960833b81becd781a1ac58
Merge: 72417e2 d154ab5
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Thu Aug 1 18:24:03 2013 +0200
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into strongswan-next
commit 72417e2f7bdffa0c53510215f7dfd866a9da2f38
Merge: 6b0a04c 6ab7955
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sat Jul 20 18:48:29 2013 +0200
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into strongswan-next
commit 6b0a04c0f81ff33793783752aa8275974b12fdd5
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sat Jul 20 17:35:53 2013 +0200
strongswan: Update to 5.1.0rc1.
commit e877f684918ff5007d8b441736ecad3012829529
Merge: 4f64e20 05f4061
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sat Jul 20 12:54:31 2013 +0200
Merge remote-tracking branch 'ms/strongswan-next' into strongswan-next
commit 4f64e2090f61fd68dadbaec989b6cb38ba9d9604
Merge: 15fbfae 83803ca
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sat Jul 20 12:51:26 2013 +0200
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into strongswan-next
commit 05f4061d10a1bacb9a3c60205d8d88b84f216d29
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sat Jul 20 12:49:46 2013 +0200
ipsec: Add ECP cryptography.
Allow selecting ECDH for IPsec VPN connections.
commit 15fbfae62747088414e48ad0bc380a488265af1f
Merge: 5e9b7dd b5c00b8
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Jul 17 17:45:40 2013 +0200
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into strongswan-next
commit 5e9b7dd2c3c0d242c06a48450fef81fcfb5fa29a
Merge: e0cdf67 15be554
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Tue Jul 16 22:00:14 2013 +0200
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into strongswan-next
commit e0cdf670a3d79b6d607f7eade6d99743f5cd5769
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Tue Jul 16 12:04:29 2013 +0200
ipsecctrl: Re-read everything when configuration is reloaded.
commit f4dd02f2b6b5b74ca71160d76039c06af7b1992f
Merge: 82efdd4 15f7877
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Tue Jul 16 12:04:00 2013 +0200
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into strongswan-next
commit 82efdd4f22af3a3f37c99444c1ee65934920ea24
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sun Jul 14 12:58:38 2013 +0200
strongswan: Update to 5.1.0dr2.
commit bf9a484fb83ecf2e5d9d67f6f58d48b6b262fc67
Merge: 3f7ae7b a0da39f
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sun Jul 14 12:48:29 2013 +0200
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into strongswan-next
commit 3f7ae7b7158e6d15a273815c676e63794346fffe
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Thu Jul 4 12:41:25 2013 +0200
strongswan: Update to 5.1.0dr1.
commit d1347595abe451baa2ad4b1a81c15e160135ecf0
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Jul 3 21:38:17 2013 +0200
gperf: New package.
-----------------------------------------------------------------------
Summary of changes:
 config/rootfiles/common/gperf                                 |  4 ++++
 config/rootfiles/common/strongswan                            |  3 +++
 .../{oldcore/66 => core/72}/filelists/i586/strongswan-padlock |  0
 config/rootfiles/{oldcore/38 => core/72}/filelists/strongswan |  0
 config/rootfiles/core/72/update.sh                            |  2 ++
 lfs/{nasm => gperf}                                           | 11 +++++------
 lfs/strongswan                                                | 11 ++++++-----
 make.sh                                                       |  1 +
 8 files changed, 21 insertions(+), 11 deletions(-)
 create mode 100644 config/rootfiles/common/gperf
 copy config/rootfiles/{oldcore/66 => core/72}/filelists/i586/strongswan-padlock (100%)
 copy config/rootfiles/{oldcore/38 => core/72}/filelists/strongswan (100%)
 copy lfs/{nasm => gperf} (93%)
Difference in files:

diff --git a/config/rootfiles/common/gperf b/config/rootfiles/common/gperf
new file mode 100644
index 0000000..7c3a1cb
--- /dev/null
+++ b/config/rootfiles/common/gperf
@@ -0,0 +1,4 @@
+#usr/bin/gperf
+#usr/share/doc/gperf.html
+#usr/share/info/gperf.info
+#usr/share/man/man1/gperf.1
diff --git a/config/rootfiles/common/strongswan b/config/rootfiles/common/strongswan
index 627b8d2..5d61ec1 100644
--- a/config/rootfiles/common/strongswan
+++ b/config/rootfiles/common/strongswan
@@ -61,15 +61,18 @@ usr/lib/ipsec/plugins/libstrongswan-openssl.so
 usr/lib/ipsec/plugins/libstrongswan-pem.so
 usr/lib/ipsec/plugins/libstrongswan-pgp.so
 usr/lib/ipsec/plugins/libstrongswan-pkcs1.so
+usr/lib/ipsec/plugins/libstrongswan-pkcs12.so
 usr/lib/ipsec/plugins/libstrongswan-pkcs7.so
 usr/lib/ipsec/plugins/libstrongswan-pkcs8.so
 usr/lib/ipsec/plugins/libstrongswan-pubkey.so
 usr/lib/ipsec/plugins/libstrongswan-random.so
+usr/lib/ipsec/plugins/libstrongswan-rc2.so
 usr/lib/ipsec/plugins/libstrongswan-resolve.so
 usr/lib/ipsec/plugins/libstrongswan-revocation.so
 usr/lib/ipsec/plugins/libstrongswan-sha1.so
 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-updown.so
 usr/lib/ipsec/plugins/libstrongswan-x509.so
diff --git a/config/rootfiles/core/72/filelists/i586/strongswan-padlock b/config/rootfiles/core/72/filelists/i586/strongswan-padlock
new file mode 120000
index 0000000..2412824
--- /dev/null
+++ b/config/rootfiles/core/72/filelists/i586/strongswan-padlock
@@ -0,0 +1 @@
+../../../../common/i586/strongswan-padlock
\ No newline at end of file
diff --git a/config/rootfiles/core/72/filelists/strongswan b/config/rootfiles/core/72/filelists/strongswan
new file mode 120000
index 0000000..90c727e
--- /dev/null
+++ b/config/rootfiles/core/72/filelists/strongswan
@@ -0,0 +1 @@
+../../../common/strongswan
\ No newline at end of file
diff --git a/config/rootfiles/core/72/update.sh b/config/rootfiles/core/72/update.sh
index f365abb..4a5b943 100644
--- a/config/rootfiles/core/72/update.sh
+++ b/config/rootfiles/core/72/update.sh
@@ -34,6 +34,7 @@ done
#
 #Stop services
+ipsec stop
#
@@ -43,6 +44,7 @@ extract_files
#
 #Start services
+ipsec start
#
 #Update Language cache
diff --git a/lfs/gperf b/lfs/gperf
new file mode 100644
index 0000000..ac33857
--- /dev/null
+++ b/lfs/gperf
@@ -0,0 +1,76 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2013 IPFire Development Team                                  #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see http://www.gnu.org/licenses/.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 3.0.4
+
+THISAPP    = gperf-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = c1f1db32fb6598d6a93e6e88796a8632
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+	@$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+	@$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+	@$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+	@$(PREBUILD)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
+	cd $(DIR_APP) && make $(MAKETUNING)
+	cd $(DIR_APP) && make install
+	@rm -rf $(DIR_APP)
+	@$(POSTBUILD)
diff --git a/lfs/strongswan b/lfs/strongswan
index a6075a2..4701f34 100644
--- a/lfs/strongswan
+++ b/lfs/strongswan
@@ -24,12 +24,12 @@
include Config
-VER        = 5.0.4
+VER        = 5.1.0
THISAPP    = strongswan-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
+DIR_APP    = $(DIR_SRC)/strongswan-$(VER)
 TARGET     = $(DIR_INFO)/$(THISAPP)
ifeq "$(MACHINE)" "i586"
@@ -46,7 +46,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 7085ac1d28dcc250096553fa51c3a4ea
+$(DL_FILE)_MD5 = c1cd0a3ba9960f590cae28c8470800e8
install : $(TARGET)
@@ -79,6 +79,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-4.5.3_ipfire.patch
+	cd $(DIR_APP) && [ -x "configure" ] || ./autogen.sh
    cd $(DIR_APP) && ./configure \
    	--prefix="/usr" \
    	--sysconfdir="/etc" \
@@ -93,7 +94,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    	--enable-eap-identity \
    	$(PADLOCK)
-	cd $(DIR_APP) && make $(MAKETUNING)
+	cd $(DIR_APP) && make $(MAKETUNING) LDFLAGS="-lrt"
    cd $(DIR_APP) && make install
# Remove all library files we don't want or need.
diff --git a/make.sh b/make.sh
index f74288d..7fcb69f 100755
--- a/make.sh
+++ b/make.sh
@@ -333,6 +333,7 @@ buildbase() {
     lfsmake2 gettext
     lfsmake2 grep
     lfsmake2 groff
+    lfsmake2 gperf
     lfsmake2 gzip
     lfsmake2 inetutils
     lfsmake2 iproute2
hooks/post-receive
--
IPFire 2.x development tree

    