diff -Nru network-manager-0.9.2.0+git201202161854.8572ecf/debian/changelog network-manager-0.9.2.0+git201202161854.8572ecf/debian/changelog --- network-manager-0.9.2.0+git201202161854.8572ecf/debian/changelog 2012-02-17 23:39:32.000000000 +0000 +++ network-manager-0.9.2.0+git201202161854.8572ecf/debian/changelog 2012-02-22 00:40:45.000000000 +0000 @@ -1,3 +1,19 @@ +network-manager (0.9.2.0+git201202161854.8572ecf-0ubuntu4) precise; urgency=low + + [ Gabor Kelemen ] + * debian/network-manager.upstart: Make NM aware of the locale. (LP: #875017) + + [ Mathieu Trudel-Lapierre ] + * debian/patches/lp936712_dnsmasq_ip6_ns_ordering.patch: order IPv6 + nameservers before IPv4 ones in dnsmasq config: dnsmasq is able to properly + deal with broken IPv6 nameservers (or routers). (LP: #936712) + * debian/control: add Conflicts: connman to network-manager. (LP: #659460) + * debian/patches/manage-privacy-extensions.patch: set the default for using + IPv6 Privacy extensions to TRUE; this is just correcting an oversight from + adapting the upstream patch. (LP: #176125) + + -- Mathieu Trudel-Lapierre Tue, 21 Feb 2012 19:40:35 -0500 + network-manager (0.9.2.0+git201202161854.8572ecf-0ubuntu3) precise; urgency=low * debian/libnm-*-dev.install: add missing -enum.h files now that upstream diff -Nru network-manager-0.9.2.0+git201202161854.8572ecf/debian/control network-manager-0.9.2.0+git201202161854.8572ecf/debian/control --- network-manager-0.9.2.0+git201202161854.8572ecf/debian/control 2012-02-17 23:39:32.000000000 +0000 +++ network-manager-0.9.2.0+git201202161854.8572ecf/debian/control 2012-02-22 00:40:45.000000000 +0000 @@ -65,6 +65,7 @@ network-manager-vpnc (<< 0.8.99), network-manager-pptp (<< 0.8.99), ppp (<< 2.4.5) +Conflicts: connman Description: network management framework (daemon and userspace tools) NetworkManager is a system network service that manages your network devices and connections, attempting to keep active network connectivity when diff -Nru network-manager-0.9.2.0+git201202161854.8572ecf/debian/network-manager.upstart network-manager-0.9.2.0+git201202161854.8572ecf/debian/network-manager.upstart --- network-manager-0.9.2.0+git201202161854.8572ecf/debian/network-manager.upstart 2012-02-17 23:39:32.000000000 +0000 +++ network-manager-0.9.2.0+git201202161854.8572ecf/debian/network-manager.upstart 2012-02-22 00:40:45.000000000 +0000 @@ -12,4 +12,12 @@ expect fork respawn -exec NetworkManager +script + # set $LANG so that messages appearing on the GUI will be translated. See LP: 875017 + if [ -r /etc/default/locale ]; then + . /etc/default/locale + export LANG LANGUAGE LC_MESSAGES LC_ALL + fi + + exec NetworkManager +end script diff -Nru network-manager-0.9.2.0+git201202161854.8572ecf/debian/patches/lp936712_dnsmasq_ip6_ns_ordering.patch network-manager-0.9.2.0+git201202161854.8572ecf/debian/patches/lp936712_dnsmasq_ip6_ns_ordering.patch --- network-manager-0.9.2.0+git201202161854.8572ecf/debian/patches/lp936712_dnsmasq_ip6_ns_ordering.patch 1970-01-01 00:00:00.000000000 +0000 +++ network-manager-0.9.2.0+git201202161854.8572ecf/debian/patches/lp936712_dnsmasq_ip6_ns_ordering.patch 2012-02-22 00:40:45.000000000 +0000 @@ -0,0 +1,39 @@ +From: Mathieu Trudel-Lapierre +Subject: Order IPv6 nameservers before IPv4 for dns plugins (dnsmasq, bind) +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/network-manager/+bug/936712 + +IPv6 nameservers are usually ordered last because there's some chance of broken +routers dropping the AAAA requests before they reach the nameservers, but when +using dnsmasq, this is mitigated by how dnsmasq handles sending requests to the +nameservers. Since ordering IPv4 nameservers before IPv6 defeats the purpose of +enabling IPv6 and trying to prefer it whenever possible, make sure the IPv6 +nameservers are actually showing up first in dns plugin configuration. + +This is a very simple implementation of such re-ordering, just add the IPv6 +nameservers first when building the list of IP configurations (which will +include nameservers, search domains, etc.), the IPv4 data will be appended +right after. + +Index: network-manager-0.9.2.0+git201202161854.8572ecf/src/dns-manager/nm-dns-manager.c +=================================================================== +--- network-manager-0.9.2.0+git201202161854.8572ecf.orig/src/dns-manager/nm-dns-manager.c 2012-02-16 15:07:04.000000000 -0500 ++++ network-manager-0.9.2.0+git201202161854.8572ecf/src/dns-manager/nm-dns-manager.c 2012-02-21 16:21:42.090870401 -0500 +@@ -675,14 +675,14 @@ + * still use the domain information in each config to provide split DNS if + * they want to. + */ +- if (priv->ip4_vpn_config) +- vpn_configs = g_slist_append (vpn_configs, priv->ip4_vpn_config); + if (priv->ip6_vpn_config) + vpn_configs = g_slist_append (vpn_configs, priv->ip6_vpn_config); +- if (priv->ip4_device_config) +- dev_configs = g_slist_append (dev_configs, priv->ip4_device_config); ++ if (priv->ip4_vpn_config) ++ vpn_configs = g_slist_append (vpn_configs, priv->ip4_vpn_config); + if (priv->ip6_device_config) + dev_configs = g_slist_append (dev_configs, priv->ip6_device_config); ++ if (priv->ip4_device_config) ++ dev_configs = g_slist_append (dev_configs, priv->ip4_device_config); + + for (iter = priv->configs; iter; iter = g_slist_next (iter)) { + if ( (iter->data != priv->ip4_vpn_config) diff -Nru network-manager-0.9.2.0+git201202161854.8572ecf/debian/patches/manage-privacy-extensions.patch network-manager-0.9.2.0+git201202161854.8572ecf/debian/patches/manage-privacy-extensions.patch --- network-manager-0.9.2.0+git201202161854.8572ecf/debian/patches/manage-privacy-extensions.patch 2012-02-17 23:39:32.000000000 +0000 +++ network-manager-0.9.2.0+git201202161854.8572ecf/debian/patches/manage-privacy-extensions.patch 2012-02-22 00:40:45.000000000 +0000 @@ -114,7 +114,7 @@ + "one generated from MAC address with modified EUI-64. " + "This enhances privacy, but could also cause problems " + "in some applications, on the other hand.", -+ FALSE, ++ TRUE, + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); } diff -Nru network-manager-0.9.2.0+git201202161854.8572ecf/debian/patches/series network-manager-0.9.2.0+git201202161854.8572ecf/debian/patches/series --- network-manager-0.9.2.0+git201202161854.8572ecf/debian/patches/series 2012-02-17 23:39:32.000000000 +0000 +++ network-manager-0.9.2.0+git201202161854.8572ecf/debian/patches/series 2012-02-22 00:40:45.000000000 +0000 @@ -11,3 +11,4 @@ dnsmasq-vpn-dns-filtering.patch manage-privacy-extensions.patch add_sendsigs_omissions.patch +lp936712_dnsmasq_ip6_ns_ordering.patch