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 c8796dfba88eb17832cfc60f96c92e626d7cabf7 (commit) via 65f0333066db08ccaf9d0cf647f23ec5279e8ebe (commit) via 32c21db1c43be6d2d569cc8d1f92efabdf8885da (commit) from 62b923f9dfbf0c86ac49405c884d0b1167c71b5f (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 c8796dfba88eb17832cfc60f96c92e626d7cabf7 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat May 21 23:37:15 2011 +0200
strongswan: update to 4.5.2.
commit 65f0333066db08ccaf9d0cf647f23ec5279e8ebe Merge: 62b923f 32c21db Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat May 21 20:59:16 2011 +0200
Merge branch 'master' into next
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/common/strongswan | 8 +++----- config/rootfiles/core/49/filelists/files | 1 + .../{oldcore/38 => core/next}/filelists/strongswan | 0 html/cgi-bin/logs.cgi/log.dat | 2 +- lfs/strongswan | 6 +++--- 5 files changed, 8 insertions(+), 9 deletions(-) copy config/rootfiles/{oldcore/38 => core/next}/filelists/strongswan (100%)
Difference in files: diff --git a/config/rootfiles/common/strongswan b/config/rootfiles/common/strongswan index df093b0..6e97b17 100644 --- a/config/rootfiles/common/strongswan +++ b/config/rootfiles/common/strongswan @@ -40,6 +40,9 @@ usr/libexec/ipsec/plugins/libstrongswan-aes.so #usr/libexec/ipsec/plugins/libstrongswan-attr.a #usr/libexec/ipsec/plugins/libstrongswan-attr.la usr/libexec/ipsec/plugins/libstrongswan-attr.so +#usr/libexec/ipsec/plugins/libstrongswan-constraints.a +#usr/libexec/ipsec/plugins/libstrongswan-constraints.la +usr/libexec/ipsec/plugins/libstrongswan-constraints.so #usr/libexec/ipsec/plugins/libstrongswan-curl.a #usr/libexec/ipsec/plugins/libstrongswan-curl.la usr/libexec/ipsec/plugins/libstrongswan-curl.so @@ -118,14 +121,11 @@ usr/sbin/ipsec #usr/share/man/man3/anyaddr.3 #usr/share/man/man3/atoaddr.3 #usr/share/man/man3/atoasr.3 -#usr/share/man/man3/atosa.3 #usr/share/man/man3/atoul.3 #usr/share/man/man3/goodmask.3 #usr/share/man/man3/initaddr.3 #usr/share/man/man3/initsubnet.3 -#usr/share/man/man3/keyblobtoid.3 #usr/share/man/man3/portof.3 -#usr/share/man/man3/prng.3 #usr/share/man/man3/rangetosubnet.3 #usr/share/man/man3/sameaddr.3 #usr/share/man/man3/subnetof.3 @@ -136,13 +136,11 @@ usr/sbin/ipsec #usr/share/man/man5/ipsec.conf.5 #usr/share/man/man5/ipsec.secrets.5 #usr/share/man/man5/strongswan.conf.5 -#usr/share/man/man8/_copyright.8 #usr/share/man/man8/_updown.8 #usr/share/man/man8/_updown_espmark.8 #usr/share/man/man8/ipsec.8 #usr/share/man/man8/openac.8 #usr/share/man/man8/pluto.8 #usr/share/man/man8/scepclient.8 -#usr/share/man/man8/starter.8 etc/ipsec.user.conf etc/ipsec.user.secrets diff --git a/config/rootfiles/core/49/filelists/files b/config/rootfiles/core/49/filelists/files index 032958b..565594a 100644 --- a/config/rootfiles/core/49/filelists/files +++ b/config/rootfiles/core/49/filelists/files @@ -6,6 +6,7 @@ var/ipfire/backup/bin/backup.pl srv/web/ipfire/cgi-bin/backup.cgi srv/web/ipfire/cgi-bin/extrahd.cgi srv/web/ipfire/cgi-bin/ids.cgi +srv/web/ipfire/cgi-bin/logs.cgi/log.dat srv/web/ipfire/cgi-bin/ovpnmain.cgi srv/web/ipfire/cgi-bin/pppsetup.cgi srv/web/ipfire/cgi-bin/proxy.cgi diff --git a/config/rootfiles/core/next/filelists/strongswan b/config/rootfiles/core/next/filelists/strongswan new file mode 120000 index 0000000..90c727e --- /dev/null +++ b/config/rootfiles/core/next/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/html/cgi-bin/logs.cgi/log.dat b/html/cgi-bin/logs.cgi/log.dat index fea9e6b..5757080 100644 --- a/html/cgi-bin/logs.cgi/log.dat +++ b/html/cgi-bin/logs.cgi/log.dat @@ -60,7 +60,7 @@ my %sections = ( 'ssh' => '(sshd(?:(.*))?[.*]: )', 'auth' => '(\w+(pam_unix)[.*]: )', 'kernel' => '(kernel: (?!DROP_))', - 'ipsec' => '(ipsec_[\w_]+: |pluto[.*]: |vpnwatch: )', + 'ipsec' => '(ipsec_[\w_]+: |pluto[.*]: |charon[.*]: |vpnwatch: )', 'openvpn' => '(openvpnserver)[.*]: ', 'pakfire' => '(pakfire:) ', 'wireless' => '(hostapd:|kernel: ath.*:|kernel: wifi[0-9]:) ' diff --git a/lfs/strongswan b/lfs/strongswan index 380d351..8c27b1b 100644 --- a/lfs/strongswan +++ b/lfs/strongswan @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2010 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2011 IPFire Team info@ipfire.org # # # # 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 # @@ -24,7 +24,7 @@
include Config
-VER = 4.5.0 +VER = 4.5.2
THISAPP = strongswan-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = cfbd6efef87830a2e7cc4175bde7ac84 +$(DL_FILE)_MD5 = ac33b8f849a274127f84df0838cae953
install : $(TARGET)
hooks/post-receive -- IPFire 2.x development tree