Ubuntu
open-vm-tools package

Merge ~paelzer/ubuntu/+source/open-vm-tools:merge-cosmic-10.3 into ubuntu/+source/open-vm-tools:ubuntu/cosmic-devel

  1. Git
  2. lp:~paelzer/ubuntu/+source/open-vm-tools
  3. merge-cosmic-10.3
  4. Merge into ubuntu/cosmic-devel
Proposed by Christian Ehrhardt 
Status: Merged
Approved by: Christian Ehrhardt 
Approved revision: 70449ee4d6884077f8b97471ee5f7d959d5c4992
Merge reported by: Christian Ehrhardt 
Merged at revision: 70449ee4d6884077f8b97471ee5f7d959d5c4992
Proposed branch: ~paelzer/ubuntu/+source/open-vm-tools:merge-cosmic-10.3
Merge into: ubuntu/+source/open-vm-tools:ubuntu/cosmic-devel
Diff against target: 66644 lines (+42516/-11828) (has conflicts)
191 files modified
ReleaseNotes.md (+107/-68)
debian/changelog (+28/-0)
debian/patches/debian/enable_vmhgfs-fuse_by_default (+1/-1)
debian/patches/debian/scsi-udev-rule (+9/-6)
debian/patches/series (+0/-1)
dev/null (+0/-80)
open-vm-tools/AUTHORS (+23/-0)
open-vm-tools/ChangeLog (+36258/-8613)
open-vm-tools/LICENSE (+4/-64)
open-vm-tools/README (+3/-124)
open-vm-tools/common-agent/Cpp/Framework/Framework/include/BaseDefines.h (+1/-1)
open-vm-tools/common-agent/Cpp/Framework/Framework/include/Exception/CCafException.h (+8/-1)
open-vm-tools/common-agent/Cpp/Framework/Framework/include/Memory/DynamicArray/TDynamicArray.h (+7/-3)
open-vm-tools/common-agent/Cpp/Framework/Framework/src/Common/CApplicationContext.cpp (+2/-2)
open-vm-tools/common-agent/Cpp/Framework/Framework/src/Integration/Core/CDocument.cpp (+2/-1)
open-vm-tools/common-agent/Cpp/Framework/Framework/src/Integration/Core/CIntMessage.cpp (+2/-1)
open-vm-tools/common-agent/Cpp/Framework/Subsystems/Integration/src/CRecipientListRouterInstance.cpp (+2/-1)
open-vm-tools/common-agent/Cpp/ManagementAgent/Subsystems/MaIntegration/src/CConfigEnvMerge.cpp (+5/-1)
open-vm-tools/common-agent/Cpp/ManagementAgent/Subsystems/MaIntegration/src/CMonitorListener.cpp (+8/-3)
open-vm-tools/common-agent/Cpp/ManagementAgent/Subsystems/MaIntegration/src/CMonitorListener.h (+2/-4)
open-vm-tools/configure.ac (+209/-115)
open-vm-tools/lib/appUtil/appUtil.c (+1/-3)
open-vm-tools/lib/asyncsocket/asyncsocket.c (+191/-55)
open-vm-tools/lib/auth/authPosix.c (+11/-4)
open-vm-tools/lib/dynxdr/Makefile.am (+8/-2)
open-vm-tools/lib/dynxdr/dynxdr.c (+10/-6)
open-vm-tools/lib/file/file.c (+88/-72)
open-vm-tools/lib/file/fileIO.c (+18/-10)
open-vm-tools/lib/file/fileIOPosix.c (+81/-23)
open-vm-tools/lib/file/fileLockPrimitive.c (+37/-12)
open-vm-tools/lib/file/filePosix.c (+31/-7)
open-vm-tools/lib/file/fileStandAlone.c (+2/-2)
open-vm-tools/lib/file/fileTemp.c (+57/-17)
open-vm-tools/lib/file/fileTempPosix.c (+281/-130)
open-vm-tools/lib/guestApp/guestApp.c (+9/-9)
open-vm-tools/lib/guestRpc/Makefile.am (+7/-1)
open-vm-tools/lib/hashMap/hashMap.c (+88/-8)
open-vm-tools/lib/hgfs/hgfsEscape.c (+2/-2)
open-vm-tools/lib/hgfsServer/hgfsServer.c (+79/-92)
open-vm-tools/lib/hgfsServer/hgfsServerInt.h (+2/-2)
open-vm-tools/lib/hgfsServer/hgfsServerParameters.c (+74/-74)
open-vm-tools/lib/hgfsServer/hgfsServerParameters.h (+2/-2)
open-vm-tools/lib/include/asyncsocket.h (+6/-1)
open-vm-tools/lib/include/backdoor_def.h (+7/-3)
open-vm-tools/lib/include/buildNumber.h (+6/-6)
open-vm-tools/lib/include/conf.h (+23/-1)
open-vm-tools/lib/include/config.h (+4/-3)
open-vm-tools/lib/include/cpuid_info.h (+1/-28)
open-vm-tools/lib/include/deployPkg/linuxDeployment.h (+30/-2)
open-vm-tools/lib/include/err.h (+12/-4)
open-vm-tools/lib/include/file.h (+15/-24)
open-vm-tools/lib/include/fileIO.h (+11/-1)
open-vm-tools/lib/include/ghIntegrationCommon.h (+22/-1)
open-vm-tools/lib/include/guestStats.h (+70/-5)
open-vm-tools/lib/include/guest_os.h (+10/-10)
open-vm-tools/lib/include/guest_os_tables.h (+11/-5)
open-vm-tools/lib/include/hashMap.h (+2/-1)
open-vm-tools/lib/include/hgfsProto.h (+71/-47)
open-vm-tools/lib/include/hostinfo.h (+6/-5)
open-vm-tools/lib/include/libExport.hh (+19/-13)
open-vm-tools/lib/include/loglevel_user.h (+4/-3)
open-vm-tools/lib/include/nicInfo.h (+4/-2)
open-vm-tools/lib/include/poll.h (+8/-1)
open-vm-tools/lib/include/posix.h (+2/-1)
open-vm-tools/lib/include/rpcvmx.h (+7/-1)
open-vm-tools/lib/include/slashProc.h (+3/-3)
open-vm-tools/lib/include/str.h (+11/-32)
open-vm-tools/lib/include/strutil.h (+2/-1)
open-vm-tools/lib/include/syncDriver.h (+3/-2)
open-vm-tools/lib/include/system.h (+1/-4)
open-vm-tools/lib/include/unicodeBase.h (+6/-2)
open-vm-tools/lib/include/util.h (+4/-1)
open-vm-tools/lib/include/uuid.h (+12/-14)
open-vm-tools/lib/include/vm_atomic.h (+284/-192)
open-vm-tools/lib/include/vm_basic_asm.h (+3/-3)
open-vm-tools/lib/include/vm_basic_asm_x86_common.h (+5/-7)
open-vm-tools/lib/include/vm_basic_defs.h (+16/-59)
open-vm-tools/lib/include/vm_basic_types.h (+84/-141)
open-vm-tools/lib/include/vm_device_version.h (+7/-2)
open-vm-tools/lib/include/vm_legal.h (+7/-6)
open-vm-tools/lib/include/vm_product.h (+7/-12)
open-vm-tools/lib/include/vm_product_versions.h (+49/-34)
open-vm-tools/lib/include/vm_tools_version.h (+32/-4)
open-vm-tools/lib/include/vmblock.h (+3/-1)
open-vm-tools/lib/include/vmware/guestrpc/deploypkg.h (+5/-2)
open-vm-tools/lib/include/vmware/tools/guestrpc.h (+16/-15)
open-vm-tools/lib/include/vmware/tools/plugin.h (+3/-1)
open-vm-tools/lib/include/vmware/tools/utils.h (+4/-1)
open-vm-tools/lib/include/wiper.h (+3/-3)
open-vm-tools/lib/include/x86cpuid.h (+107/-85)
open-vm-tools/lib/include/x86vendor.h (+2/-2)
open-vm-tools/lib/include/xdrutil.h (+20/-11)
open-vm-tools/lib/lock/ulInt.h (+1/-2)
open-vm-tools/lib/misc/hostinfoPosix.c (+634/-272)
open-vm-tools/lib/misc/posixPwd.c (+34/-1)
open-vm-tools/lib/misc/strutil.c (+42/-3)
open-vm-tools/lib/misc/timeutil.c (+3/-3)
open-vm-tools/lib/misc/utilMem.c (+171/-2)
open-vm-tools/lib/misc/util_misc.c (+4/-4)
open-vm-tools/lib/misc/vmstdio.c (+6/-6)
open-vm-tools/lib/misc/vthreadBase.c (+6/-4)
open-vm-tools/lib/netUtil/Makefile.am (+7/-1)
open-vm-tools/lib/nicInfo/Makefile.am (+7/-7)
open-vm-tools/lib/nicInfo/nicInfo.c (+8/-4)
open-vm-tools/lib/nicInfo/nicInfoInt.h (+4/-2)
open-vm-tools/lib/nicInfo/nicInfoPosix.c (+81/-28)
open-vm-tools/lib/panic/panic.c (+3/-3)
open-vm-tools/lib/rpcChannel/Makefile.am (+6/-1)
open-vm-tools/lib/rpcChannel/bdoorChannel.c (+9/-1)
open-vm-tools/lib/rpcChannel/rpcChannel.c (+172/-149)
open-vm-tools/lib/rpcChannel/rpcChannelInt.h (+14/-4)
open-vm-tools/lib/rpcChannel/vsockChannel.c (+5/-2)
open-vm-tools/lib/rpcVmx/rpcvmx.c (+29/-1)
open-vm-tools/lib/slashProc/Makefile.am (+2/-3)
open-vm-tools/lib/slashProc/net.c (+64/-32)
open-vm-tools/lib/sslDirect/sslDirect.c (+18/-5)
open-vm-tools/lib/string/str.c (+7/-79)
open-vm-tools/lib/syncDriver/syncDriverLinux.c (+9/-1)
open-vm-tools/lib/syncDriver/syncDriverPosix.c (+220/-13)
open-vm-tools/lib/system/systemLinux.c (+8/-82)
open-vm-tools/lib/user/util.c (+1/-2)
open-vm-tools/lib/user/utilBacktrace.c (+1/-2)
open-vm-tools/lib/vmCheck/vmcheck.c (+38/-9)
open-vm-tools/lib/wiper/wiperPosix.c (+17/-8)
open-vm-tools/libDeployPkg/Makefile.am (+5/-3)
open-vm-tools/libDeployPkg/linuxDeployment.c (+105/-61)
open-vm-tools/libguestlib/Makefile.am (+3/-1)
open-vm-tools/libvmtools/vmtoolsLog.c (+67/-16)
open-vm-tools/modules/Makefile.am (+17/-0)
open-vm-tools/modules/freebsd/vmblock/Makefile (+2/-1)
open-vm-tools/modules/freebsd/vmmemctl/Makefile (+2/-1)
open-vm-tools/modules/freebsd/vmmemctl/os.c (+42/-9)
open-vm-tools/modules/freebsd/vmxnet/Makefile (+2/-1)
open-vm-tools/modules/shared/vmblock/block.c (+49/-1)
open-vm-tools/modules/shared/vmblock/block.h (+2/-1)
open-vm-tools/modules/shared/vmmemctl/kernelStubs.h (+8/-3)
open-vm-tools/modules/shared/vmxnet/eth_public.h (+79/-42)
open-vm-tools/modules/shared/vmxnet/upt1_defs.h (+2/-1)
open-vm-tools/modules/shared/vmxnet/vmnet_def.h (+2/-1)
open-vm-tools/modules/shared/vmxnet/vmxnet3_defs.h (+29/-9)
open-vm-tools/modules/solaris/vmhgfs/kernelStubs.h (+8/-3)
open-vm-tools/scripts/linux/network (+2/-1)
open-vm-tools/services/plugins/deployPkg/deployPkg.c (+37/-10)
open-vm-tools/services/plugins/deployPkg/deployPkgLog.c (+30/-4)
open-vm-tools/services/plugins/desktopEvents/x11Lock.c (+57/-1)
open-vm-tools/services/plugins/dndcp/Makefile.am (+10/-1)
open-vm-tools/services/plugins/dndcp/copyPasteDnDX11.cpp (+13/-1)
open-vm-tools/services/plugins/dndcp/copyPasteUIX11.cpp (+145/-18)
open-vm-tools/services/plugins/dndcp/copyPasteUIX11.h (+21/-1)
open-vm-tools/services/plugins/dndcp/dndGuest/guestDnDDest.cc (+1/-1)
open-vm-tools/services/plugins/dndcp/fakeMouseWayland/fakeMouseWayland.cpp (+332/-0)
open-vm-tools/services/plugins/dndcp/fakeMouseWayland/fakeMouseWayland.h (+36/-0)
open-vm-tools/services/plugins/dndcp/stringxx/autoCPtr.hh (+3/-3)
open-vm-tools/services/plugins/guestInfo/Makefile.am (+3/-4)
open-vm-tools/services/plugins/guestInfo/diskInfo.c (+9/-2)
open-vm-tools/services/plugins/guestInfo/guestInfoInt.h (+1/-20)
open-vm-tools/services/plugins/guestInfo/guestInfoServer.c (+40/-3)
open-vm-tools/services/plugins/guestInfo/perfMonLinux.c (+546/-198)
open-vm-tools/services/plugins/hgfsServer/hgfsPlugin.c (+31/-18)
open-vm-tools/services/plugins/resolutionKMS/resolutionKMS.c (+2/-5)
open-vm-tools/services/plugins/resolutionSet/resolutionSet.c (+1/-2)
open-vm-tools/services/plugins/timeSync/timeSync.c (+3/-3)
open-vm-tools/services/plugins/timeSync/timeSync.h (+2/-2)
open-vm-tools/services/plugins/timeSync/timeSyncPosix.c (+2/-2)
open-vm-tools/services/plugins/vix/Makefile.am (+3/-1)
open-vm-tools/services/plugins/vix/foundryToolsDaemon.c (+3/-2)
open-vm-tools/services/plugins/vix/vixTools.c (+18/-11)
open-vm-tools/services/plugins/vix/vixToolsEnvVars.c (+16/-16)
open-vm-tools/services/plugins/vix/vixToolsInt.h (+3/-3)
open-vm-tools/services/plugins/vmbackup/Makefile.am (+3/-1)
open-vm-tools/services/plugins/vmbackup/stateMachine.c (+9/-2)
open-vm-tools/services/plugins/vmbackup/syncDriverOps.c (+3/-2)
open-vm-tools/services/plugins/vmbackup/vmBackupInt.h (+2/-1)
open-vm-tools/services/vmtoolsd/cmdLine.c (+11/-2)
open-vm-tools/services/vmtoolsd/l10n/de.vmsg (+5/-1)
open-vm-tools/services/vmtoolsd/l10n/ja.vmsg (+5/-1)
open-vm-tools/services/vmtoolsd/l10n/ko.vmsg (+5/-1)
open-vm-tools/services/vmtoolsd/pluginMgr.c (+1/-1)
open-vm-tools/services/vmtoolsd/toolsRpc.c (+5/-4)
open-vm-tools/toolbox/Makefile.am (+3/-1)
open-vm-tools/toolbox/toolboxcmd-info.c (+46/-4)
open-vm-tools/toolbox/toolboxcmd-shrink.c (+2/-2)
open-vm-tools/udev/99-vmware-scsi-udev.rules (+6/-2)
open-vm-tools/vgauth/cli/l10n/it.vmsg (+3/-3)
open-vm-tools/vgauth/service/fileLogger.c (+27/-1)
open-vm-tools/vgauth/service/log.c (+15/-97)
open-vm-tools/vgauth/serviceImpl/saml-xmlsec1.c (+5/-5)
open-vm-tools/vmblock-fuse/fsops.c (+60/-18)
open-vm-tools/vmblock-fuse/fsops.h (+5/-2)
open-vm-tools/vmhgfs-fuse/config.c (+2/-2)
open-vm-tools/vmware-user-suid-wrapper/main.c (+58/-21)
Conflict in debian/changelog
Reviewer Review Type Date Requested Status
Andreas Hasenack (community) Approve
Canonical Server Pending
git-ubuntu developers Pending
Review via email: mp+351958@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

Scope:
- This is a merge of 2:10.2.0-3ubuntu3 onto Debians newer 10.2.5-1+b1
- Most of our Delta is obsolete (ubuntu2 reverted ubuntu1)
- There is one change left, and after some confusion++ I realized I need to report that to Debian which is done now (https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=905170)
- In addition We want latest upstream 10.3 which Debian hasn't taken after a few weeks, so we go ahead

Usual tags are pushed to assist review:
To ssh://git.launchpad.net/~paelzer/ubuntu/+source/open-vm-tools
 * [new tag] lp1784638/old/ubuntu -> lp1784638/old/ubuntu
 * [new tag] lp1784638/reconstruct/2%10.2.0-3ubuntu3 -> lp1784638/reconstruct/2%10.2.0-3ubuntu3
 * [new tag] lp1784638/new/debian -> lp1784638/new/debian
 * [new tag] lp1784638/old/debian -> lp1784638/old/debian
 * [new tag] lp1784638/deconstruct/2%10.2.0-3ubuntu3 -> lp1784638/deconstruct/2%10.2.0-3ubuntu3
 * [new tag] lp1784638/logical/2%10.2.0-3ubuntu3 -> lp1784638/logical/2%10.2.0-3ubuntu3

Test PPA is available at: https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/3333
I tried to run tests, but there are neither own nor dependen packages with dep8 tests.
We will have VMware verify it anyway, so I guess that is ok.

FYI - Exactly the same but with a ~ubuntu0.18.04 will eventually go to Bionic as well (after verification by VMWare).

Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

The diff here looks odd still, please check from git instead :-/

Revision history for this message
Andreas Hasenack (ahasenack) wrote :

I see new/debian is pointing at 2:10.2.5-1 instead of 10.2.5-1+b1, is that what you intended? Maybe +b1 is a super recent upload? Anyway, continuing with 10.2.5-1

Revision history for this message
Andreas Hasenack (ahasenack) wrote :

Looking at the tags paelzer/lp1784638/reconstruct/2%10.2.0-3ubuntu3 and paelzer/lp1784638/deconstruct/2%10.2.0-3ubuntu3, which both point at b5d8e88b2cd37532e7d2312034630bf3f3649fbf, I wasn't expecting to find commits of the type "Import patches-unapplied version...." in there. Following the git workflow, shouldn't these have been replaced by the individual commits representing each change in d/changelog? Which in this case is one change per upload for 3ubuntu1, 3ubuntu2 and 3ubuntu3. And I know 3ubuntu2 cancels out 3ubuntu1, and that's squashed correctly in the logical tag later on, but in the deconstruct phase I was still expecting to see them as individual commits and replacing the git-ubuntu importer commit "Import patches-unapplied ...". This is more of a workflow question, since the end result is correct in the logical tag which only has "Disable PrivateTmp for the open-vm-tools.service (LP: #1758428)".

Revision history for this message
Andreas Hasenack (ahasenack) wrote :

The orig tarball you have is slightly different than the one from upstream.

Upstream has a toplevel directory of open-vm-tools-stable-10.3.0, whereas yours has a toplevel of just "open-vm-tools". Is that intentional, and does it matter?

The previous ubuntu package, 10.2.0, also had a versioned toplevel just like upstream's 10.3.0:
$ tar tvzf open-vm-tools_10.2.0.orig.tar.gz |head -n 1
drwxrwxr-x root/root 0 2017-12-15 19:11 open-vm-tools-stable-10.2.0/

Revision history for this message
Andreas Hasenack (ahasenack) wrote :

The rest looks fine. Also tested an upgrade in a cosmic vmware node, worked just fine, service was restarted. I did nothing further, though, expecting vmware to conduct a more thorough test.

=1 if you are fine with the orig tarball contents being slightly different (top-level dir).

review: Approve
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

Hi,
first discussion for the "workflowy" things:

for the pkg/import/2%10.2.5-1 tag - this is fine as +b1 is just a rebuild without any difference.
Interestingly I didn't even get a pkg/import/2%10.2.5-1+b1 tag to refer to anyway.

For the non-broken up commits, I knew that I will squash - paelzer/lp1784638/reconstruct/2%10.2.0-3ubuntu1 + paelzer/lp1784638/reconstruct/2%10.2.0-3ubuntu2 into "nothing" as they cancel.
Splitting those would only have been extra work without any gain, therefore I decided to keep them as is.
Finally paelzer/lp1784638/reconstruct/2%10.2.0-3ubuntu3 changes are broken into individual commits
(the remaining import commit in deconstruct is empty, so not worth to do extra work either).

=> in logical it looks just as usual, overall I decided for pragmatism than known-to-be-useless commit splits and since you understood it all just fine on review that confirms.
Now I want to turn it around, if that has taken you more than 10 minutes then the time is wasted on your instead of my side - what would be better then - maybe doing as I did (for efficiency), but mentioning in the first MP comment (to avoid the reviewer wondering)?

Let me know if you want me to modify my workflow in such cases - I'd also ad a note to the Wiki then I think.

Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

The reason for the tarball differences are that Debian (and I'm following that) is taking the content from upstream git (which has the directory structure as the orig tarball provided has and the two .md files on top).

Essentially, it is a git merge with upstream tag.
That also is why my changelog line reads exactly as:
 ... Merge with Upstream Tag stable-10.3.0 ...
not with "... tarball" or anything like it.

There was quite some pain to shift between the two modes in the last two cycles, so I followed how it is currently done to not need plenty of d/rules changes on top.

We might have tarball collisions if Debian decides to do slightly different (again), but there is not much I can do about that atm.

Thanks for the testing, in the meantime also VMWare came back and confirmed it being good for Cosmic and Bionic (I had both builds).

Sponsoring this into Cosmic now ...

Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

Tag pushed

Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

Uploaded to Cosmic

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches