Import patches-unapplied version 1.2-0ubuntu1 to ubuntu/raring-proposed

Imported using git-ubuntu import.

Changelog parent: 908c9c67eab553877bc5d16e2d52318d1d8ce8f9

New changelog entries:
  * New upstream version (LP: #1077148)
  * Upstream features:
    - Added - load ata_piix.ko module loaded if needed for CDROM device support
    - Additional logging for DoDhcpWork()
    - Update sock.recv timeout from 30 to 10 seconds
    - Fix: Linux waagent deprovision, user is not deleted properly
    - Fix: Make LBProbeResponder construction more robust
    - Fix: Agent fails to provision user with public/private key pairs
    - Fix: DHCP broadcast response not received
    - Fix: Linux agent fails to delete root user password
    - Fix: Linux agent should report error messages to Fabric when
           passed an invalid hostname.
  * Dropped Ubuntu specific patches
    - Removed debian/patches/000_resolv-conf.patch as upstream now supports
      resolvconf properly.
    - Removed debian/patches/001-strip-init-d.patch as redundant now that
      upstream understands Ubuntu upstart. Upstream script does not
      handle the removal of the upstart job anyway.
  * Added debian/patches/000_use_package_upstart.patch to use packaged
    upstart job over in-script upstart.

5 files changed, 43 insertions, 71 deletions

diff --git a/debian/changelog b/debian/changelog
index caab890..0ddef50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,28 @@
+walinuxagent (1.2-0ubuntu1) raring; urgency=low
+
+  * New upstream version (LP: #1077148)
+  * Upstream features:
+    - Added - load ata_piix.ko module loaded if needed for CDROM device support
+    - Additional logging for DoDhcpWork()
+    - Update sock.recv timeout from 30 to 10 seconds
+    - Fix: Linux waagent deprovision, user is not deleted properly
+    - Fix: Make LBProbeResponder construction more robust
+    - Fix: Agent fails to provision user with public/private key pairs
+    - Fix: DHCP broadcast response not received
+    - Fix: Linux agent fails to delete root user password
+    - Fix: Linux agent should report error messages to Fabric when
+           passed an invalid hostname.
+  * Dropped Ubuntu specific patches
+    - Removed debian/patches/000_resolv-conf.patch as upstream now supports
+      resolvconf properly.
+    - Removed debian/patches/001-strip-init-d.patch as redundant now that
+      upstream understands Ubuntu upstart. Upstream script does not
+      handle the removal of the upstart job anyway.
+  * Added debian/patches/000_use_package_upstart.patch to use packaged
+    upstart job over in-script upstart.
+
+ -- Ben Howard <ben.howard@ubuntu.com>  Fri, 07 Dec 2012 16:52:42 -0700
+
 walinuxagent (1.1-0ubuntu2) raring; urgency=low
 
   * Stop upgrades purging walinuxagent meta-data and configuration files
@@ -28,7 +53,7 @@ walinuxagent (1.1-0ubuntu1) raring; urgency=low
 
 walinuxagent (1.0~git20120606.c16f5e9-0ubuntu2) quantal; urgency=low
 
-  * Restrict target architectures to i386 and amd64. 
+  * Restrict target architectures to i386 and amd64.
 
  -- James Page <james.page@ubuntu.com>  Mon, 06 Aug 2012 10:24:07 +0100
 
diff --git a/debian/patches/000_resolv-conf.patch b/debian/patches/000_resolv-conf.patch
deleted file mode 100644
index 23404da..0000000
--- a/debian/patches/000_resolv-conf.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: wa-new/waagent
-===================================================================
---- wa-new.orig/waagent	2012-11-14 11:06:12.227371000 -0700
-+++ wa-new/waagent	2012-11-14 11:07:53.093401274 -0700
-@@ -2262,7 +2262,26 @@
-         Run("rm -f " + a + "/*")
- 
-     # Clear LibDir, remove nameserver and root bash history
--    for f in os.listdir(LibDir) + ["/etc/resolv.conf", "/root/.bash_history", "/var/log/waagent.log"]:
-+    fileBlackList = [ "/root/.bash_history", "/var/log/waagent.log" ]
-+
-+    if IsUbuntu():
-+        # Ubuntu uses resolv.conf by default, so removing /etc/resolv.conf will
-+        # break resolvconf. Therefore, we check to see if resolvconf is in use,
-+        # and if so, we remove the resolvconf artifacts.
-+
-+        if os.path.realpath('/etc/resolv.conf') != '/run/resolvconf/resolv.conf':
-+            Log("resolvconf is not configured. Removing /etc/resolv.conf")
-+            fileBlackList.append('/etc/resolv.conf')
-+        else:
-+            Log("resolvconf is enabled; leaving /etc/resolv.conf intact")
-+            resolvConfD = '/etc/resolvconf/resolv.conf.d/'
-+            fileBlackList.extend([resolvConfD + 'tail', resolvConfD + 'originial' ])
-+    else:
-+        fileBlackList.append(os.listdir(LibDir) + '/etc/resolv.conf')
-+
-+
-+    # Clear LibDir, remove nameserver and root bash history
-+    for f in os.listdir(LibDir) + fileBlackList:
-         try:
-             os.remove(f)
-         except:
diff --git a/debian/patches/000_use_package_upstart.patch b/debian/patches/000_use_package_upstart.patch
new file mode 100644
index 0000000..dce93cd
--- /dev/null
+++ b/debian/patches/000_use_package_upstart.patch
@@ -0,0 +1,16 @@
+--- a/waagent
++++ b/waagent
+@@ -2242,11 +2242,8 @@ def Install():
+             Warn("Moved " + a + " -> " + LibDir + "/" + GetLastPathElement(a) )
+ 
+     if IsUbuntu():
+-        # Support for Ubuntu's upstart configuration
+-        filename="waagent.conf"
+-        filepath = "/etc/init/" + filename
+-        SetFileContents(filepath, Init_Ubuntu)
+-        os.chmod(filepath, 0644)
++        # Use the Ubuntu packaged upstart job.
++        Log("Using Ubuntu packaged upstart job. Skipping upstart installation")
+ 
+     else:
+         # Regular init.d configurations
diff --git a/debian/patches/001-strip-init-d.patch b/debian/patches/001-strip-init-d.patch
deleted file mode 100644
index 0d88fe4..0000000
--- a/debian/patches/001-strip-init-d.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/waagent
-+++ b/waagent
-@@ -2141,18 +2141,21 @@ def Install():
-                 os.remove(GetLastPathElement(a))
-             shutil.move(a, ".")
-             Warn("Moved " + a + " -> " + LibDir + "/" + GetLastPathElement(a) )
--    filename = "waagent"
--    filepath = "/etc/init.d/" + filename
--    distro = IsRedHat() + IsDebian() * 2 + IsSuse() * 3
--    if distro == 0:
--        Error("Unable to detect Linux Distribution.")
--        return 1
--    init = [[Init_RedHat, "chkconfig --add " + filename],
--            [Init_Debian, "update-rc.d " + filename + " defaults"],
--            [Init_Suse, "insserv " + filename]][distro - 1]
--    SetFileContents(filepath, init[0])
--    os.chmod(filepath, 0755)
--    Run(init[1])
-+
-+    if not IsUbuntu():
-+        filename = "waagent"
-+        filepath = "/etc/init.d/" + filename
-+        distro = IsRedHat() + IsDebian() * 2 + IsSuse() * 3
-+        if distro == 0:
-+            Error("Unable to detect Linux Distribution.")
-+            return 1
-+        init = [[Init_RedHat, "chkconfig --add " + filename],
-+                [Init_Debian, "update-rc.d " + filename + " defaults"],
-+                [Init_Suse, "insserv " + filename]][distro - 1]
-+        SetFileContents(filepath, init[0])
-+        os.chmod(filepath, 0755)
-+        Run(init[1])
-+
-     if os.path.isfile("/etc/waagent.conf"):
-         try:
-             os.remove("/etc/waagent.conf.old")
diff --git a/debian/patches/series b/debian/patches/series
index 96a325a..fb42aae 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-000_resolv-conf.patch
-001-strip-init-d.patch
+000_use_package_upstart.patch