Merge ~paelzer/ubuntu/+source/open-vm-tools:lp1901116-merge.11.2.0-HIRSUTE into ubuntu/+source/open-vm-tools:debian/sid

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

PPA: https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/4322/+packages

I pinged upstream (and the Debian maintainer for awareness) on both bugs after confirming they still exist as-is. Debian will face them as well once they upgrade libs/toolchain.

[Sergio Durigan Junior (sergiodj)]

I'll review this one.

[Sergio Durigan Junior (sergiodj)]

* Changelog:
  - [?] old content and logical tag match as expected
  - [√] changelog entry correct version and targeted codename
  - [√] changelog entries correct
  - [√] update-maintainer has been run

* Actual changes:
  - [√] no upstream changes to consider
  - [√] no further upstream version to consider
  - [√] debian changes look safe

* Old Delta:
  - [-] dropped changes are ok to be dropped
  - [√] nothing else to drop
  - [√] changes forwarded upstream/debian (if appropriate)

* New Delta:
  - [√] no new patches added
  - [-] patches match what was proposed upstream
  - [-] patches correctly included in debian/patches/series
  - [-] patches have correct DEP3 metadata

* Build/Test:
  - [√] build is ok
  - [√] verified PPA package installs/uninstalls
  - [-] autopkgtest against the PPA package passes
  - [√] sanity checks test fine

Thanks for the MP, Christian. So, I reviewed it as much as I could, but I'd like to ask you to provide the full git-ubuntu merge data (i.e., the tags logical, reconstruct, old/debian, etc...) so that I can do a full review, please.

I was able to properly build the package locally. I was also able to install it in a local container, without problems.

review: Needs Information

[Christian Ehrhardt  (paelzer)]

Hi Sergio - in that case (since it is small and maintained in git-ubuntu for a long time already) pkg/ubuntu/groovy-devel == split and it is just the two fixes we have + CL + update maintainer.
There just was no reason to do all the tagging and pushing as the complexity was so non-existing.

If everything else is fine then we can upload this to get some open threads resolved.
Also Bernd has got my contribs to be ready in Debian for the new toolchain (and then this will be a sync).

[Christian Ehrhardt  (paelzer)]

review: Approve

[Christian Ehrhardt  (paelzer)]

To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/open-vm-tools
 * [new tag] upload/2%11.2.0-1ubuntu1 -> upload/2%11.2.0-1ubuntu1

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading open-vm-tools_11.2.0-1ubuntu1.dsc: done.
  Uploading open-vm-tools_11.2.0.orig.tar.xz: done.
  Uploading open-vm-tools_11.2.0-1ubuntu1.debian.tar.xz: done.
  Uploading open-vm-tools_11.2.0-1ubuntu1_source.buildinfo: done.
  Uploading open-vm-tools_11.2.0-1ubuntu1_source.changes: done.
Successfully uploaded packages.

[Christian Ehrhardt  (paelzer)]

is in hirsute

diff --git a/debian/changelog b/debian/changelog
index 94d14c8..e04ed8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+open-vm-tools (2:11.2.0-1ubuntu1) hirsute; urgency=medium
+
+  * Merge with Debian unstable (LP: #1901116). Remaining changes:
+    - d/rules: avoid FTBFS by ignoring nonnull errors for now
+    - d/p/fix-FTBFS-glibc2.32.patch: fix tirpc flags to propagate correctly
+      fixing an FTFBS with glibc >=2.32
+
+ -- Christian Ehrhardt <[e-mail]>  Fri, 30 Oct 2020 11:58:55 +0100
+
 open-vm-tools (2:11.2.0-1) unstable; urgency=medium
 
   * [447d833] Update upstream source from tag 'upstream/11.2.0'
@@ -10,6 +19,14 @@ open-vm-tools (2:11.2.0-1) unstable; urgency=medium
 
  -- Bernd Zeimetz <[e-mail]>  Sun, 25 Oct 2020 19:33:02 +0100
 
+open-vm-tools (2:11.1.5-1ubuntu1) groovy; urgency=medium
+
+  * d/p/fix-FTBFS-glibc2.32.patch: fix tirpc flags to propagate correctly
+    fixing an FTFBS with glibc >=2.32
+  * d/rules: avoid FTBFS by ignoring nonnull errors for now
+
+ -- Christian Ehrhardt <[e-mail]>  Tue, 29 Sep 2020 13:37:20 +0200
+
 open-vm-tools (2:11.1.5-1) unstable; urgency=medium
 
   * [5515c98] Don't recommend xserver-xorg-input-vmmouse.
diff --git a/debian/control b/debian/control
index d13065a..407816b 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: open-vm-tools
 Section: admin
 Priority: optional
-Maintainer: Bernd Zeimetz <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Bernd Zeimetz <[e-mail]>
 Build-Depends:
  debhelper-compat (= 12), doxygen, libcunit1-dev,
  libfuse-dev, libgtkmm-3.0-dev, libgtk-3-dev,
diff --git a/debian/patches/fix-FTBFS-glibc2.32.patch b/debian/patches/fix-FTBFS-glibc2.32.patch
 new file mode 100644
index 0000000..f7ca692
--- /dev/null
+++ b/debian/patches/fix-FTBFS-glibc2.32.patch
@@ -0,0 +1,49 @@
+Description: fix FTFBS with glibc2.32 due to rpc vs tirpc
+ Found by the full groovy rebuild this FTBFS is due to
+ glibc2.32 dropping the option to enable the outdated
+ compat rpc support.
+ That means finally everything has to use tirpc for real.
+ In the case of open-vm-tools a few makefiles needed to
+ get the right variables (already detected by pkg-config)
+ propagated.
+Forwarded: yes (https://github.com/vmware/open-vm-tools/pull/469)
+Author: Christian Ehrhardt <[e-mail]>
+Last-Update: 2020-09-29
+--- a/open-vm-tools/tests/testDebug/Makefile.am
++++ b/open-vm-tools/tests/testDebug/Makefile.am
+@@ -22,6 +22,7 @@ libtestDebug_la_CPPFLAGS =
+ libtestDebug_la_CPPFLAGS += @CUNIT_CPPFLAGS@
+ libtestDebug_la_CPPFLAGS += @GOBJECT_CPPFLAGS@
+ libtestDebug_la_CPPFLAGS += @PLUGIN_CPPFLAGS@
++libtestDebug_la_CPPFLAGS += @XDR_CPPFLAGS@
+ 
+ libtestDebug_la_LDFLAGS =
+ libtestDebug_la_LDFLAGS += @PLUGIN_LDFLAGS@
+@@ -30,6 +31,7 @@ libtestDebug_la_LIBADD =
+ libtestDebug_la_LIBADD += @CUNIT_LIBS@
+ libtestDebug_la_LIBADD += @GOBJECT_LIBS@
+ libtestDebug_la_LIBADD += @VMTOOLS_LIBS@
++libtestDebug_la_LIBADD += @XDR_LIBS@
+ libtestDebug_la_LIBADD += ../vmrpcdbg/libvmrpcdbg.la
+ 
+ libtestDebug_la_SOURCES =
+--- a/open-vm-tools/tests/testPlugin/Makefile.am
++++ b/open-vm-tools/tests/testPlugin/Makefile.am
+@@ -22,6 +22,7 @@ libtestPlugin_la_CPPFLAGS =
+ libtestPlugin_la_CPPFLAGS += @CUNIT_CPPFLAGS@
+ libtestPlugin_la_CPPFLAGS += @GOBJECT_CPPFLAGS@
+ libtestPlugin_la_CPPFLAGS += @PLUGIN_CPPFLAGS@
++libtestPlugin_la_CPPFLAGS += @XDR_CPPFLAGS@
+ 
+ libtestPlugin_la_LDFLAGS =
+ libtestPlugin_la_LDFLAGS += @PLUGIN_LDFLAGS@
+--- a/open-vm-tools/tests/vmrpcdbg/Makefile.am
++++ b/open-vm-tools/tests/vmrpcdbg/Makefile.am
+@@ -21,6 +21,7 @@ libvmrpcdbg_la_CPPFLAGS =
+ libvmrpcdbg_la_CPPFLAGS += @CUNIT_CPPFLAGS@
+ libvmrpcdbg_la_CPPFLAGS += @GMODULE_CPPFLAGS@
+ libvmrpcdbg_la_CPPFLAGS += @VMTOOLS_CPPFLAGS@
++libvmrpcdbg_la_CPPFLAGS += @XDR_CPPFLAGS@
+ libvmrpcdbg_la_CPPFLAGS += -I$(top_srcdir)/lib/rpcChannel
+ 
+ libvmrpcdbg_la_LDFLAGS =
diff --git a/debian/patches/series b/debian/patches/series
index b45387d..0b20601 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 use-debian-pam
 debian/max_nic_count
 debian/scsi-udev-rule
+fix-FTBFS-glibc2.32.patch
diff --git a/debian/rules b/debian/rules
index 7b965de..5f2cad2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,7 +21,7 @@ override_dh_auto_configure:
 			--enable-xmlsec1 \
 			--with-gtk3  \
 			--enable-servicediscovery \
-			CFLAGS="-fPIC -Wno-error=deprecated-declarations -Wno-error=address-of-packed-member $(CFLAGS)" \
+			CFLAGS="-fPIC -Wno-error=deprecated-declarations -Wno-error=address-of-packed-member -Wno-nonnull $(CFLAGS)" \
 			CUSTOM_PROCPS_NAME=procps
 
 override_dh_auto_install: