[Pkg-utopia-commits] r2066 - in /packages/experimental/networkmanager/debian: ./ patches/
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Fri Jan 25 14:36:52 UTC 2008
Author: biebl
Date: Fri Jan 25 14:36:51 2008
New Revision: 2066
URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=2066
Log:
* SVN snapshot of the upcoming 0.7 release.
* Drop patches which are either obsolete, merged upstream or not yet ported
- 01-supplicant_timeout.patch
- 04-if_fix.patch
- 11-man_page_sh_name.patch
- 12_readme_format.patch
- 13-validate_mac_addr.patch
- 20-stable_branch_updates_r2652.patch
- 21-endianess_fix_r2754.patch
- 22-fix_vpn_ftbfs_dont_disable_gnome_deprecated.patch
- 23-rfkill_return_type.patch
- 24-get_mode_fix_r3122.patch
- 25-libnl_unique_pid_r3155.patch
- 26-libnl_1.0-pre8_r3206.patch
- 27-dont_repeat_errors.patch
* debian/patches/05-debian_backend.patch
- Updated for 0.7.
* debian/patches/02-dbus_access_network_manager.patch
- Updated for 0.7.
Removed:
packages/experimental/networkmanager/debian/patches/01-supplicant_timeout.patch
packages/experimental/networkmanager/debian/patches/04-if_fix.patch
packages/experimental/networkmanager/debian/patches/06-dispatch_more_events.patch
packages/experimental/networkmanager/debian/patches/11-man_page_sh_name.patch
packages/experimental/networkmanager/debian/patches/12_readme_format.patch
packages/experimental/networkmanager/debian/patches/13-validate_mac_addr.patch
packages/experimental/networkmanager/debian/patches/20-stable_branch_updates_r2652.patch
packages/experimental/networkmanager/debian/patches/21-endianess_fix_r2754.patch
packages/experimental/networkmanager/debian/patches/22-fix_vpn_ftbfs_dont_disable_gnome_deprecated.patch
packages/experimental/networkmanager/debian/patches/23-rfkill_return_type.patch
packages/experimental/networkmanager/debian/patches/24-get_mode_fix_r3122.patch
packages/experimental/networkmanager/debian/patches/25-libnl_unique_pid_r3155.patch
packages/experimental/networkmanager/debian/patches/26-libnl_1.0-pre8_r3206.patch
packages/experimental/networkmanager/debian/patches/27-dont_repeat_errors.patch
Modified:
packages/experimental/networkmanager/debian/changelog
packages/experimental/networkmanager/debian/patches/02-dbus_access_network_manager.patch
packages/experimental/networkmanager/debian/patches/05-debian_backend.patch
Modified: packages/experimental/networkmanager/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/networkmanager/debian/changelog?rev=2066&op=diff
==============================================================================
--- packages/experimental/networkmanager/debian/changelog (original)
+++ packages/experimental/networkmanager/debian/changelog Fri Jan 25 14:36:51 2008
@@ -1,3 +1,27 @@
+network-manager (0.7.0~svn3269-1) experimental; urgency=low
+
+ * SVN snapshot of the upcoming 0.7 release.
+ * Drop patches which are either obsolete, merged upstream or not yet ported
+ - 01-supplicant_timeout.patch
+ - 04-if_fix.patch
+ - 11-man_page_sh_name.patch
+ - 12_readme_format.patch
+ - 13-validate_mac_addr.patch
+ - 20-stable_branch_updates_r2652.patch
+ - 21-endianess_fix_r2754.patch
+ - 22-fix_vpn_ftbfs_dont_disable_gnome_deprecated.patch
+ - 23-rfkill_return_type.patch
+ - 24-get_mode_fix_r3122.patch
+ - 25-libnl_unique_pid_r3155.patch
+ - 26-libnl_1.0-pre8_r3206.patch
+ - 27-dont_repeat_errors.patch
+ * debian/patches/05-debian_backend.patch
+ - Updated for 0.7.
+ * debian/patches/02-dbus_access_network_manager.patch
+ - Updated for 0.7.
+
+ -- Michael Biebl <biebl at debian.org> Fri, 25 Jan 2008 15:35:15 +0100
+
network-manager (0.6.5-5) unstable; urgency=low
* Rebuild against libnl1. (Closes: #461922)
Modified: packages/experimental/networkmanager/debian/patches/02-dbus_access_network_manager.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/networkmanager/debian/patches/02-dbus_access_network_manager.patch?rev=2066&op=diff
==============================================================================
--- packages/experimental/networkmanager/debian/patches/02-dbus_access_network_manager.patch (original)
+++ packages/experimental/networkmanager/debian/patches/02-dbus_access_network_manager.patch Fri Jan 25 14:36:51 2008
@@ -1,10 +1,10 @@
Index: src/NetworkManager.conf
===================================================================
---- src/NetworkManager.conf (Revision 2735)
+--- src/NetworkManager.conf (Revision 3269)
+++ src/NetworkManager.conf (Arbeitskopie)
-@@ -8,6 +8,14 @@
- <allow send_destination="org.freedesktop.NetworkManager"/>
- <allow send_interface="org.freedesktop.NetworkManager"/>
+@@ -11,6 +11,14 @@
+ <allow send_destination="org.freedesktop.NetworkManager.PPP"/>
+ <allow send_interface="org.freedesktop.NetworkManager.PPP"/>
</policy>
+ <policy user="haldaemon">
+ <allow send_destination="org.freedesktop.NetworkManager"/>
Modified: packages/experimental/networkmanager/debian/patches/05-debian_backend.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/networkmanager/debian/patches/05-debian_backend.patch?rev=2066&op=diff
==============================================================================
--- packages/experimental/networkmanager/debian/patches/05-debian_backend.patch (original)
+++ packages/experimental/networkmanager/debian/patches/05-debian_backend.patch Fri Jan 25 14:36:51 2008
@@ -1,217 +1,8 @@
-diff --git a/src/backends/NetworkManagerDebian.c b/src/backends/NetworkManagerDebian.c
-index 740572a..4e3e44a 100644
---- a/src/backends/NetworkManagerDebian.c
-+++ b/src/backends/NetworkManagerDebian.c
-@@ -37,6 +37,7 @@
- #include "nm-utils.h"
-
- #define ARPING "/usr/sbin/arping"
-+#define RESOLVCONF "resolvconf"
-
- /*
- * nm_system_init
-@@ -238,14 +239,16 @@ void nm_system_kill_all_dhcp_daemons (void)
- /*
- * nm_system_update_dns
- *
-- * Make glibc/nscd aware of any changes to the resolv.conf file by
-- * restarting nscd.
-+ * Invalidate the nscd host cache, if it exists, since
-+ * we changed resolv.conf.
- *
- */
- void nm_system_update_dns (void)
- {
-- nm_spawn_process ("/usr/sbin/invoke-rc.d nscd restart");
--
-+ if (g_file_test ("/usr/sbin/nscd", G_FILE_TEST_IS_EXECUTABLE)) {
-+ nm_info ("Clearing nscd hosts cache.");
-+ nm_spawn_process ("/usr/sbin/nscd -i hosts");
-+ }
- }
-
-
-@@ -257,8 +260,7 @@ void nm_system_update_dns (void)
- *
- */
- void nm_system_restart_mdns_responder (void)
--{
-- nm_spawn_process ("/usr/bin/killall -q -USR1 mDNSResponder");
-+{
- }
-
-
-@@ -514,13 +516,60 @@ gboolean nm_system_device_get_use_dhcp (NMDevice *dev)
- /*
- * nm_system_device_get_disabled
- *
-- * Return whether the distro-specific system config tells us to use
-- * dhcp for this device.
-+ * Return whether the distro-specific system config tells us to disable
-+ * this device.
- *
- */
- gboolean nm_system_device_get_disabled (NMDevice *dev)
- {
-- return FALSE;
-+ const char *iface;
-+ if_block *curr_device, *curr_b;
-+ if_data *curr_d;
-+ gboolean blacklist = TRUE;
-+
-+ g_return_val_if_fail (dev != NULL, TRUE);
-+
-+ iface = nm_device_get_iface (dev);
-+
-+ ifparser_init ();
-+
-+ /* If the device is listed in a mapping, do not control it */
-+ if (ifparser_getmapping (iface) != NULL) {
-+ blacklist = TRUE;
-+ goto out;
-+ }
-+
-+ /* If the interface isn't listed in /etc/network/interfaces then
-+ * it's considered okay to control it.
-+ */
-+ curr_device = ifparser_getif (iface);
-+ if (curr_device == NULL) {
-+ blacklist = FALSE;
-+ goto out;
-+ }
-+
-+ /* If the interface is listed and isn't marked "auto" then it's
-+ * definitely not okay to control it.
-+ */
-+ for (curr_b = ifparser_getfirst (); curr_b; curr_b = curr_b->next) {
-+ if ((!strcmp (curr_b->type, "auto") || !strcmp (curr_b->type, "allow-hotplug"))
-+ && strstr (curr_b->name, iface))
-+ blacklist = FALSE;
-+ }
-+
-+ /* If the interface has no options other than just "inet dhcp"
-+ * it's probably ok to fiddle with it.
-+ */
-+ for (curr_d = curr_device->info; curr_d; curr_d = curr_d->next) {
-+ if (strcmp (curr_d->key, "inet")
-+ || strcmp (curr_d->data, "dhcp" ))
-+ blacklist = TRUE;
-+ }
-+
-+out:
-+ ifparser_destroy ();
-+
-+ return blacklist;
- }
-
-
-@@ -563,12 +612,18 @@ gboolean nm_system_deactivate_dialup (GSList *list, const char *dialup)
- if (strcmp (dialup, config->name) == 0)
- {
- char *cmd;
-+ int status;
-
- nm_info ("Deactivating dialup device %s (%s) ...", dialup, (char *) config->data);
- cmd = g_strdup_printf ("/sbin/ifdown %s", (char *) config->data);
-- nm_spawn_process (cmd);
-+ status = nm_spawn_process (cmd);
- g_free (cmd);
-- ret = TRUE;
-+ if (status == 0) {
-+ ret = TRUE;
-+ } else {
-+ nm_warning ("Couldn't deactivate dialup device %s (%s) - %d", dialup, (char *) config->data, status);
-+ ret = FALSE;
-+ }
- break;
- }
- }
-@@ -587,12 +642,18 @@ gboolean nm_system_activate_dialup (GSList *list, const char *dialup)
- if (strcmp (dialup, config->name) == 0)
- {
- char *cmd;
-+ int status;
-
- nm_info ("Activating dialup device %s (%s) ...", dialup, (char *) config->data);
- cmd = g_strdup_printf ("/sbin/ifup %s", (char *) config->data);
-- nm_spawn_process (cmd);
-+ status = nm_spawn_process (cmd);
- g_free (cmd);
-- ret = TRUE;
-+ if (status == 0) {
-+ ret = TRUE;
-+ } else {
-+ nm_warning ("Couldn't activate dialup device %s (%s) - %d", dialup, (char *) config->data, status);
-+ ret = FALSE;
-+ }
- break;
- }
- }
-@@ -603,23 +664,26 @@ gboolean nm_system_activate_dialup (GSList *list, const char *dialup)
- GSList * nm_system_get_dialup_config (void)
- {
- const char *buf;
-- unsigned int i = 0;
-+ const char *provider;
- GSList *list = NULL;
- if_block *curr;
- ifparser_init();
-
- /* FIXME: get all ppp(and others?) lines from /e/n/i here */
- curr = ifparser_getfirst();
-- while(curr!=NULL)
-+ while (curr != NULL)
- {
- NMDialUpConfig *config;
-- if (strcmp(curr->type,"iface")==0)
-+ if (strcmp(curr->type, "iface") == 0)
- {
-- buf = ifparser_getkey(curr,"inet");
-- if (buf && strcmp (buf, "ppp")==0)
-+ buf = ifparser_getkey(curr, "inet");
-+ if (buf && strcmp (buf, "ppp") == 0)
- {
-+ provider = ifparser_getkey(curr, "provider");
-+ if (!provider)
-+ provider = "default provider";
- config = g_malloc (sizeof (NMDialUpConfig));
-- config->name = g_strdup_printf ("Modem (#%d)", i++);
-+ config->name = g_strdup_printf ("%s via Modem", provider);
- config->data = g_strdup (curr->name); /* interface name */
-
- list = g_slist_append (list, config);
-@@ -631,14 +695,6 @@ GSList * nm_system_get_dialup_config (void)
- }
- ifparser_destroy();
-
-- /* Hack: Go back and remove the "(#0)" if there is only one device */
-- if (i == 1)
-- {
-- NMDialUpConfig *config = (NMDialUpConfig *) list->data;
-- g_free (config->name);
-- config->name = g_strdup ("Modem");
-- }
--
- return list;
- }
-
-@@ -679,7 +735,10 @@ void nm_system_set_hostname (NMIP4Config *config)
- */
- gboolean nm_system_should_modify_resolv_conf (void)
- {
-- return TRUE;
-+ if (g_find_program_in_path(RESOLVCONF) != NULL)
-+ return FALSE;
-+ else
-+ return TRUE;
- }
-
-
-diff --git a/src/backends/interface_parser.c b/src/backends/interface_parser.c
-index 53d6487..b3ad300 100644
---- a/src/backends/interface_parser.c
-+++ b/src/backends/interface_parser.c
-@@ -71,14 +73,18 @@ void add_data(const char *key,const char *data)
+Index: src/backends/interface_parser.c
+===================================================================
+--- src/backends/interface_parser.c (Revision 2569)
++++ src/backends/interface_parser.c (Arbeitskopie)
+@@ -73,14 +73,18 @@
//printf("added data '%s' with key '%s'\n",data,key);
}
@@ -232,7 +23,7 @@
char rline[255];
if (inp == NULL)
-@@ -89,7 +95,7 @@ void ifparser_init(void)
+@@ -91,7 +95,7 @@
first = last = NULL;
while(1)
{
@@ -241,7 +32,7 @@
ret = fscanf(inp,"%255[^\n]\n",rline);
if (ret == EOF)
break;
-@@ -102,50 +108,71 @@ void ifparser_init(void)
+@@ -104,50 +108,71 @@
line = rline;
while(line[0] == ' ')
line++;
@@ -338,7 +129,7 @@
//printf("line: '%s' ret=%d\n",rline,ret);
}
-@@ -198,6 +225,18 @@ if_block *ifparser_getif(const char* iface)
+@@ -200,6 +225,18 @@
return NULL;
}
@@ -357,11 +148,11 @@
const char *ifparser_getkey(if_block* iface, const char *key)
{
if_data *curr = iface->info;
-diff --git a/src/backends/interface_parser.h b/src/backends/interface_parser.h
-index 075f454..8914283 100644
---- a/src/backends/interface_parser.h
-+++ b/src/backends/interface_parser.h
-@@ -44,6 +44,7 @@ void ifparser_init(void);
+Index: src/backends/interface_parser.h
+===================================================================
+--- src/backends/interface_parser.h (Revision 2569)
++++ src/backends/interface_parser.h (Arbeitskopie)
+@@ -44,6 +44,7 @@
void ifparser_destroy(void);
if_block *ifparser_getif(const char* iface);
@@ -369,3 +160,212 @@
if_block *ifparser_getfirst(void);
const char *ifparser_getkey(if_block* iface, const char *key);
+Index: src/backends/NetworkManagerDebian.c
+===================================================================
+--- src/backends/NetworkManagerDebian.c (Revision 2569)
++++ src/backends/NetworkManagerDebian.c (Arbeitskopie)
+@@ -42,6 +42,7 @@
+ #include "nm-utils.h"
+
+ #define ARPING "/usr/sbin/arping"
++#define RESOLVCONF "resolvconf"
+
+ /*
+ * nm_system_init
+@@ -198,14 +199,16 @@
+ /*
+ * nm_system_update_dns
+ *
+- * Make glibc/nscd aware of any changes to the resolv.conf file by
+- * restarting nscd.
++ * Invalidate the nscd host cache, if it exists, since
++ * we changed resolv.conf.
+ *
+ */
+ void nm_system_update_dns (void)
+ {
+- nm_spawn_process ("/usr/sbin/invoke-rc.d nscd restart");
+-
++ if (g_file_test ("/usr/sbin/nscd", G_FILE_TEST_IS_EXECUTABLE)) {
++ nm_info ("Clearing nscd hosts cache.");
++ nm_spawn_process ("/usr/sbin/nscd -i hosts");
++ }
+ }
+
+
+@@ -217,8 +220,7 @@
+ *
+ */
+ void nm_system_restart_mdns_responder (void)
+-{
+- nm_spawn_process ("/usr/bin/killall -q -USR1 mDNSResponder");
++{
+ }
+
+
+@@ -377,13 +379,60 @@
+ /*
+ * nm_system_device_get_disabled
+ *
+- * Return whether the distro-specific system config tells us to use
+- * dhcp for this device.
++ * Return whether the distro-specific system config tells us to disable
++ * this device.
+ *
+ */
+ gboolean nm_system_device_get_disabled (NMDevice *dev)
+ {
+- return FALSE;
++ const char *iface;
++ if_block *curr_device, *curr_b;
++ if_data *curr_d;
++ gboolean blacklist = TRUE;
++
++ g_return_val_if_fail (dev != NULL, TRUE);
++
++ iface = nm_device_get_iface (dev);
++
++ ifparser_init ();
++
++ /* If the device is listed in a mapping, do not control it */
++ if (ifparser_getmapping (iface) != NULL) {
++ blacklist = TRUE;
++ goto out;
++ }
++
++ /* If the interface isn't listed in /etc/network/interfaces then
++ * it's considered okay to control it.
++ */
++ curr_device = ifparser_getif (iface);
++ if (curr_device == NULL) {
++ blacklist = FALSE;
++ goto out;
++ }
++
++ /* If the interface is listed and isn't marked "auto" then it's
++ * definitely not okay to control it.
++ */
++ for (curr_b = ifparser_getfirst (); curr_b; curr_b = curr_b->next) {
++ if ((!strcmp (curr_b->type, "auto") || !strcmp (curr_b->type, "allow-hotplug"))
++ && strstr (curr_b->name, iface))
++ blacklist = FALSE;
++ }
++
++ /* If the interface has no options other than just "inet dhcp"
++ * it's probably ok to fiddle with it.
++ */
++ for (curr_d = curr_device->info; curr_d; curr_d = curr_d->next) {
++ if (strcmp (curr_d->key, "inet")
++ || strcmp (curr_d->data, "dhcp" ))
++ blacklist = TRUE;
++ }
++
++out:
++ ifparser_destroy ();
++
++ return blacklist;
+ }
+
+
+@@ -426,12 +475,18 @@
+ if (strcmp (dialup, config->name) == 0)
+ {
+ char *cmd;
++ int status;
+
+ nm_info ("Deactivating dialup device %s (%s) ...", dialup, (char *) config->data);
+ cmd = g_strdup_printf ("/sbin/ifdown %s", (char *) config->data);
+- nm_spawn_process (cmd);
++ status = nm_spawn_process (cmd);
+ g_free (cmd);
+- ret = TRUE;
++ if (status == 0) {
++ ret = TRUE;
++ } else {
++ nm_warning ("Couldn't deactivate dialup device %s (%s) - %d", dialup, (char *) config->data, status);
++ ret = FALSE;
++ }
+ break;
+ }
+ }
+@@ -450,12 +505,18 @@
+ if (strcmp (dialup, config->name) == 0)
+ {
+ char *cmd;
++ int status;
+
+ nm_info ("Activating dialup device %s (%s) ...", dialup, (char *) config->data);
+ cmd = g_strdup_printf ("/sbin/ifup %s", (char *) config->data);
+- nm_spawn_process (cmd);
++ status = nm_spawn_process (cmd);
+ g_free (cmd);
+- ret = TRUE;
++ if (status == 0) {
++ ret = TRUE;
++ } else {
++ nm_warning ("Couldn't activate dialup device %s (%s) - %d", dialup, (char *) config->data, status);
++ ret = FALSE;
++ }
+ break;
+ }
+ }
+@@ -466,23 +527,26 @@
+ GSList * nm_system_get_dialup_config (void)
+ {
+ const char *buf;
+- unsigned int i = 0;
++ const char *provider;
+ GSList *list = NULL;
+ if_block *curr;
+ ifparser_init();
+
+ /* FIXME: get all ppp(and others?) lines from /e/n/i here */
+ curr = ifparser_getfirst();
+- while(curr!=NULL)
++ while (curr != NULL)
+ {
+ NMDialUpConfig *config;
+- if (strcmp(curr->type,"iface")==0)
++ if (strcmp(curr->type, "iface") == 0)
+ {
+- buf = ifparser_getkey(curr,"inet");
+- if (buf && strcmp (buf, "ppp")==0)
++ buf = ifparser_getkey(curr, "inet");
++ if (buf && strcmp (buf, "ppp") == 0)
+ {
++ provider = ifparser_getkey(curr, "provider");
++ if (!provider)
++ provider = "default provider";
+ config = g_malloc (sizeof (NMDialUpConfig));
+- config->name = g_strdup_printf ("Modem (#%d)", i++);
++ config->name = g_strdup_printf ("%s via Modem", provider);
+ config->data = g_strdup (curr->name); /* interface name */
+
+ list = g_slist_append (list, config);
+@@ -494,14 +558,6 @@
+ }
+ ifparser_destroy();
+
+- /* Hack: Go back and remove the "(#0)" if there is only one device */
+- if (i == 1)
+- {
+- NMDialUpConfig *config = (NMDialUpConfig *) list->data;
+- g_free (config->name);
+- config->name = g_strdup ("Modem");
+- }
+-
+ return list;
+ }
+
+@@ -542,7 +598,10 @@
+ */
+ gboolean nm_system_should_modify_resolv_conf (void)
+ {
+- return TRUE;
++ if (g_find_program_in_path(RESOLVCONF) != NULL)
++ return FALSE;
++ else
++ return TRUE;
+ }
+
+
More information about the Pkg-utopia-commits
mailing list