lp://staging/~n-muench/ubuntu/saucy/open-vm-tools/open-vm-tools.sept-update.merge
- Get this branch:
- bzr branch lp://staging/~n-muench/ubuntu/saucy/open-vm-tools/open-vm-tools.sept-update.merge
Branch merges
- Iain Lane (community): Approve
-
Diff: 34699 lines (+14284/-9328)215 files modified.pc/0001-kvers.patch/modules/linux/vmblock/Makefile (+2/-23)
.pc/0001-kvers.patch/modules/linux/vmci/Makefile (+2/-23)
.pc/0001-kvers.patch/modules/linux/vmhgfs/Makefile (+2/-23)
.pc/0001-kvers.patch/modules/linux/vmsync/Makefile (+2/-23)
.pc/0001-kvers.patch/modules/linux/vmxnet/Makefile (+2/-23)
.pc/0001-kvers.patch/modules/linux/vsock/Makefile (+2/-23)
.pc/0002-dkms.patch/modules/linux/dkms.conf (+1/-1)
.pc/0003-dkms-vmsync.patch/modules/linux/dkms.conf (+1/-1)
.pc/0005-dkms-vmci-remove.patch/modules/linux/dkms.conf (+34/-0)
.pc/0005-linux-310-fix.patch/modules/linux/shared/compat_fs.h (+0/-266)
.pc/0005-linux-310-fix.patch/modules/linux/vmblock/linux/control.c (+0/-375)
.pc/0005-linux-310-fix.patch/modules/linux/vmblock/linux/dentry.c (+0/-118)
.pc/0005-linux-310-fix.patch/modules/linux/vmblock/linux/inode.c (+0/-232)
.pc/0005-linux-310-fix.patch/modules/linux/vmhgfs/file.c (+0/-1280)
.pc/0005-linux-310-fix.patch/modules/linux/vmsync/sync.c (+0/-711)
.pc/0006-linux-311-fix.patch/modules/linux/vmblock/linux/file.c (+0/-244)
.pc/0006-vmblock-fixes.patch/modules/linux/vmblock/linux/control.c (+375/-0)
.pc/0006-vmblock-fixes.patch/modules/linux/vmblock/linux/file.c (+244/-0)
.pc/0007-dkms-suppress-error.patch/modules/linux/dkms.conf (+0/-34)
.pc/0007-linux-311-vmhgfs-fix.patch/modules/linux/vmhgfs/inode.c (+2239/-0)
.pc/applied-patches (+3/-3)
ChangeLog (+5/-0)
NEWS (+9/-0)
autom4te.cache/output.0 (+10/-10)
autom4te.cache/output.1 (+10/-10)
autom4te.cache/output.2 (+10/-10)
autom4te.cache/traces.1 (+1/-1)
configure (+10/-10)
configure.ac (+2/-2)
debian/changelog (+21/-0)
debian/open-vm-tools-dkms.dkms (+5/-1)
debian/open-vm-tools.init (+2/-2)
debian/patches/0005-dkms-vmci-remove.patch (+45/-0)
debian/patches/0005-linux-310-fix.patch (+0/-225)
debian/patches/0006-linux-311-fix.patch (+0/-94)
debian/patches/0006-vmblock-fixes.patch (+130/-0)
debian/patches/0007-dkms-suppress-error.patch (+0/-41)
debian/patches/0007-linux-311-vmhgfs-fix.patch (+43/-0)
debian/patches/series (+3/-3)
debian/rules (+3/-1)
lib/asyncsocket/asyncSocketInt.h (+11/-3)
lib/asyncsocket/asyncsocket.c (+426/-246)
lib/file/file.c (+50/-0)
lib/file/fileIO.c (+34/-13)
lib/file/fileLockPrimitive.c (+22/-13)
lib/file/filePosix.c (+77/-290)
lib/file/fileTemp.c (+41/-1)
lib/foundryMsg/foundryMsg.c (+2/-0)
lib/foundryMsg/foundryPropertyListCommon.c (+304/-99)
lib/foundryMsg/vixTranslateErrOpenSource.c (+3/-0)
lib/hgfsServer/hgfsServer.c (+192/-89)
lib/hgfsServer/hgfsServerInt.h (+31/-131)
lib/hgfsServer/hgfsServerLinux.c (+32/-5)
lib/hgfsServer/hgfsServerPacketUtil.c (+426/-278)
lib/hgfsServer/hgfsServerParameters.c (+104/-91)
lib/hgfsServer/hgfsServerParameters.h (+39/-37)
lib/hgfsServerManagerGuest/hgfsChannelGuestBd.c (+8/-13)
lib/include/asyncsocket.h (+10/-22)
lib/include/buildNumber.h (+6/-6)
lib/include/clamped.h (+36/-0)
lib/include/community_source.h (+0/-1)
lib/include/compat/compat_stdarg.h (+0/-1)
lib/include/file.h (+4/-0)
lib/include/guest_os.h (+2/-1)
lib/include/guest_os_tables.h (+117/-116)
lib/include/hgfsServer.h (+12/-11)
lib/include/hgfsTransport.h (+19/-6)
lib/include/includeCheck.h (+0/-6)
lib/include/loglevel_user.h (+7/-1)
lib/include/mutexRankLib.h (+9/-11)
lib/include/poll.h (+1/-1)
lib/include/timeutil.h (+3/-1)
lib/include/tracer.hh (+61/-0)
lib/include/unicodeBase.h (+1/-1)
lib/include/util.h (+46/-1)
lib/include/uuid.h (+3/-2)
lib/include/vixCommands.h (+3/-9)
lib/include/vixOpenSource.h (+26/-13)
lib/include/vm_assert.h (+23/-18)
lib/include/vm_atomic.h (+166/-97)
lib/include/vm_basic_asm.h (+28/-25)
lib/include/vm_basic_asm_x86.h (+0/-1)
lib/include/vm_basic_defs.h (+30/-2)
lib/include/vm_basic_math.h (+11/-1)
lib/include/vm_basic_types.h (+23/-3)
lib/include/vm_product.h (+1/-4)
lib/include/vm_product_versions.h (+15/-11)
lib/include/vm_tools_version.h (+36/-1)
lib/include/vmci_defs.h (+2/-2)
lib/include/vmci_sockets.h (+1/-1)
lib/include/vmware/guestrpc/capabilities.h (+2/-0)
lib/include/vmware/guestrpc/tclodefs.h (+6/-5)
lib/include/vmware/tools/guestrpc.h (+37/-84)
lib/include/vmware/tools/utils.h (+9/-0)
lib/include/vthreadBase.h (+1/-1)
lib/include/win32util.h (+0/-1)
lib/include/x86cpuid.h (+428/-382)
lib/misc/codeset.c (+10/-14)
lib/misc/hostinfoPosix.c (+35/-6)
lib/misc/msgfmt.c (+12/-2)
lib/misc/timeutil.c (+59/-1)
lib/misc/vthreadBase.c (+272/-324)
lib/poll/poll.c (+220/-208)
lib/procMgr/procMgrPosix.c (+16/-4)
lib/rpcChannel/Makefile.am (+2/-0)
lib/rpcChannel/Makefile.in (+21/-2)
lib/rpcChannel/bdoorChannel.c (+97/-91)
lib/rpcChannel/rpcChannel.c (+406/-12)
lib/rpcChannel/rpcChannelInt.h (+36/-0)
lib/rpcChannel/simpleSocket.c (+635/-0)
lib/rpcChannel/simpleSocket.h (+89/-0)
lib/rpcChannel/vsockChannel.c (+579/-0)
lib/rpcIn/rpcin.c (+8/-8)
lib/slashProc/net.c (+4/-4)
lib/syncDriver/syncDriverPosix.c (+1/-1)
lib/system/systemLinux.c (+20/-1)
lib/unicode/unicodeSimpleBase.c (+1/-1)
lib/user/Makefile.am (+1/-0)
lib/user/Makefile.in (+3/-2)
lib/user/util.c (+6/-534)
lib/user/utilBacktrace.c (+521/-0)
libguestlib/Makefile.am (+4/-0)
libguestlib/Makefile.in (+28/-5)
libguestlib/vmGuestLib.c (+6/-3)
libvmtools/Makefile.am (+1/-0)
libvmtools/Makefile.in (+10/-2)
libvmtools/guestSDKLog.c (+149/-0)
libvmtools/vmtoolsInt.h (+12/-0)
libvmtools/vmtoolsLog.c (+94/-25)
libvmtools/vmxLogger.c (+12/-7)
modules/linux/dkms.conf (+16/-6)
modules/linux/dkms.sh (+2/-2)
modules/linux/shared/compat_fs.h (+12/-0)
modules/linux/shared/vmci_defs.h (+2/-2)
modules/linux/shared/vmci_kernel_if.h (+17/-25)
modules/linux/vmblock/Makefile (+2/-23)
modules/linux/vmblock/linux/control.c (+10/-9)
modules/linux/vmblock/linux/dentry.c (+4/-3)
modules/linux/vmblock/linux/inode.c (+2/-2)
modules/linux/vmci/Makefile (+2/-23)
modules/linux/vmci/common/vmciContext.c (+1/-2)
modules/linux/vmci/common/vmciContext.h (+3/-3)
modules/linux/vmci/common/vmciDatagram.c (+7/-9)
modules/linux/vmci/common/vmciDoorbell.h (+2/-2)
modules/linux/vmci/common/vmciDriver.h (+2/-2)
modules/linux/vmci/common/vmciHashtable.h (+2/-2)
modules/linux/vmci/common/vmciQPair.c (+2/-14)
modules/linux/vmci/common/vmciQueuePair.c (+122/-180)
modules/linux/vmci/common/vmciResource.h (+2/-2)
modules/linux/vmci/common/vmciRoute.c (+1/-3)
modules/linux/vmci/common/vmciRoute.h (+2/-2)
modules/linux/vmci/linux/driver.c (+19/-6)
modules/linux/vmci/linux/vmciKernelIf.c (+121/-156)
modules/linux/vmci/linux/vmci_version.h (+4/-4)
modules/linux/vmci/shared/pgtbl.h (+27/-22)
modules/linux/vmhgfs/Makefile (+2/-23)
modules/linux/vmhgfs/dir.c (+549/-191)
modules/linux/vmhgfs/file.c (+74/-116)
modules/linux/vmhgfs/fsutil.c (+137/-8)
modules/linux/vmhgfs/fsutil.h (+1/-0)
modules/linux/vmhgfs/inode.c (+71/-10)
modules/linux/vmhgfs/link.c (+66/-10)
modules/linux/vmhgfs/page.c (+92/-76)
modules/linux/vmhgfs/request.c (+2/-3)
modules/linux/vmhgfs/vmci.c (+19/-8)
modules/linux/vmsync/Makefile (+2/-23)
modules/linux/vmsync/sync.c (+8/-12)
modules/linux/vmxnet/Makefile (+2/-23)
modules/linux/vsock/Makefile (+2/-23)
modules/linux/vsock/linux/vsockVmci.h (+3/-0)
modules/linux/vsock/linux/vsock_version.h (+4/-4)
modules/shared/vmmemctl/os.h (+4/-1)
modules/shared/vmxnet/eth_public.h (+1/-1)
modules/shared/vmxnet/vmnet_def.h (+1/-0)
modules/shared/vmxnet/vmxnet2_def.h (+0/-2)
modules/shared/vmxnet/vmxnet3_defs.h (+1/-0)
modules/solaris/vmxnet3/vmxnet3_tx.c (+9/-4)
scripts/common/vm-support (+3/-2)
services/plugins/desktopEvents/sessionMgr.c (+45/-8)
services/plugins/desktopEvents/xioError.c (+1/-0)
services/plugins/dndcp/Makefile.am (+2/-2)
services/plugins/dndcp/Makefile.in (+16/-5)
services/plugins/dndcp/copyPasteDnDX11.cpp (+17/-23)
services/plugins/dndcp/copyPasteUIX11.cpp (+5/-4)
services/plugins/dndcp/dnd/dndLinux.c (+8/-0)
services/plugins/dndcp/dndGuest/copyPasteRpcV3.cc (+18/-17)
services/plugins/dndcp/dndGuest/dndCPTransportGuestRpc.cpp (+1/-1)
services/plugins/dndcp/dndGuest/dndRpcV3.cc (+31/-30)
services/plugins/dndcp/dndGuest/guestCopyPaste.hh (+3/-2)
services/plugins/dndcp/dndGuest/guestCopyPasteDest.cc (+6/-4)
services/plugins/dndcp/dndGuest/guestCopyPasteMgr.cc (+54/-24)
services/plugins/dndcp/dndGuest/guestCopyPasteSrc.cc (+9/-7)
services/plugins/dndcp/dndGuest/guestDnDDest.cc (+20/-18)
services/plugins/dndcp/dndGuest/guestDnDMgr.cc (+80/-38)
services/plugins/dndcp/dndGuest/guestDnDSrc.cc (+21/-21)
services/plugins/dndcp/dndUIX11.cpp (+1093/-732)
services/plugins/dndcp/dndUIX11.h (+91/-69)
services/plugins/dndcp/stringxx/string.cc (+4/-2)
services/plugins/dndcp/stringxx/ubstr_t.hh (+5/-5)
services/plugins/dndcp/xutils/xutils.cc (+1370/-0)
services/plugins/dndcp/xutils/xutils.hh (+117/-0)
services/plugins/guestInfo/getlib/guestInfoPosix.c (+43/-0)
services/plugins/guestInfo/guestInfoServer.c (+7/-3)
services/plugins/vix/vixTools.c (+27/-8)
services/plugins/vmbackup/Makefile.am (+12/-0)
services/plugins/vmbackup/Makefile.in (+21/-4)
services/plugins/vmbackup/guestQuiesce.x (+48/-0)
services/plugins/vmbackup/stateMachine.c (+22/-14)
services/vmtoolsd/mainPosix.c (+52/-3)
services/vmtoolsd/toolsRpc.c (+4/-4)
tests/vmrpcdbg/Makefile.am (+1/-0)
tests/vmrpcdbg/Makefile.in (+1/-1)
tests/vmrpcdbg/debugChannel.c (+12/-5)
toolbox/toolbox-cmd.c (+1/-1)
toolbox/toolboxcmd-shrink.c (+2/-1)
Related bugs
Bug #1231148: FFe: requested for Saucy package because of module build failure | Undecided | Fix Released |
|
Bug #1236265: vmghfs not being build | Undecided | Fix Released |
|
Related blueprints
Branch information
- Owner:
- Nate Muench (Mink)
- Status:
- Merged
Recent revisions
- 38. By Nate Muench (Mink)
-
* Merging upstream version 2013.09.16-1328054.
* debian/rules:
- Add Wno-unused-variable to CFLAGS.
- Create the /mnt/hgfs directory during install
+ When folders are shared from the host machine, they are automatically
mounted at /mnt/hgfs.* debian/patches:
- Removed 0005-linux-310-fix. patch, 0006-linux- 311-fix. patch,
and 0007-dkms-supress- error.patch
+ No longer needed.
- Add 0005-dkms-vmci-remove. patch
+ Fixes "Invalid argument" when loading vmhgfs module. (LP: #1236265)
- Add 0006-vmblock-fixes.patch & 0007-linux- 311-vmhgfs- fix.patch
+ Fixes remaining problems with the vmblock and vmhgfs modules. - 37. By Nate Muench (Mink)
-
* FFe LP: #1231148
* Ubuntu-specific Changes
- debian/rules: Removed Wno-error=unused- local-typedefs from CLFAGS.
+ We now enforce building with GCC 4.7.- debian/patches: Add 0005-linux-
310-fix. patch & 0006-linux- 311-fix. patch
+ Fixes building against Saucy Kernels. (LP: #1194940, LP: #1208011)- debian/patches: Add 0007-dkms-
supress- error.patch
+ Don't build modules that are broken, so modules that do build
are available to be loaded.
+ Will be removed after next upstream release.* Items merged from Debian experimental:
(From 2:9.2.2-893683-7 release)
- Removing purely cosmetical 'sleep 1' leftover in initscript.(From 2:9.2.3-1031360-2 release)
- Renaming debian-specific open-vm-toolbox package to open-vm-tools-
desktop for consistency with upstream.
- Revamping package descriptions.
- Renaming open-vm-dkms to open-vm-tools-dkms for consistent package
namespace.(From 2:9.2.3-1031360-3 release)
- Adding initial systemd service file from fedora.(From 2:9.2.3-1031360-4 release)
- Dropping kfreebsd from architecture list, it has never built and
nobody seems willing to make it work (neither upstream, porters, nor
users).(From 2:9.2.3-1031360-6 release)
- Correcting syntax of file entries in copyright.
- Adding section override for open-vm-tools-dkms.
- Enforcing build with gcc 4.7 for the time being. - 36. By Nate Muench (Mink)
-
* Merging upstream version 2013.04.16-1098359.
- Fixes building on Saucy kernels (LP: #1175295).* Stop DKMS from building vmci & vsock modules
- Modules are now in the kernel.* debian/patches:
- Removing procps.patch, not needed anymore.
- Removed 0005-kernel-38-fixes. patch
+ No longer needed.
- Renumbering patches.* debian/rules:
- Added Wno-error=unused- local-typedefs to CLFAGS
+ Suppresses build errors with GCC 4.8.* Items merged from Debian:
(From 2:9.2.2-893683-8 release)
- Adding patch from Mathias Krause <email address hidden> to fix
kernel stack memory leack in vsock module [CVE-2013-3237] - 35. By Nate Muench (Mink)
-
* Ubuntu-specific Changes
- debian/rules: Added LIBS field with -lpthread.
+ Fixes package compile failure for Raring and future Ubuntu Releases.* Items merged from Debian unstable:
(From 2:9.2.2-893683-1 release)
- Adding remote_fs dependency in initscript.
- Correcting architecture fields in control.(From 2:9.2.2-893683-2 release)
- Removing init order to network.(From 2:9.2.2-893683-4 release)
- Removing init order to network also on start.(From 2:9.2.2-893683-5 release)
- Updating to standards version 3.9.4.
- Updating year in copyright file.
- Prefixing patches with 4 digits for consistency.
- Tightening diff headers in patches.
- Dropping dpkg-source compression levels.(From 2:9.2.2-893683-6 release)
- Remove all references to Daniel's old email address. - 34. By Nate Muench (Mink)
-
* debian/patches: Rename 05-vmhgfs.patch to 05-kernel-
38-fixes. patch.
- Since it contains fixes to more than 1 file.
- Add vmci fixes recommended from upstream
+ Will be added in next release (whenever that is). - 33. By Nate Muench (Mink)
-
* Merging upstream version 2012.12.26-958366.
* Added 04-dkms-
vmsync. patch: An additional to 03-dkms.patch
- Deletes lines involving vmsync, adjust other numbers.
- Module compile still fails if we don't add this patch.
- This keeps the 03-dkms.patch unmodified.* Added 05-vmhgfs.patch:
- Fixes vmxnet compile issues with 3.8 kernel (LP: #1100096)* Stop dkms from building vmblock module.
- vmblock-fuse takes care of this now.
+ Modules still build, but this gets rid of the vmblock-related
warning message - 30. By Nate Muench (Mink)
-
* debian/
open-vm- tools.init: Add if statement to check for vmxnet module,
and if found, remove pcnet32 module.
* debian/control: Remove open-vm-source package.
- Only needed to add back open-vm-toolbox for Oneiric->Precise upgrade.* Items merged from Debian unstable:
- Switching to xz compression.
- Adding sleep during restart in initscript.
- Removing old dpkg trigger for update-initramfs.
- Updating GPL boilerplate in copyright file. - 29. By Nate Muench (Mink)
-
* Merging upstream version 2012.05.21-724730.
- Fixes building against the current Quantal kernel. (LP: #1000344)
- Fixes Quantal installation issues. (LP: #1019031)* Sync with Debian
- Updating to debhelper version 9.
- Updating to standards version 3.9.3.
- Updating copyright file machine-readable format version 1.0.
- Building without multiarch paths for now
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://staging/ubuntu/saucy/open-vm-tools