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-03-01 14:36:15.000000000 +0000 +++ network-manager-0.9.2.0+git201202161854.8572ecf/debian/changelog 2012-03-05 16:47:59.000000000 +0000 @@ -1,3 +1,12 @@ +network-manager (0.9.2.0+git201202161854.8572ecf-0ubuntu6) precise; urgency=low + + * debian/patches/dnsmasq-dnssec-passthrough.patch: have dnsmasq proxy DNSSEC + data; otherwise we'll get DNSSEC-enabled sites show as non-DNSSEC in + browsers (which would be a regression from the behavior of the libc + resolver). (LP: #946093) + + -- Mathieu Trudel-Lapierre Mon, 05 Mar 2012 11:22:00 -0500 + network-manager (0.9.2.0+git201202161854.8572ecf-0ubuntu5) precise; urgency=low * debian/patches/git_libnm-glib_ensure_device_state_aef4340.patch: make sure diff -Nru network-manager-0.9.2.0+git201202161854.8572ecf/debian/patches/dnsmasq-dnssec-passthrough.patch network-manager-0.9.2.0+git201202161854.8572ecf/debian/patches/dnsmasq-dnssec-passthrough.patch --- network-manager-0.9.2.0+git201202161854.8572ecf/debian/patches/dnsmasq-dnssec-passthrough.patch 1970-01-01 00:00:00.000000000 +0000 +++ network-manager-0.9.2.0+git201202161854.8572ecf/debian/patches/dnsmasq-dnssec-passthrough.patch 2012-03-05 16:47:59.000000000 +0000 @@ -0,0 +1,30 @@ +From: Mathieu Trudel-Lapierre +Subject: Allow DNSSEC proxying/passthrough via dnsmasq (lp: #946093) +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/network-manager/+bug/946093 + +This will allow DNSSEC data to be visible in browsers, which would otherwise +not be the case by default because of dnsmasq acting as a middle-man for +resolution. + +Otherwise, we have a regression from the libc resolver behavior. + +--- + src/dns-manager/nm-dns-dnsmasq.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +Index: b/src/dns-manager/nm-dns-dnsmasq.c +=================================================================== +--- a/src/dns-manager/nm-dns-dnsmasq.c ++++ b/src/dns-manager/nm-dns-dnsmasq.c +@@ -345,8 +345,9 @@ update (NMDnsPlugin *plugin, + argv[5] = "--bind-interfaces"; + argv[6] = "--pid-file=" PIDFILE; + argv[7] = "--listen-address=127.0.0.1"; /* Should work for both 4 and 6 */ +- argv[8] = "--conf-file=" CONFFILE; +- argv[9] = NULL; ++ argv[8] = "--proxy-dnssec"; /* Allow DNSSEC to pass through */ ++ argv[9] = "--conf-file=" CONFFILE; ++ argv[10] = NULL; + + /* And finally spawn dnsmasq */ + pid = nm_dns_plugin_child_spawn (NM_DNS_PLUGIN (self), argv, PIDFILE, "bin/dnsmasq"); 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-03-01 14:36:15.000000000 +0000 +++ network-manager-0.9.2.0+git201202161854.8572ecf/debian/patches/series 2012-03-05 16:47:59.000000000 +0000 @@ -14,3 +14,4 @@ lp936712_dnsmasq_ip6_ns_ordering.patch git_libnm-glib_ensure_device_state_aef4340.patch dnsmasq-dont-read-hosts.patch +dnsmasq-dnssec-passthrough.patch