diff options
| author | Michael Biebl <biebl@debian.org> | 2012-03-24 01:40:40 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2012-03-24 01:40:40 +0100 |
| commit | 3fa219fcde98e3c512f1e85fae6749df8ef5048a (patch) | |
| tree | 670de64a420e19cc916d3693f57baf6056bda62e | |
| parent | 2ed3839bb3d0a310ae4d701fb7b0c50504394f2e (diff) | |
debian/patches/04-ifupdown-support-dns-search-entries.patch: Removed, merged upstream.
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/patches/04-ifupdown-support-dns-search-entries.patch | 60 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 3 insertions, 62 deletions
diff --git a/debian/changelog b/debian/changelog index a10ab86c..eedaa678 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ network-manager (0.9.4.0-1) UNRELEASED; urgency=low * New upstream release. + * debian/patches/04-ifupdown-support-dns-search-entries.patch: Removed, + merged upstream. - -- Michael Biebl <biebl@debian.org> Sat, 24 Mar 2012 01:37:08 +0100 + -- Michael Biebl <biebl@debian.org> Sat, 24 Mar 2012 01:39:48 +0100 network-manager (0.9.2.0-2) unstable; urgency=low diff --git a/debian/patches/04-ifupdown-support-dns-search-entries.patch b/debian/patches/04-ifupdown-support-dns-search-entries.patch deleted file mode 100644 index 09e2f277..00000000 --- a/debian/patches/04-ifupdown-support-dns-search-entries.patch +++ /dev/null @@ -1,60 +0,0 @@ -From e4fbf5363edcc77be59a13194c8998a864883728 Mon Sep 17 00:00:00 2001 -From: Guido Günther <agx@sigxcpu.org> -Date: Wed, 07 Dec 2011 15:41:52 +0000 -Subject: ifupdown: support dns-search entries - -as used by resolvconf and openresolv. ---- -Index: network-manager/src/settings/plugins/ifupdown/parser.c -=================================================================== ---- network-manager.orig/src/settings/plugins/ifupdown/parser.c 2011-10-16 08:48:00.000000000 +0200 -+++ network-manager/src/settings/plugins/ifupdown/parser.c 2012-01-05 14:45:06.907708918 +0100 -@@ -434,6 +434,15 @@ - return error_quark; - } - -+static void -+ifupdown_add_search_item(gpointer data, gpointer user_data) -+{ -+ const char *dns_search = data; -+ NMSettingIP4Config *ip4_setting = user_data; -+ -+ if (!nm_setting_ip4_config_add_dns_search (ip4_setting, dns_search)) -+ PLUGIN_WARN ("SCPlugin-Ifupdown", " warning: duplicate DNS domain '%s'", dns_search); -+} - - static void - update_ip4_setting_from_if_block(NMConnection *connection, -@@ -457,14 +466,18 @@ - const char *gateway_v = ifparser_getkey(block, "gateway"); - const char *nameserver_v = ifparser_getkey(block, "dns-nameserver"); - const char *nameservers_v = ifparser_getkey(block, "dns-nameservers"); -+ const char *search_v = ifparser_getkey(block, "dns-search"); - GSList* nameservers_list = NULL; - GSList* nameservers_list_i = NULL; -+ GSList* search_list = NULL; - GError *error = NULL; - - if(nameservers_v) - nameservers_list_i = nameservers_list = string_to_glist_of_strings (nameservers_v); - if(nameserver_v) - nameservers_list_i = nameservers_list = g_slist_append(nameservers_list, g_strdup(nameserver_v)); -+ if(search_v) -+ search_list = string_to_glist_of_strings (search_v); - - if (!address_v) - address_v = g_strdup ("0.0.0.0"); -@@ -514,6 +527,13 @@ - if (!nm_setting_ip4_config_get_num_dns (ip4_setting)) - PLUGIN_PRINT("SCPlugin-Ifupdown", "No dns-nameserver configured in /etc/network/interfaces"); - -+ /* DNS searches */ -+ if (search_list) { -+ g_slist_foreach (search_list, (GFunc) ifupdown_add_search_item, ip4_setting); -+ g_slist_foreach (search_list, (GFunc) g_free, NULL); -+ g_slist_free (search_list); -+ } -+ - g_object_set(ip4_setting, - NM_SETTING_IP4_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_MANUAL, - NULL); diff --git a/debian/patches/series b/debian/patches/series index 0b0b4e30..fc215f9c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ # Debian patches for network-manager 02-dbus_access_network_manager.patch 03-systemd.patch -04-ifupdown-support-dns-search-entries.patch |