diff options
| -rw-r--r-- | debian/patches/01-supplicant_timeout.patch | 6 | ||||
| -rw-r--r-- | debian/patches/04-if_fix.patch | 11 | ||||
| -rw-r--r-- | debian/patches/06-dispatch_more_events.patch | 66 |
3 files changed, 12 insertions, 71 deletions
diff --git a/debian/patches/01-supplicant_timeout.patch b/debian/patches/01-supplicant_timeout.patch index 0723c83a..45060db4 100644 --- a/debian/patches/01-supplicant_timeout.patch +++ b/debian/patches/01-supplicant_timeout.patch @@ -1,6 +1,6 @@ ---- src/nm-device-802-11-wireless.c.orig 2006-02-13 11:46:50.000000000 +0100 -+++ src/nm-device-802-11-wireless.c 2006-02-13 11:47:08.000000000 +0100 -@@ -2205,7 +2205,7 @@ +--- src/nm-device-802-11-wireless.c 2006-06-20 20:15:45.000000000 +0200 ++++ src/nm-device-802-11-wireless.c.new 2006-08-13 22:32:13.000000000 +0200 +@@ -2329,7 +2329,7 @@ } diff --git a/debian/patches/04-if_fix.patch b/debian/patches/04-if_fix.patch index b5667c53..ca0b1574 100644 --- a/debian/patches/04-if_fix.patch +++ b/debian/patches/04-if_fix.patch @@ -1,11 +1,6 @@ -Index: src/nm-device-802-3-ethernet.c -=================================================================== -RCS file: /cvs/gnome/NetworkManager/src/nm-device-802-3-ethernet.c,v -retrieving revision 1.3 -diff -u -r1.3 nm-device-802-3-ethernet.c ---- src/nm-device-802-3-ethernet.c 3 Jan 2006 17:47:38 -0000 1.3 -+++ src/nm-device-802-3-ethernet.c 4 Jan 2006 17:13:33 -0000 -@@ -328,7 +328,9 @@ +--- src/nm-device-802-3-ethernet.c 2006-05-13 21:06:05.000000000 +0200 ++++ src/nm-device-802-3-ethernet.c.new 2006-08-13 22:34:56.000000000 +0200 +@@ -376,7 +376,9 @@ /**************************************/ /* MII capability detection */ /**************************************/ diff --git a/debian/patches/06-dispatch_more_events.patch b/debian/patches/06-dispatch_more_events.patch index e8b30810..8b85f49a 100644 --- a/debian/patches/06-dispatch_more_events.patch +++ b/debian/patches/06-dispatch_more_events.patch @@ -1,7 +1,6 @@ -diff -ruNp network-manager-0.6.2~/dispatcher-daemon/NetworkManagerDispatcher.c network-manager-0.6.2/dispatcher-daemon/NetworkManagerDispatcher.c ---- network-manager-0.6.2~/dispatcher-daemon/NetworkManagerDispatcher.c 2006-03-13 16:51:57.000000000 +0000 -+++ network-manager-0.6.2/dispatcher-daemon/NetworkManagerDispatcher.c 2006-04-03 18:14:06.000000000 +0100 -@@ -44,6 +44,8 @@ enum NMDAction +--- dispatcher-daemon/NetworkManagerDispatcher.c.old 2006-08-13 22:40:18.000000000 +0200 ++++ dispatcher-daemon/NetworkManagerDispatcher.c 2006-08-13 22:40:27.000000000 +0200 +@@ -44,6 +44,8 @@ NMD_DEVICE_DONT_KNOW, NMD_DEVICE_NOW_INACTIVE, NMD_DEVICE_NOW_ACTIVE, @@ -10,7 +9,7 @@ diff -ruNp network-manager-0.6.2~/dispatcher-daemon/NetworkManagerDispatcher.c n }; typedef enum NMDAction NMDAction; -@@ -95,6 +97,10 @@ static void nmd_execute_scripts (NMDActi +@@ -95,6 +97,10 @@ if (action == NMD_DEVICE_NOW_ACTIVE) char_act = "up"; else if (action == NMD_DEVICE_NOW_INACTIVE) @@ -21,7 +20,7 @@ diff -ruNp network-manager-0.6.2~/dispatcher-daemon/NetworkManagerDispatcher.c n char_act = "down"; else return; -@@ -217,9 +223,13 @@ static DBusHandlerResult nmd_dbus_filter +@@ -217,9 +223,13 @@ } if (dbus_message_is_signal (message, NM_DBUS_INTERFACE, "DeviceNoLongerActive")) @@ -36,7 +35,7 @@ diff -ruNp network-manager-0.6.2~/dispatcher-daemon/NetworkManagerDispatcher.c n if (action != NMD_DEVICE_DONT_KNOW) { -@@ -234,8 +244,10 @@ static DBusHandlerResult nmd_dbus_filter +@@ -234,8 +244,10 @@ if (dev_object_path && dev_iface_name) { nm_info ("Device %s (%s) is now %s.", dev_object_path, dev_iface_name, @@ -49,56 +48,3 @@ diff -ruNp network-manager-0.6.2~/dispatcher-daemon/NetworkManagerDispatcher.c n nmd_execute_scripts (action, dev_iface_name); } -diff -ruNp network-manager-0.6.2~/man/NetworkManagerDispatcher.1.in network-manager-0.6.2/man/NetworkManagerDispatcher.1.in ---- network-manager-0.6.2~/man/NetworkManagerDispatcher.1.in 2006-04-03 18:10:32.000000000 +0100 -+++ network-manager-0.6.2/man/NetworkManagerDispatcher.1.in 2006-04-03 18:14:06.000000000 +0100 -@@ -13,10 +13,14 @@ The \fINetworkManagerDispatcher\fP daemo - directory in response to interfaces coming up and down. The scripts are run - alphabetically. The first parameter is the network interface name. The second - parameter is -+.I pre\-up -+before bringing the interface up, - .I up --if the interface is now up and -+after bringing the interface up, - .I down --if the interface is now down. -+before taking the interface down and -+.I post\-down -+after taking the interface down. - .SH OPTIONS - The following options are supported: - .TP -diff -ruNp network-manager-0.6.2~/src/NetworkManagerDbus.c network-manager-0.6.2/src/NetworkManagerDbus.c ---- network-manager-0.6.2~/src/NetworkManagerDbus.c 2006-02-24 18:59:03.000000000 +0000 -+++ network-manager-0.6.2/src/NetworkManagerDbus.c 2006-04-03 18:14:06.000000000 +0100 -@@ -193,6 +193,7 @@ static DeviceStatusSignals dev_status_si - { DEVICE_NOW_ACTIVE, "DeviceNowActive" }, - { DEVICE_ACTIVATING, "DeviceActivating" }, - { DEVICE_ACTIVATION_FAILED, "DeviceActivationFailed" }, -+ { DEVICE_DEACTIVATED, "DeviceDeactivated" }, - { DEVICE_ADDED, "DeviceAdded" }, - { DEVICE_REMOVED, "DeviceRemoved" }, - { DEVICE_CARRIER_ON, "DeviceCarrierOn" }, -diff -ruNp network-manager-0.6.2~/src/NetworkManagerDbus.h network-manager-0.6.2/src/NetworkManagerDbus.h ---- network-manager-0.6.2~/src/NetworkManagerDbus.h 2005-12-31 08:21:22.000000000 +0000 -+++ network-manager-0.6.2/src/NetworkManagerDbus.h 2006-04-03 18:14:06.000000000 +0100 -@@ -40,6 +40,7 @@ typedef enum - DEVICE_ACTIVATING, - DEVICE_ACTIVATION_FAILED, - DEVICE_ACTIVATION_CANCELED, -+ DEVICE_DEACTIVATED, - DEVICE_ADDED, - DEVICE_REMOVED, - DEVICE_CARRIER_ON, -diff -ruNp network-manager-0.6.2~/src/nm-device.c network-manager-0.6.2/src/nm-device.c ---- network-manager-0.6.2~/src/nm-device.c 2006-03-21 17:56:34.000000000 +0000 -+++ network-manager-0.6.2/src/nm-device.c 2006-04-03 18:14:06.000000000 +0100 -@@ -1445,6 +1445,7 @@ nm_device_deactivate (NMDevice *self) - NM_DEVICE_GET_CLASS (self)->deactivate (self); - - nm_schedule_state_change_signal_broadcast (self->priv->app_data); -+ nm_dbus_schedule_device_status_change_signal (self->priv->app_data, self, NULL, DEVICE_DEACTIVATED); - } - - |