Merge lp:~cjohnston/ubuntu/raring/vagrant/fix-dns into lp:ubuntu/raring/vagrant

[Chris Johnston]

* Fix issue where DNS doesn't resolve properly for 12.10. [GH-1176]
    (LP: #1101914)

[lp:~cjohnston/ubuntu/raring/vagrant/fix-dns]

8. By Chris Johnston on 2013-01-20

Detect Ubuntu's dns proxy (listening on 127.0.1.1) and disables
internal dns proxying. [GH-1176]
(LP: #1101914)

[Luke Yelavich (themuso)]

review: Approve

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2012-01-28 12:36:35 +0000
+++ .pc/applied-patches	2013-01-20 11:40:26 +0000
@@ -1,1 +1,2 @@
 01_source_root_path.patch
+update_dns.patch
 
=== modified file 'debian/changelog'
--- debian/changelog	2012-05-03 17:01:09 +0000
+++ debian/changelog	2013-01-20 11:40:26 +0000
@@ -1,3 +1,11 @@
+vagrant (1.0.3-1ubuntu1) raring; urgency=low
+
+  * Detect Ubuntu's dns proxy (listening on 127.0.1.1) and disables
+    internal dns proxying. [GH-1176] 
+    (LP: #1101914)
+
+ -- Chris Johnston <[e-mail]>  Sat, 19 Jan 2013 17:40:17 -0500
+
 vagrant (1.0.3-1) unstable; urgency=low
 
   * New upstream release
 
=== modified file 'debian/control'
--- debian/control	2012-05-03 17:01:09 +0000
+++ debian/control	2013-01-20 11:40:26 +0000
@@ -1,7 +1,8 @@
 Source: vagrant
 Section: admin
 Priority: optional
-Maintainer: Laurent Bigonville <[e-mail]>
+Maintainer: Ubuntu MOTU Developers <[e-mail]>
+XSBC-Original-Maintainer: Laurent Bigonville <[e-mail]>
 Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.13~), bash-completion
 Standards-Version: 3.9.3
 Vcs-Git: git://anonscm.debian.org/git/collab-maint/vagrant.git
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2012-01-28 12:36:35 +0000
+++ debian/patches/series	2013-01-20 11:40:26 +0000
@@ -1,1 +1,2 @@
 01_source_root_path.patch
+update_dns.patch
 
=== added file 'debian/patches/update_dns.patch'
--- debian/patches/update_dns.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/update_dns.patch	2013-01-20 11:40:26 +0000
@@ -0,0 +1,23 @@
+Index: vagrant/lib/vagrant/action/vm/sane_defaults.rb
+===================================================================
+--- vagrant.orig/lib/vagrant/action/vm/sane_defaults.rb	2013-01-19 18:39:05.000000000 -0500
++++ vagrant/lib/vagrant/action/vm/sane_defaults.rb	2013-01-20 04:01:07.396706592 -0500
+@@ -32,13 +32,14 @@
+           begin
+             contents = File.read("/etc/resolv.conf")
+ 
+-            if contents =~ /^nameserver 127\.0\.0\.1$/
++            if contents =~ /^nameserver 127\.0\.0\.1$/ or
++                contents =~ /^nameserver 127\.0\.1\.1$/
+               # The use of both natdnsproxy and natdnshostresolver break on
+-              # Ubuntu 12.04 that uses resolvconf with localhost. When used
++              # Ubuntu 12.04 and 12.10 that uses resolvconf with localhost. When used
+               # VirtualBox will give the client dns server 10.0.2.3, while
+               # not binding to that address itself. Therefore disable this
+-              # feature if host uses the resolvconf server 127.0.0.1
+-              @logger.info("Disabling DNS proxy since resolv.conf contains 127.0.0.1")
++              # feature if host uses the resolvconf server 127.0.0.1 or 127.0.1.1
++              @logger.info("Disabling DNS proxy since resolv.conf contains 127.0.0.1 or 127.0.1.1")
+               enable_dns_proxy = false
+             end
+           rescue Errno::ENOENT; end
 
=== modified file 'lib/vagrant/action/vm/sane_defaults.rb'
--- lib/vagrant/action/vm/sane_defaults.rb	2012-05-03 17:01:09 +0000
+++ lib/vagrant/action/vm/sane_defaults.rb	2013-01-20 11:40:26 +0000
@@ -32,13 +32,14 @@
           begin
             contents = File.read("/etc/resolv.conf")
 
-            if contents =~ /^nameserver 127\.0\.0\.1$/
+            if contents =~ /^nameserver 127\.0\.0\.1$/ or
+                contents =~ /^nameserver 127\.0\.1\.1$/
               # The use of both natdnsproxy and natdnshostresolver break on
-              # Ubuntu 12.04 that uses resolvconf with localhost. When used
+              # Ubuntu 12.04 and 12.10 that uses resolvconf with localhost. When used
               # VirtualBox will give the client dns server 10.0.2.3, while
               # not binding to that address itself. Therefore disable this
-              # feature if host uses the resolvconf server 127.0.0.1
-              @logger.info("Disabling DNS proxy since resolv.conf contains 127.0.0.1")
+              # feature if host uses the resolvconf server 127.0.0.1 or 127.0.1.1
+              @logger.info("Disabling DNS proxy since resolv.conf contains 127.0.0.1 or 127.0.1.1")
               enable_dns_proxy = false
             end
           rescue Errno::ENOENT; end