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 ea61e29cdbb4b50d43403c8ebb4af4c3d61ea391 (commit) via 331699d57658e651126bcbde4eb2e0753bbce1b1 (commit) via 525793ac7df9d9e6aafc3210494fe10ea56f7d23 (commit) from 71a8f9af7197c3e7cbbcc9d754a49fa752798ae1 (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 ea61e29cdbb4b50d43403c8ebb4af4c3d61ea391 Merge: 331699d57658e651126bcbde4eb2e0753bbce1b1 71a8f9af7197c3e7cbbcc9d754a49fa752798ae1 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Apr 22 07:42:57 2010 +0200

Merge branch 'master' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x

commit 331699d57658e651126bcbde4eb2e0753bbce1b1 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Apr 22 07:41:28 2010 +0200

Change ipsecctrl Tunnel up and down.

commit 525793ac7df9d9e6aafc3210494fe10ea56f7d23 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Apr 22 07:40:20 2010 +0200

Add Vodafone K3765 and K4505 usbids to option driver.

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

Summary of changes: doc/packages-list.txt | 1 - lfs/linux | 3 ++ src/misc-progs/ipsecctrl.c | 22 ++++++------------- ...inux-2.6.32.11-option_add_vodafone_usbids.patch | 23 ++++++++++++++++++++ 4 files changed, 33 insertions(+), 16 deletions(-) create mode 100644 src/patches/linux-2.6.32.11-option_add_vodafone_usbids.patch

Difference in files: diff --git a/doc/packages-list.txt b/doc/packages-list.txt index d5ed0ef..ea1498d 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -62,7 +62,6 @@ * cacti-0.8.7e * calamaris-2.59 * capi4k-utils-2005-07-18 -* ccache-2.4 * ccache-3.0pre0 * cdrtools-2.01.01 * centerim-4.22.1 diff --git a/lfs/linux b/lfs/linux index 47f0458..646b093 100644 --- a/lfs/linux +++ b/lfs/linux @@ -152,6 +152,9 @@ endif # Add some more LED triggers cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.11-netdev-1.patch

+ # Huawei (Vodafone) K3765 & K4505 Usbids + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.11-option_add_vodafone_usbids.patch + # Cleanup kernel source

cp $(DIR_SRC)/config/kernel/kernel.config.$(MACHINE)-$(VERSUFIX) $(DIR_APP)/.config diff --git a/src/misc-progs/ipsecctrl.c b/src/misc-progs/ipsecctrl.c index d443edc..7205afb 100644 --- a/src/misc-progs/ipsecctrl.c +++ b/src/misc-progs/ipsecctrl.c @@ -138,33 +138,25 @@ int decode_line (char *s, void turn_connection_on (char *name, char *type) { char command[STRING_SIZE];

- safe_system("/usr/sbin/ipsec whack --rereadsecrets >/dev/null"); + safe_system("/usr/sbin/ipsec whack --rereadall >/dev/null"); memset(command, 0, STRING_SIZE); snprintf(command, STRING_SIZE - 1, - "/usr/sbin/ipsec auto --replace %s >/dev/null", name); + "/usr/sbin/ipsec down %s >/dev/null", name); + safe_system(command); + memset(command, 0, STRING_SIZE); + snprintf(command, STRING_SIZE - 1, + "/usr/sbin/ipsec up %s >/dev/null", name); safe_system(command); - if (strcmp(type, "net") == 0) { - memset(command, 0, STRING_SIZE); - snprintf(command, STRING_SIZE - 1, - "/usr/sbin/ipsec whack --asynchronous --name %s --initiate >/dev/null", name); - safe_system(command); - } } /* issue ipsec commmands to turn off connection 'name' */ void turn_connection_off (char *name) { char command[STRING_SIZE]; - - memset(command, 0, STRING_SIZE); - snprintf(command, STRING_SIZE - 1, - "/usr/sbin/ipsec whack --name %s --terminate >/dev/null", name); - safe_system(command); memset(command, 0, STRING_SIZE); snprintf(command, STRING_SIZE - 1, - "/usr/sbin/ipsec whack --delete --name %s >/dev/null", name); + "/usr/sbin/ipsec down %s >/dev/null", name); safe_system(command); - safe_system("/usr/sbin/ipsec whack --rereadsecrets >/dev/null"); }

diff --git a/src/patches/linux-2.6.32.11-option_add_vodafone_usbids.patch b/src/patches/linux-2.6.32.11-option_add_vodafone_usbids.patch new file mode 100644 index 0000000..b102380 --- /dev/null +++ b/src/patches/linux-2.6.32.11-option_add_vodafone_usbids.patch @@ -0,0 +1,23 @@ +diff -Naur linux-2.6.32.11.org/drivers/usb/serial/option.c linux-2.6.32.11/drivers/usb/serial/option.c +--- linux-2.6.32.11.org/drivers/usb/serial/option.c 2010-04-02 00:59:14.000000000 +0200 ++++ linux-2.6.32.11/drivers/usb/serial/option.c 2010-04-21 21:56:56.000000000 +0200 +@@ -165,6 +165,10 @@ + #define HUAWEI_PRODUCT_E143D 0x143D + #define HUAWEI_PRODUCT_E143E 0x143E + #define HUAWEI_PRODUCT_E143F 0x143F ++/* Vodafone K4505-H */ ++#define HUAWEI_PRODUCT_E1464 0x1464 ++/* Vodafone K3765-H */ ++#define HUAWEI_PRODUCT_E1465 0x1465 + #define HUAWEI_PRODUCT_E14AC 0x14AC + + #define QUANTA_VENDOR_ID 0x0408 +@@ -443,6 +447,8 @@ + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143D, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143E, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143F, 0xff, 0xff, 0xff) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1464, 0xff, 0xff, 0xff) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1465, 0xff, 0xff, 0xff) }, + { USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E14AC) }, + { USB_DEVICE(AMOI_VENDOR_ID, AMOI_PRODUCT_9508) }, + { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V640) }, /* Novatel Merlin V640/XV620 */

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