Merge ~paelzer/ubuntu/+source/open-vm-tools:lp-1944946-old-lib-path-HIRSUTE into ubuntu/+source/open-vm-tools:ubuntu/hirsute-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

PPA: https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/4673
SRU: https://bugs.launchpad.net/ubuntu/+source/open-vm-tools/+bug/1944946

7398339... by Christian Ehrhardt  on 2021-10-13

d/open-vm-tools.postinst: handle upgrades from <11.3.0-2 in regard to the symlink

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

d94d387... by Christian Ehrhardt  on 2021-10-13

changelog: handle upgrades from <11.3.0-2

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

[Christian Ehrhardt  (paelzer)]

Great finding by mirespace - conflicts when upgrading from pre 11.3 (e.g. -release) when dir is replaced by a symlink.
I added a new commit that handles those in postinst.
New builds started in the PPA.

[Christian Ehrhardt  (paelzer)]

Now also fixed
 SC2039: In POSIX sh, == in place of = is undefined.
which caused:
 /var/lib/dpkg/info/open-vm-tools.postinst: 21: [: /usr/lib/open-vm-tools: unexpected operator

[Miriam España Acebal (mirespace)]

Hi Christian... thanks for the fun while testing the MP :). All works ok.
LGTM, +1

review: Approve

[Christian Ehrhardt  (paelzer)]

Thank you, uploading

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading open-vm-tools_11.3.0-2ubuntu0~ubuntu21.04.2.dsc: done.
  Uploading open-vm-tools_11.3.0-2ubuntu0~ubuntu21.04.2.debian.tar.xz: done.
  Uploading open-vm-tools_11.3.0-2ubuntu0~ubuntu21.04.2_source.buildinfo: done.
  Uploading open-vm-tools_11.3.0-2ubuntu0~ubuntu21.04.2_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index e7c287e..d018a58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+open-vm-tools (2:11.3.0-2ubuntu0~ubuntu21.04.2) hirsute; urgency=medium
+
+  * d/rules: provide a compat link for the old open-vm-tools
+    library/plugin paths (LP: #1944946)
+    - d/open-vm-tools.postinst: handle upgrades from <11.3.0-2 in regard
+      to the symlink
+
+ -- Christian Ehrhardt <[e-mail]>  Tue, 12 Oct 2021 07:50:08 +0200
+
 open-vm-tools (2:11.3.0-2ubuntu0~ubuntu21.04.1) hirsute; urgency=medium
 
   * Update to latest release v11.3.0 (LP: #1933143)
diff --git a/debian/open-vm-tools.postinst b/debian/open-vm-tools.postinst
index f181ab2..9402a5e 100644
--- a/debian/open-vm-tools.postinst
+++ b/debian/open-vm-tools.postinst
@@ -7,6 +7,30 @@ case "${1}" in
         if which udevadm 1>/dev/null; then
             udevadm trigger || true
         fi
+
+        # Transitions from directory (<11.3.0-2) to symlink can cause issues
+        # See this bug and links from there for prior examples
+        # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=626203
+        # Upgrades "through" 11.3.0-2 are ok as it removed the dir and then
+        # deploys the symlink on the next upgrade. But directly from e.g.
+        # 2:11.0.5-4 in focal-release the upgrade would leave a dir behind.
+        if [ -n "$2" ] && dpkg --compare-versions -- "$2" lt "2:11.3.0-2~"; then
+            # upgrade from a version that had the directory
+            d_to_s_dir="/usr/lib/open-vm-tools"
+            if [ -d "$d_to_s_dir" ]; then
+                if [ "$(find "$d_to_s_dir" -maxdepth 0 -empty)" = "$d_to_s_dir" ]; then
+                    # remove empty dir
+                    rmdir "$d_to_s_dir"
+                else
+                    # Backup non-empty dir
+                    echo "Warning $d_to_s_dir not empty, create backup in $d_to_s_dir.bckp"
+                    mv "$d_to_s_dir" "$d_to_s_dir.bckp"
+                fi
+                target_dir=$(dpkg -L open-vm-tools | grep '^/usr/lib/.*-linux-gnu/open-vm-tools$')
+                # Create symlink in place of the former directory
+                ln -s "$target_dir" "$d_to_s_dir"
+            fi
+        fi
         ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/debian/rules b/debian/rules
index f19b2ba..481ec14 100755
--- a/debian/rules
+++ b/debian/rules
@@ -85,6 +85,9 @@ override_dh_auto_install:
 	mv debian/open-vm-tools/usr/lib/$(DEB_HOST_MULTIARCH)/open-vm-tools/serviceDiscovery/scripts/* debian/open-vm-tools-sdmp/usr/lib/$(DEB_HOST_MULTIARCH)/open-vm-tools/serviceDiscovery/scripts/
 	rm -rf debian/open-vm-tools/usr/lib/$(DEB_HOST_MULTIARCH)/open-vm-tools/serviceDiscovery/
 
+	# Compat link for LP: #1944946 due to software checking the old non multiarch .so paths
+	ln --relative --symbolic debian/open-vm-tools/usr/lib/$(DEB_HOST_MULTIARCH)/open-vm-tools debian/open-vm-tools/usr/lib/open-vm-tools
+
 override_dh_gencontrol:
 	if [ "${VENDOR}" = "UBUNTU" ]; \
 	then \