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

Proposed by Christian Ehrhardt 
Status: Merged
Approved by: Christian Ehrhardt 
Approved revision: fbbac84911826467279b1b249b4775cd213e63ab
Merge reported by: Christian Ehrhardt 
Merged at revision: fbbac84911826467279b1b249b4775cd213e63ab
Proposed branch: ~paelzer/ubuntu/+source/open-vm-tools:lp1901116-merge.11.2.0-HIRSUTE
Merge into: ubuntu/+source/open-vm-tools:debian/sid
Diff against target: 123 lines (+70/-2)
5 files modified
debian/changelog (+17/-0)
debian/control (+2/-1)
debian/patches/fix-FTBFS-glibc2.32.patch (+49/-0)
debian/patches/series (+1/-0)
debian/rules (+1/-1)
Reviewer Review Type Date Requested Status
Christian Ehrhardt  Approve
Sergio Durigan Junior Needs Information
Canonical Server Team Pending
Ubuntu Server Dev import team Pending
Review via email: mp+393106@code.launchpad.net
To post a comment you must log in.
Christian Ehrhardt  (paelzer) wrote :

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) wrote :

I'll review this one.

Sergio Durigan Junior (sergiodj) wrote :

* 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) wrote :

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).

review: Approve
Christian Ehrhardt  (paelzer) wrote :

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) wrote :

is in hirsute

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 94d14c8..e04ed8e 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,12 @@
6+open-vm-tools (2:11.2.0-1ubuntu1) hirsute; urgency=medium
7+
8+ * Merge with Debian unstable (LP: #1901116). Remaining changes:
9+ - d/rules: avoid FTBFS by ignoring nonnull errors for now
10+ - d/p/fix-FTBFS-glibc2.32.patch: fix tirpc flags to propagate correctly
11+ fixing an FTFBS with glibc >=2.32
12+
13+ -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Fri, 30 Oct 2020 11:58:55 +0100
14+
15 open-vm-tools (2:11.2.0-1) unstable; urgency=medium
16
17 * [447d833] Update upstream source from tag 'upstream/11.2.0'
18@@ -10,6 +19,14 @@ open-vm-tools (2:11.2.0-1) unstable; urgency=medium
19
20 -- Bernd Zeimetz <bzed@debian.org> Sun, 25 Oct 2020 19:33:02 +0100
21
22+open-vm-tools (2:11.1.5-1ubuntu1) groovy; urgency=medium
23+
24+ * d/p/fix-FTBFS-glibc2.32.patch: fix tirpc flags to propagate correctly
25+ fixing an FTFBS with glibc >=2.32
26+ * d/rules: avoid FTBFS by ignoring nonnull errors for now
27+
28+ -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Tue, 29 Sep 2020 13:37:20 +0200
29+
30 open-vm-tools (2:11.1.5-1) unstable; urgency=medium
31
32 * [5515c98] Don't recommend xserver-xorg-input-vmmouse.
33diff --git a/debian/control b/debian/control
34index d13065a..407816b 100644
35--- a/debian/control
36+++ b/debian/control
37@@ -1,7 +1,8 @@
38 Source: open-vm-tools
39 Section: admin
40 Priority: optional
41-Maintainer: Bernd Zeimetz <bzed@debian.org>
42+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
43+XSBC-Original-Maintainer: Bernd Zeimetz <bzed@debian.org>
44 Build-Depends:
45 debhelper-compat (= 12), doxygen, libcunit1-dev,
46 libfuse-dev, libgtkmm-3.0-dev, libgtk-3-dev,
47diff --git a/debian/patches/fix-FTBFS-glibc2.32.patch b/debian/patches/fix-FTBFS-glibc2.32.patch
48new file mode 100644
49index 0000000..f7ca692
50--- /dev/null
51+++ b/debian/patches/fix-FTBFS-glibc2.32.patch
52@@ -0,0 +1,49 @@
53+Description: fix FTFBS with glibc2.32 due to rpc vs tirpc
54+ Found by the full groovy rebuild this FTBFS is due to
55+ glibc2.32 dropping the option to enable the outdated
56+ compat rpc support.
57+ That means finally everything has to use tirpc for real.
58+ In the case of open-vm-tools a few makefiles needed to
59+ get the right variables (already detected by pkg-config)
60+ propagated.
61+Forwarded: yes (https://github.com/vmware/open-vm-tools/pull/469)
62+Author: Christian Ehrhardt <christian.ehrhardt@canonical.com>
63+Last-Update: 2020-09-29
64+--- a/open-vm-tools/tests/testDebug/Makefile.am
65++++ b/open-vm-tools/tests/testDebug/Makefile.am
66+@@ -22,6 +22,7 @@ libtestDebug_la_CPPFLAGS =
67+ libtestDebug_la_CPPFLAGS += @CUNIT_CPPFLAGS@
68+ libtestDebug_la_CPPFLAGS += @GOBJECT_CPPFLAGS@
69+ libtestDebug_la_CPPFLAGS += @PLUGIN_CPPFLAGS@
70++libtestDebug_la_CPPFLAGS += @XDR_CPPFLAGS@
71+
72+ libtestDebug_la_LDFLAGS =
73+ libtestDebug_la_LDFLAGS += @PLUGIN_LDFLAGS@
74+@@ -30,6 +31,7 @@ libtestDebug_la_LIBADD =
75+ libtestDebug_la_LIBADD += @CUNIT_LIBS@
76+ libtestDebug_la_LIBADD += @GOBJECT_LIBS@
77+ libtestDebug_la_LIBADD += @VMTOOLS_LIBS@
78++libtestDebug_la_LIBADD += @XDR_LIBS@
79+ libtestDebug_la_LIBADD += ../vmrpcdbg/libvmrpcdbg.la
80+
81+ libtestDebug_la_SOURCES =
82+--- a/open-vm-tools/tests/testPlugin/Makefile.am
83++++ b/open-vm-tools/tests/testPlugin/Makefile.am
84+@@ -22,6 +22,7 @@ libtestPlugin_la_CPPFLAGS =
85+ libtestPlugin_la_CPPFLAGS += @CUNIT_CPPFLAGS@
86+ libtestPlugin_la_CPPFLAGS += @GOBJECT_CPPFLAGS@
87+ libtestPlugin_la_CPPFLAGS += @PLUGIN_CPPFLAGS@
88++libtestPlugin_la_CPPFLAGS += @XDR_CPPFLAGS@
89+
90+ libtestPlugin_la_LDFLAGS =
91+ libtestPlugin_la_LDFLAGS += @PLUGIN_LDFLAGS@
92+--- a/open-vm-tools/tests/vmrpcdbg/Makefile.am
93++++ b/open-vm-tools/tests/vmrpcdbg/Makefile.am
94+@@ -21,6 +21,7 @@ libvmrpcdbg_la_CPPFLAGS =
95+ libvmrpcdbg_la_CPPFLAGS += @CUNIT_CPPFLAGS@
96+ libvmrpcdbg_la_CPPFLAGS += @GMODULE_CPPFLAGS@
97+ libvmrpcdbg_la_CPPFLAGS += @VMTOOLS_CPPFLAGS@
98++libvmrpcdbg_la_CPPFLAGS += @XDR_CPPFLAGS@
99+ libvmrpcdbg_la_CPPFLAGS += -I$(top_srcdir)/lib/rpcChannel
100+
101+ libvmrpcdbg_la_LDFLAGS =
102diff --git a/debian/patches/series b/debian/patches/series
103index b45387d..0b20601 100644
104--- a/debian/patches/series
105+++ b/debian/patches/series
106@@ -1,3 +1,4 @@
107 use-debian-pam
108 debian/max_nic_count
109 debian/scsi-udev-rule
110+fix-FTBFS-glibc2.32.patch
111diff --git a/debian/rules b/debian/rules
112index 7b965de..5f2cad2 100755
113--- a/debian/rules
114+++ b/debian/rules
115@@ -21,7 +21,7 @@ override_dh_auto_configure:
116 --enable-xmlsec1 \
117 --with-gtk3 \
118 --enable-servicediscovery \
119- CFLAGS="-fPIC -Wno-error=deprecated-declarations -Wno-error=address-of-packed-member $(CFLAGS)" \
120+ CFLAGS="-fPIC -Wno-error=deprecated-declarations -Wno-error=address-of-packed-member -Wno-nonnull $(CFLAGS)" \
121 CUSTOM_PROCPS_NAME=procps
122
123 override_dh_auto_install:

Subscribers

People subscribed via source and target branches