Merge ~paelzer/ubuntu/+source/open-vm-tools:merge-10.3.5-1-disco into ubuntu/+source/open-vm-tools:debian/sid

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

Tags for easier review pushed:
To ssh://git.launchpad.net/~paelzer/ubuntu/+source/open-vm-tools
 * [new tag] lp1804625/deconstruct/2%10.3.0-0ubuntu4 -> lp1804625/deconstruct/2%10.3.0-0ubuntu4
 * [new tag] lp1804625/logical/2%10.3.0-0ubuntu4 -> lp1804625/logical/2%10.3.0-0ubuntu4
 * [new tag] lp1804625/new/debian -> lp1804625/new/debian
 * [new tag] lp1804625/old/debian -> lp1804625/old/debian
 * [new tag] lp1804625/old/ubuntu -> lp1804625/old/ubuntu
 * [new tag] lp1804625/reconstruct/2%10.3.0-0ubuntu4 -> lp1804625/reconstruct/2%10.3.0-0ubuntu4

[Christian Ehrhardt  (paelzer)]

PPA builds started in https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/3530/+packages

[Christian Ehrhardt  (paelzer)]

Test builds completed

[Christian Ehrhardt  (paelzer)]

If one can please review the merge as-is, but consider the grain of salt that the fix for bug 1804287 is not yet final (see bug).

[Christian Ehrhardt  (paelzer)]

The services still work on a vsphere guest after upgrades.
I'll ask vmware for verification AFTER we have sorted our bug 1804287 to avoid having to do it twice after we dropped/changed that preliminary fix.

[Andreas Hasenack (ahasenack)]

- reconstruct ok
- logical ok
- logical applied on top of new/debian (everything dropped) ok
- new changes: awaiting upstream comments on #1804287

+1 pending testing of the added changes and discussion with cloud-init

review: Approve

[Christian Ehrhardt  (paelzer)]

We uncoupled 1804287 from the merge for now, that makes it a sync.

[Christian Ehrhardt  (paelzer)]

This one can be considered "merged" and the follow on fix will be a new MP soon.

diff --git a/debian/changelog b/debian/changelog
index f878e2e..4ceea77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,26 @@
+open-vm-tools (2:10.3.5-1ubuntu1) disco; urgency=medium
+
+  * Merge with Debian unstable (LP: #1804625). No Remaining changes.
+  * Dropped Changes (upstream now):
+    - d/p/lp-1793219-fix-stats-overflow.patch: fix potential overflow of 32
+      bit /proc values (LP: 1793219)
+    - d/p/ubuntu/lp-1791220-Disable-hgfsServer-not-VMware.patch: avoid
+      crashing with segfaults when force starting the service in non VMWare
+      environments. (LP: 1791220)
+  * Dropped Changes (in Debian now):
+    - Disable PrivateTmp for the open-vm-tools.service as it triggers issues
+      when triggering processes that need tmp through VMOMI API (LP: 1758428)
+    - d/p/debian/enable_vmhgfs-fuse_by_default: update to match changes in 10.3
+  * Added Changes:
+    - ensure VGAuthService is in time for cases like Site Recovery Manager
+      failover (LP: #1804287)
+      + d/open-vm-tools.service: be After=vgauth.service
+      + d/open-vm-tools.vgauth.service: since this is before
+        open-vm-tools.service now it also needs to drop DefaultDependencies=No
+        to have cloud init configure data early enough.
+
+ -- Christian Ehrhardt <[e-mail]>  Thu, 22 Nov 2018 11:04:26 +0100
+
 open-vm-tools (2:10.3.5-1) unstable; urgency=medium
 
   * [7061cb7] Update upstream source from tag 'upstream/10.3.5'
@@ -20,6 +43,46 @@ open-vm-tools (2:10.3.0-1) unstable; urgency=medium
 
  -- Bernd Zeimetz <[e-mail]>  Tue, 07 Aug 2018 23:41:00 +0200
 
+open-vm-tools (2:10.3.0-0ubuntu4) disco; urgency=medium
+
+  * No-change rebuild for icu soname changes.
+
+ -- Matthias Klose <[e-mail]>  Tue, 13 Nov 2018 08:16:01 +0000
+
+open-vm-tools (2:10.3.0-0ubuntu3) cosmic; urgency=medium
+
+  * d/p/lp-1793219-fix-stats-overflow.patch: fix potential overflow of 32 bit
+    /proc values (LP: #1793219)
+
+ -- Christian Ehrhardt <[e-mail]>  Mon, 24 Sep 2018 11:21:11 +0200
+
+open-vm-tools (2:10.3.0-0ubuntu2) cosmic; urgency=medium
+
+  * d/p/ubuntu/lp-1791220-Disable-hgfsServer-not-VMware.patch: avoid crashing
+    with segfaults when force starting the service in non VMWare environments.
+    (LP: #1791220)
+  * d/p/debian/scsi-udev-rule: fix applying of the scsi timeout (LP: #1790145)
+    - revert "update to match changes in 10.3 (DEVTYPE checkadded upstream)"
+    - refresh patch context to match upstream version 10.3
+
+ -- Christian Ehrhardt <[e-mail]>  Mon, 10 Sep 2018 09:33:13 +0200
+
+open-vm-tools (2:10.3.0-0ubuntu1) cosmic; urgency=medium
+
+  * Merge with Upstream Tag stable-10.3.0 (LP: #1784638) from
+    https://github.com/vmware/open-vm-tools/releases/tag/stable-10.3.0
+    Remaining changes:
+    - Disable PrivateTmp for the open-vm-tools.service as it triggers issues
+      when triggering processes that need tmp through VMOMI API (LP: 1758428)
+  * Added changes:
+    - d/p/debian/enable_vmhgfs-fuse_by_default: update to match changes in 10.3
+      (Upstream changed the entry level from 4.0 to 3.10 - could be dropped,
+       but stay close to what Debian has for now)
+    - d/p/debian/scsi-udev-rule: update to match changes in 10.3 (DEVTYPE check
+      added upstream)
+
+ -- Christian Ehrhardt <[e-mail]>  Wed, 01 Aug 2018 08:16:10 +0200
+
 open-vm-tools (2:10.2.5-1) unstable; urgency=medium
 
   * [ea03a58] Update upstream source from tag 'upstream/10.2.5'
@@ -29,6 +92,28 @@ open-vm-tools (2:10.2.5-1) unstable; urgency=medium
 
  -- Bernd Zeimetz <[e-mail]>  Fri, 06 Apr 2018 11:18:50 +0200
 
+open-vm-tools (2:10.2.0-3ubuntu3) bionic; urgency=medium
+
+  * Disable PrivateTmp for the open-vm-tools.service as it triggers issues
+    when triggering processes that need tmp through VMOMI API (LP: #1758428)
+
+ -- Christian Ehrhardt <[e-mail]>  Thu, 19 Apr 2018 11:23:58 +0200
+
+open-vm-tools (2:10.2.0-3ubuntu2) bionic; urgency=medium
+
+  * Revert change in d/open-vm-tools.service that added After=local-fs.target.
+    It turned out that the systemd in bionic already implicitly fixes
+    this issue (the change is still needed for backports) (LP: 1750780)
+
+ -- Christian Ehrhardt <[e-mail]>  Tue, 27 Feb 2018 08:03:13 +0100
+
+open-vm-tools (2:10.2.0-3ubuntu1) bionic; urgency=medium
+
+  * d/open-vm-tools.service: Add After=local-fs.target dependency ensuring
+    filesystems are ready to fix a race on startup (LP: #1750780)
+
+ -- Christian Ehrhardt <[e-mail]>  Thu, 22 Feb 2018 08:39:26 +0100
+
 open-vm-tools (2:10.2.0-3) unstable; urgency=medium
 
   * [47e50a1] Fix debhelper dep for backports
diff --git a/debian/control b/debian/control
index 2a5b977..15b060b 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: open-vm-tools
 Section: admin
 Priority: extra
-Maintainer: Bernd Zeimetz <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Bernd Zeimetz <[e-mail]>
 Build-Depends:
  debhelper (>= 11~), autotools-dev, doxygen, libcunit1-dev,
  libdumbnet-dev, libfuse-dev, libgtkmm-3.0-dev, libgtk-3-dev,
diff --git a/debian/open-vm-tools.service b/debian/open-vm-tools.service
index a50db06..e9630db 100644
--- a/debian/open-vm-tools.service
+++ b/debian/open-vm-tools.service
@@ -4,6 +4,7 @@ Documentation=http://open-vm-tools.sourceforge.net/about.php
 ConditionVirtualization=vmware
 DefaultDependencies=no
 Before=cloud-init-local.service
+After=vgauth.service
 RequiresMountsFor=/tmp
 
 [Service]
diff --git a/debian/open-vm-tools.vgauth.service b/debian/open-vm-tools.vgauth.service
index 94f7c89..2d843e9 100644
--- a/debian/open-vm-tools.vgauth.service
+++ b/debian/open-vm-tools.vgauth.service
@@ -3,6 +3,8 @@ Description=Authentication service for virtual machines hosted on VMware
 Documentation=http://github.com/vmware/open-vm-tools
 ConditionVirtualization=vmware
 PartOf=open-vm-tools.service
+DefaultDependencies=no
+RequiresMountsFor=/tmp
 
 [Service]
 ExecStart=/usr/bin/VGAuthService