diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 11 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/patches/07-libnm_glib_reconnect_dbus.patch | 65 | ||||
| -rw-r--r-- | debian/patches/09-nm_bad_mutex_free.patch | 69 | ||||
| -rw-r--r-- | debian/patches/10-interface_parser_fixes.patch | 90 | ||||
| -rw-r--r-- | debian/patches/11-carrier_detection.patch | 17 | ||||
| -rw-r--r-- | debian/watch | 3 |
7 files changed, 15 insertions, 242 deletions
diff --git a/debian/changelog b/debian/changelog index b42cddfe..12717637 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +network-manager (0.6.3-1) unstable; urgency=low + + * New upstream release. + - Removed 07-libnm_glib_reconnect_dbus.patch, merged upstream. + - Removed 09-nm_bad_mutex_free.patch, fixed upstream. + - Removed 10-interface_parser_fixes.patch, merged upstream. + - Removed 11-carrier_detection.patch, merged upstream. + * Added a watch file. + + -- Michael Biebl <biebl@teco.edu> Thu, 8 Jun 2006 13:53:33 +0200 + network-manager (0.6.2-3) unstable; urgency=low * Ship the NEWS.Debian file only for the network-manager package. diff --git a/debian/control b/debian/control index 4c9457bf..b1fae970 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: net Priority: optional Maintainer: Riccardo Setti <giskard@autistici.org> Uploaders: Michael Biebl <biebl@teco.edu> -Build-Depends: debhelper (>= 5), cdbs, gnome-common, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libgconf2-dev, libhal-dev (>= 0.5.0), libnl-dev (>= 0.99+1.0.svn21), libnotify-dev (>= 0.3), docbook-to-man +Build-Depends: debhelper (>= 5.0.0), cdbs, gnome-common, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libgconf2-dev, libhal-dev (>= 0.5.0), libnl-dev (>= 0.99+1.0.svn21), libnotify-dev (>= 0.3), docbook-to-man Standards-Version: 3.7.2 Package: network-manager diff --git a/debian/patches/07-libnm_glib_reconnect_dbus.patch b/debian/patches/07-libnm_glib_reconnect_dbus.patch deleted file mode 100644 index 371813b2..00000000 --- a/debian/patches/07-libnm_glib_reconnect_dbus.patch +++ /dev/null @@ -1,65 +0,0 @@ -Index: gnome/libnm_glib/libnm_glib.c -=================================================================== -RCS file: /cvs/gnome/NetworkManager/gnome/libnm_glib/libnm_glib.c,v -retrieving revision 1.11 -diff -u -p -r1.11 libnm_glib.c ---- gnome/libnm_glib/libnm_glib.c 21 Feb 2006 06:25:50 -0000 1.11 -+++ gnome/libnm_glib/libnm_glib.c 5 May 2006 15:35:55 -0000 -@@ -39,6 +39,7 @@ struct libnm_glib_ctx - GMainLoop * g_main_loop; - DBusConnection * dbus_con; - guint dbus_watcher; -+ guint dbus_watch_interval; - gboolean thread_done; - gboolean thread_inited; - -@@ -347,14 +348,29 @@ libnm_glib_dbus_watcher (gpointer user_d - - g_return_val_if_fail (ctx != NULL, FALSE); - -+ ctx->dbus_watcher = 0; -+ - if (!ctx->dbus_con) - ctx->dbus_con = libnm_glib_dbus_init ((gpointer)ctx, ctx->g_main_ctx); - - if (ctx->dbus_con) -- return (FALSE); /* Don't reschedule ourselves if we have a connection to dbus */ -+ { -+ /* Get NM's state right away after we reconnect */ -+ libnm_glib_get_nm_state (ctx); -+ ctx->dbus_watch_interval = 1000; -+ } -+ else -+ { -+ /* Wait 3 seconds longer each time we fail to reconnect to dbus, -+ * with a maximum wait of one minute. -+ */ -+ ctx->dbus_watch_interval = MIN(ctx->dbus_watch_interval + 3000, 60000); - -- /* Reschule ourselves if we _still_ don't have a connection to dbus */ -- return (TRUE); -+ /* Reschule ourselves if we _still_ don't have a connection to dbus */ -+ libnm_glib_schedule_dbus_watcher (ctx); -+ } -+ -+ return FALSE; - } - - -@@ -372,7 +388,7 @@ libnm_glib_schedule_dbus_watcher (libnm_ - - if (ctx->dbus_watcher == 0) - { -- GSource *source = g_idle_source_new (); -+ GSource * source = g_timeout_source_new (ctx->dbus_watch_interval); - g_source_set_callback (source, libnm_glib_dbus_watcher, (gpointer) ctx, NULL); - ctx->dbus_watcher = g_source_attach (source, ctx->g_main_ctx); - g_source_unref (source); -@@ -453,6 +469,7 @@ libnm_glib_ctx_new (void) - goto error; - if (!(ctx->callbacks_lock = g_mutex_new ())) - goto error; -+ ctx->dbus_watch_interval = 1000; - - return ctx; - diff --git a/debian/patches/09-nm_bad_mutex_free.patch b/debian/patches/09-nm_bad_mutex_free.patch deleted file mode 100644 index 9da4cce0..00000000 --- a/debian/patches/09-nm_bad_mutex_free.patch +++ /dev/null @@ -1,69 +0,0 @@ ---- network-manager-0.6.2.orig/src/nm-device-802-11-wireless.c 2006-05-05 02:13:37.000000000 -0500 -+++ network-manager-0.6.2/src/nm-device-802-11-wireless.c 2006-05-05 02:20:23.000000000 -0500 -@@ -60,7 +60,7 @@ - - struct _NMDevice80211WirelessPrivate - { -- gboolean dispose_has_run; -+ gboolean is_initialized; - - struct ether_addr hw_addr; - -@@ -242,7 +242,7 @@ - nm_device_802_11_wireless_init (NMDevice80211Wireless * self) - { - self->priv = NM_DEVICE_802_11_WIRELESS_GET_PRIVATE (self); -- self->priv->dispose_has_run = FALSE; -+ self->priv->is_initialized = FALSE; - - memset (&(self->priv->hw_addr), 0, sizeof (struct ether_addr)); - self->priv->supplicant.pid = -1; -@@ -256,6 +256,7 @@ - guint32 caps; - NMSock * sk; - -+ self->priv->is_initialized = TRUE; - self->priv->scan_mutex = g_mutex_new (); - nm_register_mutex_desc (self->priv->scan_mutex, "Scan Mutex"); - -@@ -2988,24 +2989,22 @@ - NMDevice80211WirelessClass * klass = NM_DEVICE_802_11_WIRELESS_GET_CLASS (object); - NMDeviceClass * parent_class; - -- if (self->priv->dispose_has_run) -- /* If dispose did already run, return. */ -- return; -- -- /* Make sure dispose does not run twice. */ -- self->priv->dispose_has_run = TRUE; -- -- /* -- * In dispose, you are supposed to free all types referenced from this -- * object which might themselves hold a reference to self. Generally, -- * the most simple solution is to unref all members on which you own a -- * reference. -- */ -- -- nm_device_802_11_wireless_ap_list_clear (self); -- if (self->priv->ap_list) -- nm_ap_list_unref (self->priv->ap_list); -- g_mutex_free (self->priv->scan_mutex); -+ /* Only do this part of the cleanup if the object is initialized */ -+ if (self->priv->is_initialized) { -+ self->priv->is_initialized = FALSE; -+ -+ /* -+ * In dispose, you are supposed to free all types referenced from this -+ * object which might themselves hold a reference to self. Generally, -+ * the most simple solution is to unref all members on which you own a -+ * reference. -+ */ -+ -+ nm_device_802_11_wireless_ap_list_clear (self); -+ if (self->priv->ap_list) -+ nm_ap_list_unref (self->priv->ap_list); -+ g_mutex_free (self->priv->scan_mutex); -+ } - - /* Chain up to the parent class */ - parent_class = NM_DEVICE_CLASS (g_type_class_peek_parent (klass)); diff --git a/debian/patches/10-interface_parser_fixes.patch b/debian/patches/10-interface_parser_fixes.patch deleted file mode 100644 index e751e359..00000000 --- a/debian/patches/10-interface_parser_fixes.patch +++ /dev/null @@ -1,90 +0,0 @@ -Index: src/backends/interface_parser.c -=================================================================== -RCS file: /cvs/gnome/NetworkManager/src/backends/interface_parser.c,v -retrieving revision 1.6 -diff -u -3 -p -r1.6 interface_parser.c ---- src/backends/interface_parser.c 24 Oct 2005 15:04:28 -0000 1.6 -+++ src/backends/interface_parser.c 9 May 2006 23:06:35 -0000 -@@ -50,6 +50,10 @@ void add_block(const char *type, const c - - void add_data(const char *key,const char *data) - { -+ // Check if there is a block where we can attach our data -+ if (first == NULL) -+ return; -+ - if_data *ret = (if_data*)calloc(1,sizeof(struct _if_data)); - ret->key = g_strdup(key); - ret->data = g_strdup(data); -@@ -73,6 +77,10 @@ void ifparser_init(void) - { - FILE *inp = fopen(INTERFACES,"r"); - int ret = 0; -+ char *line; -+ char *space; -+ char rline[255]; -+ - if (inp == NULL) - { - nm_warning ("Error: Can't open %s\n",INTERFACES); -@@ -81,10 +89,16 @@ void ifparser_init(void) - first = last = NULL; - while(1) - { -- char *line,rline[255],*space; -+ line = space = NULL; - ret = fscanf(inp,"%255[^\n]\n",rline); - if (ret == EOF) - break; -+ // If the line did not match, skip it -+ if (ret == 0) { -+ fgets(rline, 255, inp); -+ continue; -+ } -+ - line = rline; - while(line[0] == ' ') - line++; -@@ -94,18 +108,19 @@ void ifparser_init(void) - SPACE_OR_TAB(line,space) - if (space == NULL) - { -- nm_warning ("Error: Can't parse interface line '%s'\n",line); -+ nm_warning ("Error: Can't parse interface line '%s'\n",line); - continue; - } - space[0] = '\0'; - -- -+ // There are four different stanzas: -+ // iface, mapping, auto and allow-*. Create a block for each of them. - if (strcmp(line,"iface")==0) - { - char *space2 = strchr(space+1,' '); - if (space2 == NULL) - { -- nm_warning ("Error: Can't parse iface line '%s'\n",space+1); -+ nm_warning ("Error: Can't parse iface line '%s'\n",space+1); - continue; - } - space2[0]='\0'; -@@ -116,7 +131,7 @@ void ifparser_init(void) - space = strchr(space2+1,' '); - if (space == NULL) - { -- nm_warning ("Error: Can't parse data '%s'\n",space2+1); -+ nm_warning ("Error: Can't parse data '%s'\n",space2+1); - continue; - } - space[0] = '\0'; -@@ -124,6 +139,10 @@ void ifparser_init(void) - } - } - else if (strcmp(line,"auto")==0) -+ add_block(line,space+1); -+ else if (strcmp(line,"mapping")==0) -+ add_block(line,space+1); -+ else if (strncmp(line,"allow-",6)==0) - add_block(line,space+1); - else - add_data(line,space+1); diff --git a/debian/patches/11-carrier_detection.patch b/debian/patches/11-carrier_detection.patch deleted file mode 100644 index ff7d1ecf..00000000 --- a/debian/patches/11-carrier_detection.patch +++ /dev/null @@ -1,17 +0,0 @@ -=================================================================== -RCS file: /cvs/gnome/NetworkManager/src/nm-device-802-3-ethernet.c,v -retrieving revision 1.13.2.1 -retrieving revision 1.13.2.2 -diff -u -r1.13.2.1 -r1.13.2.2 ---- src/nm-device-802-3-ethernet.c 2006/03/09 21:39:15 1.13.2.1 -+++ src/nm-device-802-3-ethernet.c 2006/05/13 19:06:05 1.13.2.2 -@@ -207,8 +207,7 @@ - if (supports_ethtool_carrier_detect (self) || supports_mii_carrier_detect (self)) - caps |= NM_DEVICE_CAP_CARRIER_DETECT; - -- if (caps) -- caps |= NM_DEVICE_CAP_NM_SUPPORTED; -+ caps |= NM_DEVICE_CAP_NM_SUPPORTED; - - return caps; - } diff --git a/debian/watch b/debian/watch new file mode 100644 index 00000000..c7e07a46 --- /dev/null +++ b/debian/watch @@ -0,0 +1,3 @@ +version=3 + +ftp://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.6/NetworkManager-(.*)\.tar\.gz |