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, master has been updated via 58fcc270a78944d1c2d856f01a971640004e03d5 (commit) via f57c0abd4dd17519548f85135dd277bce56dc9b8 (commit) via 705ca9b0e68ea2d8782117c001b04b4155d1f97a (commit) via 98065e83ed74f7b7f20e98b157d76ffa654deeeb (commit) from 142eea7a3b12f8bf8e8d91d058fc09d03b7fa18e (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 58fcc270a78944d1c2d856f01a971640004e03d5 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat May 8 15:40:15 2010 +0200
Renamed usb_modeswitch.conf to setup at core38 update.
commit f57c0abd4dd17519548f85135dd277bce56dc9b8 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat May 8 15:36:58 2010 +0200
Updated usb-modeswitch (1.1.2).
commit 705ca9b0e68ea2d8782117c001b04b4155d1f97a Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat May 8 15:36:16 2010 +0200
Updated strongswan (4.4.0).
commit 98065e83ed74f7b7f20e98b157d76ffa654deeeb Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat May 8 15:35:11 2010 +0200
Change ipsec up/down of a tunnel.
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/common/strongswan | 13 +++++++++++++ config/rootfiles/common/usb_modeswitch | 5 ++++- config/rootfiles/core/38/update.sh | 4 ++++ doc/packages-list.txt | 4 ++-- lfs/strongswan | 10 ++-------- lfs/usb_modeswitch | 8 ++++---- src/misc-progs/ipsecctrl.c | 9 +++------ 7 files changed, 32 insertions(+), 21 deletions(-)
Difference in files: diff --git a/config/rootfiles/common/strongswan b/config/rootfiles/common/strongswan index 1130cc5..4367cd0 100644 --- a/config/rootfiles/common/strongswan +++ b/config/rootfiles/common/strongswan @@ -10,6 +10,16 @@ etc/ipsec.d/private etc/ipsec.d/reqs etc/ipsec.secrets etc/strongswan.conf +#usr/lib/libcharon.a +#usr/lib/libcharon.la +usr/lib/libcharon.so +usr/lib/libcharon.so.0 +usr/lib/libcharon.so.0.0.0 +#usr/lib/libhydra.a +#usr/lib/libhydra.la +usr/lib/libhydra.so +usr/lib/libhydra.so.0 +usr/lib/libhydra.so.0.0.0 #usr/lib/libstrongswan.a #usr/lib/libstrongswan.la usr/lib/libstrongswan.so @@ -75,6 +85,9 @@ usr/libexec/ipsec/plugins/libstrongswan-sha1.so #usr/libexec/ipsec/plugins/libstrongswan-sha2.a #usr/libexec/ipsec/plugins/libstrongswan-sha2.la usr/libexec/ipsec/plugins/libstrongswan-sha2.so +#usr/libexec/ipsec/plugins/libstrongswan-socket-raw.a +#usr/libexec/ipsec/plugins/libstrongswan-socket-raw.la +usr/libexec/ipsec/plugins/libstrongswan-socket-raw.so #usr/libexec/ipsec/plugins/libstrongswan-stroke.a #usr/libexec/ipsec/plugins/libstrongswan-stroke.la usr/libexec/ipsec/plugins/libstrongswan-stroke.so diff --git a/config/rootfiles/common/usb_modeswitch b/config/rootfiles/common/usb_modeswitch index bfef2c1..3a837b7 100644 --- a/config/rootfiles/common/usb_modeswitch +++ b/config/rootfiles/common/usb_modeswitch @@ -1,2 +1,5 @@ -etc/usb_modeswitch.conf.example +#lib/udev/usb_modeswitch +#etc/usb_modeswitch.conf +etc/usb_modeswitch.setup.example +#usr/share/man/man1/usb_modeswitch.1 usr/sbin/usb_modeswitch diff --git a/config/rootfiles/core/38/update.sh b/config/rootfiles/core/38/update.sh index e4843b8..6702f42 100644 --- a/config/rootfiles/core/38/update.sh +++ b/config/rootfiles/core/38/update.sh @@ -157,6 +157,10 @@ POSTCLEAN=`du -sh /var/log/rrd/collectd` # echo Cleaned up collectd directory from $PRECLEAN to $POSTCLEAN size. # +# USB Modeswitch conf now called setup, rename ... +# +mv -f /etc/usb_modeswitch.conf /etc/usb_modeswitch.setup +# # # Todo: rebuild qosscript if enabled... # diff --git a/doc/packages-list.txt b/doc/packages-list.txt index def86c4..047e038 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -305,7 +305,7 @@ * sshfs-fuse-2.2 * sslh-1.7a * streamripper-1.63.5 -* strongswan-4.3.6 +* strongswan-4.4.0 * sudo-1.6.8p12 * sysfsutils-1.3.0 * sysklogd-1.5 @@ -328,7 +328,7 @@ * udev-096-klibc * unzip552 * urlgrabber-3.1.0 -* usb_modeswitch-1.0.6 +* usb-modeswitch-1.1.2 * usbutils-0.72 * util-linux-2.12r * v4l-dvb-ee9826bc7106-kmod-2.6.32.12-ipfire diff --git a/lfs/strongswan b/lfs/strongswan index 29290f9..c9e6248 100644 --- a/lfs/strongswan +++ b/lfs/strongswan @@ -24,13 +24,7 @@
include Config
-ifeq "$(XEN)" "1" - VERSUFIX=ipfire-xen -else - VERSUFIX=ipfire -endif - -VER = 4.3.6 +VER = 4.4.0
THISAPP = strongswan-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -46,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = e071f46b6c463ce76900758734e6143e +$(DL_FILE)_MD5 = bfb0f1c8ef1344e1ae8157bdde060fed
install : $(TARGET)
diff --git a/lfs/usb_modeswitch b/lfs/usb_modeswitch index 8486b42..7a589cd 100644 --- a/lfs/usb_modeswitch +++ b/lfs/usb_modeswitch @@ -24,9 +24,9 @@
include Config
-VER = 1.0.6 +VER = 1.1.2
-THISAPP = usb_modeswitch-$(VER) +THISAPP = usb-modeswitch-$(VER) DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 7aca4741af6c409ef3ff09f60859a8f8 +$(DL_FILE)_MD5 = 071cb300d00938bfe20025c654303d92
install : $(TARGET)
@@ -73,6 +73,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && make clean cd $(DIR_APP) && make all $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_APP) && make install - mv -f /etc/usb_modeswitch.conf /etc/usb_modeswitch.conf.example + cp -f $(DIR_APP)/usb_modeswitch.setup /etc/usb_modeswitch.setup.example @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/src/misc-progs/ipsecctrl.c b/src/misc-progs/ipsecctrl.c index 7205afb..aa6b8a4 100644 --- a/src/misc-progs/ipsecctrl.c +++ b/src/misc-progs/ipsecctrl.c @@ -138,11 +138,7 @@ int decode_line (char *s, void turn_connection_on (char *name, char *type) { char command[STRING_SIZE];
- safe_system("/usr/sbin/ipsec whack --rereadall >/dev/null"); - memset(command, 0, STRING_SIZE); - snprintf(command, STRING_SIZE - 1, - "/usr/sbin/ipsec down %s >/dev/null", name); - safe_system(command); + safe_system("/usr/sbin/ipsec reload >/dev/null"); memset(command, 0, STRING_SIZE); snprintf(command, STRING_SIZE - 1, "/usr/sbin/ipsec up %s >/dev/null", name); @@ -155,8 +151,9 @@ void turn_connection_off (char *name) { char command[STRING_SIZE]; memset(command, 0, STRING_SIZE); snprintf(command, STRING_SIZE - 1, - "/usr/sbin/ipsec down %s >/dev/null", name); + "/usr/sbin/ipsec whack --delete --name %s >/dev/null", name); safe_system(command); + safe_system("/usr/sbin/ipsec whack --rereadall >/dev/null"); }
hooks/post-receive -- IPFire 2.x development tree