Merge ~paelzer/ubuntu/+source/open-vm-tools:fix-FTFBS-gcc-10-glibc-2.32-GROOVY into ubuntu/+source/open-vm-tools:ubuntu/groovy-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

PPA: https://launchpad.net/~paelzer/+archive/ubuntu/open-vm-tools-groovy-ftbfs
Debian: https://salsa.debian.org/vmware-packaging-team/pkg-open-vm-tools/-/merge_requests/8
Upstream:
 https://github.com/vmware/open-vm-tools/issues/468
 https://github.com/vmware/open-vm-tools/issues/467

[Andreas Hasenack (ahasenack)]

+1. Curious about the no-nonnull error, though, did you find out what changed in gcc10 to flag it just now? https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html didn't say anything new

review: Approve

[Christian Ehrhardt  (paelzer)]

Tagged and uploaded.
Probably held back by the beta freeze.

diff --git a/debian/changelog b/debian/changelog
index 592c2f4..afd04b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+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/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 8140b20..5ac1b8e 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-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: