Merge ~paelzer/ubuntu/+source/open-vm-tools:backport-xenial-lp1741390 into ubuntu/+source/open-vm-tools:debian/sid

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

Hi,
testing for this is mostly done by VMWare related to bug 1741390
But if one wants to give it a try there are trial VMWare versions and ppa [1] is available.

This is a slightly uncommon MP, so let me explain.
1. it is against debian/sid as we want to merge the latest version we have as SRU to Xenial
2. Bionic has a slightly newer version now, but it consists of adding and removing a change, so it is essentially the same (except changelog noise that isn't needed/wanted here)
3. This package seems to hit quite a lot backporting issues due to debhelper behaving different back then, this was what most of the tests and backport-delta is about

[1]: https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/3152

0428a9b... by Christian Ehrhardt  on 2018-03-22

changelog: account for recent xenial upload in merged changelog

Signed-off-by: Christian Ehrhardt <email address hidden>

[Andreas Hasenack (ahasenack)]

Scary stuff :)

I just have two simple comments inline, apply them if you wish.

Did some testing:
- upgrade from previous version, including dev and desktop subpackages
- used an ESXi xenial vm for testing
- some actions in the vsphere GUI failed with the previous version, worked out-of-the box with the new one ("view guest user mappings"). Well, that's the only one I managed to try actually, but it's progress.
- removal and purging of the packages
- vmblock fuse mounted after install

+1

review: Approve

[Christian Ehrhardt  (paelzer)]

Thanks both look good to be done on upload

c4f095e... by Christian Ehrhardt  on 2018-03-22

debian/open-vm-tools-desktop.postinst: minor fixups due to review feedback

Signed-off-by: Christian Ehrhardt <email address hidden>

[Christian Ehrhardt  (paelzer)]

FYI:
Minor cleanups in changelog on this and the otherwise equivalent artful branch due to SRU review feedback (version strings and also addressing artful). After this and clearing a bug in Bionic before it is SRUable by policy I pushed the new tags and the changes to the branches here.

diff --git a/debian/changelog b/debian/changelog
index ddeb2ac..7aea7a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,27 @@
+open-vm-tools (2:10.2.0-3ubuntu0.16.04.1) xenial; urgency=medium
+
+  * backport Bionic open-vm-tools to Xenial (LP: #1741390)
+    - d/control: B-D for dh-autoreconf and dh-systemd
+    - d/rules: re-add autoreconf and systemd
+    - d/control: B-D to debhelper version of xenial supporting compat 10
+    - d/compat: compat level 10 is latest xenial supported level
+    - d/rules: go back from override_dh_installsystemd to
+      override_dh_systemd_enable and override_dh_systemd_start as needed on
+      xenials debhelper version.
+    - d/rules: drop --no-restart-after-upgrade which only exists in debhelper
+      10, the version 9 behavior defaults to what we need.
+    - debian/rules: dh_systemd_start in xenial has issues with the escaping of
+      the run-vmblock\\x2dfuse.mount job, so drop this call
+    - debian/open-vm-tools-desktop.postinst: add a fixed version of what
+      dh_systemd_start would have added
+    - d/open-vm-tools-desktop.prerm, d/open-vm-tools-desktop.postrm: add what
+      dh_systemd_start would have added (as-is since those sections worked)
+    - d/control: update maintainers
+  * 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, 15 Feb 2018 09:36:20 +0100
+
 open-vm-tools (2:10.2.0-3) unstable; urgency=medium
 
   * [47e50a1] Fix debhelper dep for backports
@@ -226,6 +250,25 @@ open-vm-tools (2:10.1.0-4449150-1) unstable; urgency=medium
 
  -- Bernd Zeimetz <[e-mail]>  Wed, 16 Nov 2016 03:35:44 +0100
 
+open-vm-tools (2:10.0.7-3227872-5ubuntu1~16.04.2) xenial; urgency=medium
+
+  * Make tools.conf template useful. (LP: #1748122)
+
+ -- Dariusz Gadomski <[e-mail]>  Thu, 15 Feb 2018 11:19:17 +0100
+
+open-vm-tools (2:10.0.7-3227872-5ubuntu1~16.04.1) xenial; urgency=low
+
+  * Backport to xenial for kernel 4.8 support.  (LP: #1662116)
+
+ -- Andy Whitcroft <[e-mail]>  Mon, 06 Feb 2017 16:15:40 +0000
+
+open-vm-tools (2:10.0.7-3227872-5ubuntu1) yakkety; urgency=low
+
+  * Merge with Debian; remaining changes:
+    - Build without xmlsecurity support and xerces for now (universe).
+
+ -- Iain Lane <[e-mail]>  Fri, 30 Sep 2016 16:03:58 +0100
+
 open-vm-tools (2:10.0.7-3227872-5) unstable; urgency=medium
 
   * [9295c22] Add .travis.yml from http://travis.debian.net.
@@ -234,6 +277,13 @@ open-vm-tools (2:10.0.7-3227872-5) unstable; urgency=medium
 
  -- Bernd Zeimetz <[e-mail]>  Sat, 17 Sep 2016 23:26:58 +0200
 
+open-vm-tools (2:10.0.7-3227872-4.1ubuntu1) yakkety; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Build without xmlsecurity support and xerces for now (universe).
+
+ -- Matthias Klose <[e-mail]>  Tue, 02 Aug 2016 14:23:27 +0200
+
 open-vm-tools (2:10.0.7-3227872-4.1) unstable; urgency=medium
 
   * Non-maintainer upload.
@@ -260,6 +310,32 @@ open-vm-tools (2:10.0.7-3227872-3) unstable; urgency=medium
 
  -- Bernd Zeimetz <[e-mail]>  Tue, 31 May 2016 11:15:30 +0200
 
+open-vm-tools (2:10.0.7-3227872-2ubuntu2) yakkety; urgency=medium
+
+  * No-change rebuild for libicu soname change.
+
+ -- Matthias Klose <[e-mail]>  Fri, 22 Apr 2016 22:58:57 +0000
+
+open-vm-tools (2:10.0.7-3227872-2ubuntu1) xenial; urgency=low
+
+  * Merge from Debian unstable (LP: #1558198).  Remaining changes:
+    - Build without xmlsecurity support and xerces for now (universe).
+
+ -- Steve Langasek <[e-mail]>  Thu, 14 Apr 2016 17:06:49 -0700
+
+open-vm-tools (2:10.0.7-3227872-4) unstable; urgency=medium
+
+  * [007eacb] Better check for availability of vmware-checkvm and -rpctool.
+
+ -- Bernd Zeimetz <[e-mail]>  Sat, 04 Jun 2016 07:31:17 +0200
+
+open-vm-tools (2:10.0.7-3227872-3) unstable; urgency=medium
+
+  * [5060f42] Notify vmware when removing open-vm-tools.
+    Thanks to Yanhui He (Closes: #825810)
+
+ -- Bernd Zeimetz <[e-mail]>  Tue, 31 May 2016 11:15:30 +0200
+
 open-vm-tools (2:10.0.7-3227872-2) unstable; urgency=medium
 
   * [f2f4971] Work around wrong dkms versions.
@@ -296,6 +372,13 @@ open-vm-tools (2:10.0.5-3227872-1) unstable; urgency=medium
 
  -- Bernd Zeimetz <[e-mail]>  Sat, 26 Dec 2015 17:26:52 +0100
 
+open-vm-tools (2:10.0.0-3000743-3ubuntu1) xenial; urgency=low
+
+  * Merge from Debian unstable. (LP: #1492429) Remaining changes:
+    - Build without xmlsecurity support and xerces for now (universe).
+
+ -- Robert C Jennings <[e-mail]>  Sun, 01 Nov 2015 04:41:44 +0000
+
 open-vm-tools (2:10.0.0-3000743-3) unstable; urgency=medium
 
   * [8b49d5b] fix open-vm-tools-dkms description
@@ -353,6 +436,24 @@ open-vm-tools (2:9.10.2-2822639-2) unstable; urgency=medium
 
  -- Bernd Zeimetz <[e-mail]>  Sun, 16 Aug 2015 16:27:27 +0200
 
+open-vm-tools (2:9.10.2-2822639-1ubuntu3) wily; urgency=medium
+
+  * Build without xmlsecurity support and xerces for now (universe).
+
+ -- Matthias Klose <[e-mail]>  Mon, 10 Aug 2015 21:01:08 +0000
+
+open-vm-tools (2:9.10.2-2822639-1ubuntu2) wily; urgency=medium
+
+  * No-change rebuild against new libicu
+
+ -- Iain Lane <[e-mail]>  Wed, 05 Aug 2015 17:41:02 +0100
+
+open-vm-tools (2:9.10.2-2822639-1ubuntu1) wily; urgency=medium
+
+  * Sync from Debian (LP: #1468114).
+
+ -- Ben Howard <[e-mail]>  Mon, 20 Jul 2015 10:37:17 -0600
+
 open-vm-tools (2:9.10.2-2822639-1) unstable; urgency=medium
 
   * [a4125bd1] Merge tag 'upstream/9.10.2-2822639'
diff --git a/debian/compat b/debian/compat
index b4de394..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-11
+10
diff --git a/debian/control b/debian/control
index 2a5b977..433e915 100644
--- a/debian/control
+++ b/debian/control
@@ -1,9 +1,10 @@
 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,
+ debhelper (>= 9.20160115ubuntu3), autotools-dev, doxygen, libcunit1-dev,
  libdumbnet-dev, libfuse-dev, libgtkmm-3.0-dev, libgtk-3-dev,
  libicu-dev, libnotify-dev, libpam0g-dev, libprocps-dev, libx11-dev,
  libxinerama-dev, libxss-dev, libxtst-dev,
@@ -12,6 +13,8 @@ Build-Depends:
  libxmlsec1-dev,
  libudev-dev,
  libdrm-dev,
+ dh-autoreconf,
+ dh-systemd,
 Standards-Version: 3.9.6
 Homepage: https://github.com/vmware/open-vm-tools
 Vcs-Git: https://github.com/bzed/pkg-open-vm-tools.git
diff --git a/debian/open-vm-tools-desktop.postinst b/debian/open-vm-tools-desktop.postinst
index addacbb..003607c 100644
--- a/debian/open-vm-tools-desktop.postinst
+++ b/debian/open-vm-tools-desktop.postinst
@@ -8,3 +8,21 @@ fi
 
 #DEBHELPER#
 
+# replaces the deb-systemd-invoke start run-vmblock\\x2dfuse.mount that is
+# broken on Xenial due to the escaping of the service.
+# Intentionally AFTER debhelper to have the scripts available and enabled.
+#
+# It follows the principle of deb-systemd-invoke start (we don't have to
+# care about restart here as the original was only called with start here).
+# So it comes down to: "If the unit is enabled, start it now"
+if [ -d /run/systemd/system ]; then
+    systemctl --system daemon-reload >/dev/null || true
+    enabled="$(systemctl is-enabled -- run-vmblock\\x2dfuse.mount)"
+    if [ "${enabled}" = "enabled" ]; then
+        systemctl start run-vmblock\\x2dfuse.mount
+    else
+        echo "run-vmblock\\x2dfuse.mount is a disabled or a static unit, not starting it."
+    fi
+fi
+
+exit 0
diff --git a/debian/open-vm-tools-desktop.postrm b/debian/open-vm-tools-desktop.postrm
new file mode 100644
index 0000000..5e7a861
--- /dev/null
+++ b/debian/open-vm-tools-desktop.postrm
@@ -0,0 +1,13 @@
+#!/bin/sh
+set -e
+
+# NOT-Automatically added by dh_systemd_start - as it has issues on start
+# But copied from what it would have added (as stop works fine as-is)
+if [ -d /run/systemd/system ]; then
+    systemctl --system daemon-reload >/dev/null || true
+fi
+# End NOT-automatically added section
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/open-vm-tools-desktop.prerm b/debian/open-vm-tools-desktop.prerm
index 71a6f14..efbb74c 100644
--- a/debian/open-vm-tools-desktop.prerm
+++ b/debian/open-vm-tools-desktop.prerm
@@ -10,3 +10,12 @@ fi
 
 #DEBHELPER#
 
+# NOT-Automatically added by dh_systemd_start - as it has issues on start
+# But copied from what it would have added (as stop works fine as-is)
+# Should be at the Tail of debhelper section
+if [ -d /run/systemd/system ]; then
+    deb-systemd-invoke stop run-vmblock\\x2dfuse.mount >/dev/null
+fi
+# End NOT-automatically added section
+
+exit 0
diff --git a/debian/open-vm-tools.service b/debian/open-vm-tools.service
index 8d64880..a66b318 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=local-fs.target
 
 [Service]
 ExecStart=/usr/bin/vmtoolsd
diff --git a/debian/rules b/debian/rules
index 2789360..261ba13 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@ DEBHELPER_VERSION = $(strip $(shell dpkg-query -f '$${Version}' -W debhelper))
 DEBHELPER_SYSTEMD_OK = $(strip $(shell dpkg --compare-versions $(DEBHELPER_VERSION) ge 10.9.1~; echo $$?))
 
 %:
-	dh ${@} --sourcedirectory=open-vm-tools
+	dh ${@} --sourcedirectory=open-vm-tools --with=autotools_dev,autoreconf,systemd
 
 override_dh_auto_configure:
 	dh_auto_configure --sourcedirectory=open-vm-tools -- \
@@ -79,10 +79,21 @@ override_dh_fixperms:
 
 	dh_fixperms -Xvmware-user-suid-wrapper
 
-override_dh_installsystemd:
-	dh_installsystemd -popen-vm-tools
-	dh_installsystemd -popen-vm-tools --name vgauth
-	dh_installsystemd -popen-vm-tools-desktop --restart-after-upgrade --no-stop-on-upgrade run-vmblock\\x2dfuse.mount
+override_dh_systemd_enable:
+	dh_systemd_enable -popen-vm-tools
+	dh_systemd_enable -popen-vm-tools --name vgauth
+	dh_systemd_enable -popen-vm-tools-desktop run-vmblock\\x2dfuse.mount
+
+override_dh_systemd_start:
+	dh_systemd_start -popen-vm-tools
+	dh_systemd_start -popen-vm-tools --name vgauth
+	# "deb-systemd-invoke start" (and only that) as generated by
+	# dh_systemd_start will fail for run-vmblock\\x2dfuse.mount on xenial.
+	# A custom section in the Maintainer scripts will take care of it
+	# Disabled on Backport: dh_systemd_start -popen-vm-tools-desktop -r run-vmblock\\x2dfuse.mount
+	# The following sed's are needed in Xenial as well to fix dh_installinit and dh_systemd_enable behavior
+	sed -i 's,run-vmblock\\x2dfuse,run-vmblock\\\\x2dfuse,g' debian/*.debhelper
+	sed -i 's,run-vmblock-fuse,run-vmblock\\\\x2dfuse,g' debian/*.debhelper
 
 override_dh_installchangelogs:
 	dh_installchangelogs ReleaseNotes.md