Bug#934183: stretch-pu: package open-vm-tools/2:10.3.10-1+deb10u1

[Bernd Zeimetz <bzed@debian.org>]

Package: release.debian.org
Severity: normal
Tags: buster
User: release.debian.org@packages.debian.org
Usertags: pu


Hi release-team,

I'd like to upload a fix for open-vm-tools to proposed-updates which
actually allows to recognize buster.

`lsb_release -sd` currently prints
   Debian GNU/Linux 10 (buster)
but the current implementation in open-vm-tools expects 10. in the
output.

I'd assume that this issue will be fixed with the pointrelease anyway,
as the lsb_release output should change to 10.1, but I think it makes
sense to fix it, just in case people do partial upgrades.

Diff is attached.


Thanks,

Bernd

-- 
 Bernd Zeimetz                            Debian GNU/Linux Developer
 http://bzed.de                                http://www.debian.org
 GPG Fingerprint: ECA1 E3F2 8E11 2432 D485  DD95 EB36 171A 6FF9 435F

diff --git a/debian/changelog b/debian/changelog
index fdd98af2..316bfa27 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+open-vm-tools (2:10.3.10-1+deb10u1) buster; urgency=medium
+
+  * [efb4df1] Fix guest OS reporting for Debian/Buster.
+    Without this fix, open-vm-tools report other4xLinux64Guest instead of
+    Debian/Buster.
+    Reason is the output of lsb_release, which outputs:
+    $ lsb_release -sd
+    Debian GNU/Linux 10 (buster)
+    But the code in open-vm-tools expects '10.'.
+    Thanks to Oliver Kurth (Closes: #934005)
+  * [2308b74] Updating gbp.conf for buster.
+
+ -- Bernd Zeimetz <bzed@debian.org>  Wed, 07 Aug 2019 21:09:29 +0200
+
 open-vm-tools (2:10.3.10-1) unstable; urgency=high
 
   * [122e511] Update upstream source from tag 'upstream/10.3.10'
diff --git a/debian/gbp.conf b/debian/gbp.conf
index bf4163e8..9a54689e 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,3 +1,6 @@
+[DEFAULT]
+debian-branch = buster
+
 [buildpackage]
 sign-tags = True
 posttag = git push && git push --tags
diff --git a/debian/patches/fix-buster-OS-reporting b/debian/patches/fix-buster-OS-reporting
new file mode 100644
index 00000000..eb9b2159
--- /dev/null
+++ b/debian/patches/fix-buster-OS-reporting
@@ -0,0 +1,11 @@
+--- a/open-vm-tools/lib/misc/hostinfoPosix.c
++++ b/open-vm-tools/lib/misc/hostinfoPosix.c
+@@ -814,7 +814,7 @@ HostinfoGetOSShortName(char *distro,
+          Str_Strcpy(distroShort, STR_OS_DEBIAN_8, distroShortSize);
+       } else if (strstr(distroLower, "9.")) {
+          Str_Strcpy(distroShort, STR_OS_DEBIAN_9, distroShortSize);
+-      } else if (strstr(distroLower, "10.")) {
++      } else if (strstr(distroLower, "10")) {
+          Str_Strcpy(distroShort, STR_OS_DEBIAN_10, distroShortSize);
+       }
+    } else if (StrUtil_StartsWith(distroLower, "enterprise linux") ||
diff --git a/debian/patches/series b/debian/patches/series
index 8140b204..39debc1e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 debian/pam-use-common-auth-account
 debian/max_nic_count
 debian/scsi-udev-rule
+fix-buster-OS-reporting