[Pkg-virtualbox-commits] [virtualbox] 13/14: Merge branch 'master' of https://github.com/LocutusOfBorg/virtualbox into gianfranco-master

Ritesh Raj Sarraf rrs at moszumanska.debian.org
Wed Jun 4 14:25:45 UTC 2014


This is an automated email from the git hooks/post-receive script.

rrs pushed a commit to branch master
in repository virtualbox.

commit 415634edf9aa44735330ec25e0c63c8cd4643d97
Merge: 11e69e9 a2a26c0
Author: Ritesh Raj Sarraf <rrs at debian.org>
Date:   Tue Jun 3 09:54:36 2014 -0400

    Merge branch 'master' of https://github.com/LocutusOfBorg/virtualbox into gianfranco-master
    
    Conflicts:
    	debian/virtualbox.lintian-overrides

 Config.kmk                                         |    9 +-
 Makefile.kmk                                       |   13 +
 debian/changelog                                   |   20 +-
 debian/patches/16-no-update.patch                  |    2 +-
 debian/patches/27-hide-host-cache-warning.patch    |    2 +-
 debian/patches/28-no-selinux-fedora.patch          |    2 +-
 debian/patches/29-fix-ftbfs-as-needed.patch        |    2 +-
 debian/patches/36-fix-vnc-version-string.patch     |    2 +-
 .../39-fix-wrong-vboxvideo_drv-source.patch        |   23 -
 debian/patches/series                              |    1 -
 debian/virtualbox.lintian-overrides                |    5 +
 doc/manual/en_US/user_AdvancedTopics.xml           |  413 +++-
 doc/manual/en_US/user_BasicConcepts.xml            |   12 +
 doc/manual/en_US/user_Frontends.xml                |    4 +-
 doc/manual/en_US/user_GuestAdditions.xml           |    3 +-
 doc/manual/en_US/user_KnownIssues.xml              |    5 +
 doc/manual/en_US/user_Storage.xml                  |    6 +-
 doc/manual/en_US/user_VBoxManage.xml               |    2 +-
 doc/manual/fr_FR/user_AdvancedTopics.xml           |   94 +-
 doc/manual/user_ChangeLogImpl.xml                  |  517 +++-
 include/VBox/HostServices/VBoxCrOpenGLSvc.h        |    3 +-
 include/VBox/VBoxCrHgsmi.h                         |    1 +
 include/VBox/VBoxVideo.h                           |   70 +-
 include/VBox/VBoxVideo3D.h                         |   32 -
 include/VBox/VBoxVideoHost3D.h                     |  128 +
 include/VBox/log.h                                 |   87 +
 include/VBox/shflsvc.h                             |   56 +-
 include/VBox/vmm/cpum.h                            |   16 +-
 include/VBox/vmm/hm_vmx.h                          |   42 +-
 include/VBox/vmm/pdmifs.h                          |   20 +-
 include/VBox/vmm/ssm.h                             |    1 +
 include/iprt/mangling.h                            |    3 +
 include/iprt/string.h                              |   39 +-
 src/VBox/Additions/common/VBoxGuest/Makefile.kmk   |    1 -
 .../Additions/common/VBoxGuest/VBoxGuest-win.cpp   |   99 +-
 src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp  |   49 +-
 .../Additions/common/VBoxGuest/VBoxGuestInternal.h |    3 -
 .../common/VBoxGuestLib/VBoxGuestR0LibCrOgl.cpp    |   15 +-
 .../VBoxService/VBoxServiceControlProcess.cpp      |    2 +
 src/VBox/Additions/common/crOpenGL/Makefile.kmk    |    9 +-
 .../Additions/common/crOpenGL/getprocaddress.py    |    3 +-
 src/VBox/Additions/common/crOpenGL/load.c          |    8 +-
 src/VBox/Additions/common/crOpenGL/pack/packspu.h  |    2 +
 .../Additions/common/crOpenGL/pack/packspu_get.py  |    2 +-
 .../Additions/common/crOpenGL/pack/packspu_glsl.c  |   76 +-
 .../Additions/common/crOpenGL/pack/packspu_net.c   |    6 +
 .../Additions/common/crOpenGL/pack/packspu_special |    2 +
 .../common/crOpenGL/windows_getprocaddress.py      |    3 +-
 src/VBox/Additions/linux/Makefile.kmk              |   10 +-
 src/VBox/Additions/linux/installer/vboxadd-x11.sh  |   16 +-
 src/VBox/Additions/linux/installer/vboxadd.sh      |   18 +-
 src/VBox/Additions/x11/VBoxClient/draganddrop.cpp  |   92 +-
 src/VBox/Additions/x11/vboxvideo/Makefile.kmk      |    2 +-
 src/VBox/Debugger/DBGPlugInLinux.cpp               |   23 +-
 src/VBox/Devices/EFI/DevEFI.cpp                    |    2 +-
 src/VBox/Devices/EFI/FirmwareBin/VBoxEFI32.fd      |  Bin 1048576 -> 1048576 bytes
 src/VBox/Devices/EFI/FirmwareBin/VBoxEFI64.fd      |  Bin 1048576 -> 1048576 bytes
 .../Graphics/BIOS/VBoxVgaBiosAlternative.asm       |  253 +-
 .../Graphics/BIOS/VBoxVgaBiosAlternative.md5sum    |    2 +-
 src/VBox/Devices/Graphics/DevVGA.cpp               |    9 +
 src/VBox/Devices/Graphics/DevVGA.h                 |   14 +-
 src/VBox/Devices/Graphics/DevVGA_VBVA.cpp          |  134 +-
 src/VBox/Devices/Graphics/DevVGA_VDMA.cpp          | 2481 +++++++++++---------
 src/VBox/Devices/Makefile.kmk                      |    5 +-
 src/VBox/Devices/Network/lwip-new/CHANGELOG        |   44 +
 src/VBox/Devices/Network/lwip-new/Makefile.kmk     |   34 +-
 src/VBox/Devices/Network/lwip-new/src/api/tcpip.c  |    1 +
 .../Devices/Network/lwip-new/src/core/ipv4/icmp.c  |    4 +
 .../Devices/Network/lwip-new/src/core/ipv4/ip4.c   |    4 +-
 .../Network/lwip-new/src/core/ipv4/ip_frag.c       |   15 +-
 .../Devices/Network/lwip-new/src/core/ipv6/icmp6.c |   10 +-
 .../Devices/Network/lwip-new/src/core/ipv6/ip6.c   |   17 +-
 .../Devices/Network/lwip-new/src/core/ipv6/mld6.c  |    2 +
 .../Devices/Network/lwip-new/src/core/ipv6/nd6.c   |    6 +
 src/VBox/Devices/Network/lwip-new/src/core/memp.c  |   12 +-
 src/VBox/Devices/Network/lwip-new/src/core/netif.c |   66 +-
 .../Devices/Network/lwip-new/src/core/snmp/mib2.c  |   10 +-
 src/VBox/Devices/Network/lwip-new/src/core/stats.c |    4 +-
 src/VBox/Devices/Network/lwip-new/src/core/tcp.c   |    9 +-
 .../Devices/Network/lwip-new/src/core/tcp_out.c    |    7 +-
 .../Devices/Network/lwip-new/src/core/timers.c     |   22 +-
 .../lwip-new/src/include/ipv4/lwip/autoip.h        |    3 +
 .../Network/lwip-new/src/include/ipv4/lwip/inet.h  |   16 +-
 .../lwip-new/src/include/ipv4/lwip/ip4_addr.h      |    3 +
 .../Network/lwip-new/src/include/ipv6/lwip/inet6.h |    2 +-
 .../lwip-new/src/include/ipv6/lwip/ip6_addr.h      |    9 +-
 .../Network/lwip-new/src/include/lwip/debug.h      |    8 +-
 .../Network/lwip-new/src/include/lwip/memp_std.h   |    2 +-
 .../Network/lwip-new/src/include/lwip/netif.h      |    2 +-
 .../Network/lwip-new/src/include/lwip/netifapi.h   |    3 +
 .../Network/lwip-new/src/include/lwip/opt.h        |   28 +-
 .../Network/lwip-new/src/include/lwip/snmp.h       |    4 +-
 .../Network/lwip-new/src/include/lwip/sockets.h    |   51 +-
 .../Devices/Network/lwip-new/vbox/VBoxLwipCore.cpp |   10 +-
 .../Network/lwip-new/vbox/include/lwip-log.h       |   93 +
 .../Network/lwip-new/vbox/include/lwip-namespace.h |   26 +-
 .../Network/{lwip-new/vbox/include => }/lwipopts.h |   61 +-
 src/VBox/Devices/Network/slirp/bootp.c             |   14 +-
 src/VBox/Devices/Network/slirp/dnsproxy/dnsproxy.c |    5 +-
 src/VBox/Devices/Network/slirp/ip_icmp.c           |  168 +-
 src/VBox/Devices/Network/slirp/libalias/alias_db.c |    9 +-
 .../Devices/Network/slirp/resolv_conf_parser.h     |    2 +-
 src/VBox/Devices/Network/slirp/slirp.c             |    2 +-
 src/VBox/Devices/Network/slirp/slirp.h             |    2 +
 src/VBox/Devices/Network/slirp/socket.c            |    3 +
 src/VBox/Devices/PC/BIOS/VBoxBiosAlternative.asm   |    4 +-
 .../Devices/PC/BIOS/VBoxBiosAlternative.md5sum     |    2 +-
 src/VBox/Devices/Storage/DevAHCI.cpp               |   27 +-
 src/VBox/Devices/Storage/DrvHostBase.cpp           |    4 +-
 src/VBox/Devices/VMMDev/VMMDev.cpp                 |    2 +
 src/VBox/Devices/VMMDev/VMMDevHGCM.cpp             |   55 +-
 src/VBox/Devices/VMMDev/VMMDevHGCM.h               |    2 +
 src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp             |   22 +-
 src/VBox/Frontends/VirtualBox/Makefile.kmk         |    1 +
 .../VirtualBox/src/converter/UIConverterBackend.h  |    6 +
 .../src/converter/UIConverterBackendGlobal.cpp     |   68 +
 .../Frontends/VirtualBox/src/globals/UIDefs.cpp    |    6 +
 src/VBox/Frontends/VirtualBox/src/globals/UIDefs.h |   21 +
 .../src/globals/UIExtraDataEventHandler.cpp        |   20 +-
 .../src/globals/UIExtraDataEventHandler.h          |    1 +
 .../VirtualBox/src/globals/VBoxGlobal.cpp          |   37 +-
 .../Frontends/VirtualBox/src/globals/VBoxGlobal.h  |   10 +
 .../Frontends/VirtualBox/src/medium/UIMedium.cpp   |   19 +
 .../Frontends/VirtualBox/src/medium/UIMedium.h     |    3 +
 .../VirtualBox/src/medium/UIMediumManager.cpp      |   23 +-
 .../VirtualBox/src/medium/UIMediumManager.h        |    3 -
 .../VirtualBox/src/net/UIUpdateManager.cpp         |  113 +-
 .../src/platform/darwin/UICocoaApplication.h       |   23 +
 .../src/platform/darwin/UICocoaApplication.mm      |   96 +-
 .../src/platform/darwin/VBoxUtils-darwin-cocoa.mm  |   67 +
 .../src/platform/darwin/VBoxUtils-darwin.cpp       |   25 +
 .../src/platform/darwin/VBoxUtils-darwin.h         |   14 +
 .../VirtualBox/src/runtime/UIFrameBuffer.cpp       |   30 +
 .../VirtualBox/src/runtime/UIFrameBuffer.h         |   16 +
 .../VirtualBox/src/runtime/UIFrameBufferQImage.cpp |  110 +-
 .../VirtualBox/src/runtime/UIFrameBufferQImage.h   |   10 +-
 .../VirtualBox/src/runtime/UIKeyboardHandler.cpp   |   12 +-
 .../Frontends/VirtualBox/src/runtime/UIMachine.cpp |   53 +-
 .../VirtualBox/src/runtime/UIMachineLogic.cpp      |  103 +-
 .../VirtualBox/src/runtime/UIMachineLogic.h        |   15 +-
 .../VirtualBox/src/runtime/UIMachineView.cpp       |   12 +-
 .../VirtualBox/src/runtime/UIMachineWindow.cpp     |   52 +-
 .../VirtualBox/src/runtime/UIMachineWindow.h       |   18 +-
 .../VirtualBox/src/runtime/UIMouseHandler.cpp      |   55 +-
 .../VirtualBox/src/runtime/UIMouseHandler.h        |    7 +
 .../Frontends/VirtualBox/src/runtime/UISession.cpp |   82 +-
 .../Frontends/VirtualBox/src/runtime/UISession.h   |   53 +-
 .../fullscreen/UIMachineLogicFullscreen.cpp        |  540 ++++-
 .../runtime/fullscreen/UIMachineLogicFullscreen.h  |   63 +-
 .../fullscreen/UIMachineWindowFullscreen.cpp       |  242 +-
 .../runtime/fullscreen/UIMachineWindowFullscreen.h |   41 +-
 .../src/runtime/normal/UIMachineLogicNormal.cpp    |   15 +-
 .../src/runtime/normal/UIMachineWindowNormal.cpp   |   16 +-
 .../src/runtime/scale/UIMachineLogicScale.cpp      |   12 +-
 .../src/runtime/scale/UIMachineWindowScale.cpp     |   16 +-
 .../runtime/seamless/UIMachineLogicSeamless.cpp    |   43 +-
 .../src/runtime/seamless/UIMachineLogicSeamless.h  |    3 +
 .../runtime/seamless/UIMachineWindowSeamless.cpp   |   49 +-
 .../src/runtime/seamless/UIMachineWindowSeamless.h |    6 +-
 .../graphics/details/UIGMachinePreview.cpp         |   22 +-
 .../selector/graphics/details/UIGMachinePreview.h  |    1 +
 .../src/settings/global/UIGlobalSettingsInput.cpp  |   20 +-
 .../VirtualBox/src/widgets/UIMiniToolBar.cpp       |   46 +-
 .../VirtualBox/src/widgets/UIMiniToolBar.h         |   13 +
 .../VirtualBox/src/widgets/VBoxMediaComboBox.cpp   |    5 +
 .../src/wizards/newvm/UIWizardNewVMPageBasic1.cpp  |    4 +-
 src/VBox/GuestHost/OpenGL/Makefile.kmk             |    6 +
 src/VBox/GuestHost/OpenGL/glapi_parser/APIspec.txt |   12 +
 src/VBox/GuestHost/OpenGL/include/cr_net.h         |    5 +
 src/VBox/GuestHost/OpenGL/include/cr_protocol.h    |   21 +-
 src/VBox/GuestHost/OpenGL/include/cr_server.h      |   13 +-
 src/VBox/GuestHost/OpenGL/include/cr_vreg.h        |   18 +-
 src/VBox/GuestHost/OpenGL/include/state/cr_glsl.h  |    6 +
 src/VBox/GuestHost/OpenGL/packer/pack_pixels.c     |    3 +-
 src/VBox/GuestHost/OpenGL/packer/pack_shaders.c    |   16 +
 src/VBox/GuestHost/OpenGL/packer/packer_special    |    1 +
 .../GuestHost/OpenGL/state_tracker/state_glsl.c    |  289 ++-
 .../GuestHost/OpenGL/state_tracker/state_special   |    1 +
 src/VBox/GuestHost/OpenGL/util/blitter.cpp         |    2 +-
 src/VBox/GuestHost/OpenGL/util/htable.cpp          |    2 +-
 src/VBox/GuestHost/OpenGL/util/net.c               |   12 +
 src/VBox/GuestHost/OpenGL/util/net_internals.h     |    3 +
 src/VBox/GuestHost/OpenGL/util/vboxhgcm.c          |  132 +-
 .../HostDrivers/Support/darwin/SUPDrv-darwin.cpp   |   23 +-
 .../VBoxNetFlt/darwin/VBoxNetFlt-darwin.cpp        |   84 +-
 .../HostDrivers/VBoxNetFlt/win/cfg/VBoxNetCfg.cpp  |   36 +-
 src/VBox/HostDrivers/VBoxUSB/darwin/VBoxUSB.cpp    |    2 +-
 src/VBox/HostDrivers/darwin/VBoxNetSend.h          |    9 -
 src/VBox/HostServices/SharedClipboard/service.cpp  |   24 +-
 src/VBox/HostServices/SharedFolders/mappings.cpp   |   11 +-
 src/VBox/HostServices/SharedFolders/service.cpp    |   59 +-
 src/VBox/HostServices/SharedFolders/vbsf.cpp       |  753 +++---
 src/VBox/HostServices/SharedOpenGL/Makefile.kmk    |    6 +
 .../SharedOpenGL/crserver/crservice.cpp            |   73 +-
 .../HostServices/SharedOpenGL/crserverlib/server.h |    6 +-
 .../SharedOpenGL/crserverlib/server_config.c       |   19 +-
 .../SharedOpenGL/crserverlib/server_getshaders.c   |   23 +
 .../SharedOpenGL/crserverlib/server_main.c         |  290 ++-
 .../SharedOpenGL/crserverlib/server_muralfbo.cpp   |   18 +-
 .../SharedOpenGL/crserverlib/server_presenter.cpp  |  397 +++-
 .../SharedOpenGL/crserverlib/server_special        |    1 +
 .../SharedOpenGL/crserverlib/server_stream.c       |   22 +
 .../SharedOpenGL/crserverlib/server_window.c       |   44 +-
 .../SharedOpenGL/render/renderspu_wgl.c            |   41 +-
 .../HostServices/SharedOpenGL/unpacker/unpack.py   |   12 +-
 .../SharedOpenGL/unpacker/unpack_shaders.c         |   10 +
 .../SharedOpenGL/unpacker/unpacker_special         |    1 +
 .../darwin/VirtualBox_mpkg/Localizable.strings     |    4 +-
 .../darwin/VirtualBox_mpkg/distribution.dist       |   33 +-
 src/VBox/Installer/linux/run-inst.sh               |   26 +-
 .../win/InstallHelper/VBoxInstallHelper.cpp        |   31 +-
 src/VBox/Installer/win/Makefile.kmk                |  235 +-
 src/VBox/Installer/win/NLS/de_DE.wxl               |    4 +-
 src/VBox/Installer/win/NLS/en_US.wxl               |    4 +-
 src/VBox/Installer/win/NLS/fa_IR.wxl               |   11 +-
 src/VBox/Installer/win/NLS/fr_FR.wxl               |    4 +-
 src/VBox/Installer/win/NLS/it_IT.wxl               |   11 +-
 src/VBox/Installer/win/NLS/tr_TR.wxl               |  112 +-
 src/VBox/Installer/win/NLS/zh_TW.wxl               |   12 +-
 src/VBox/Installer/win/Properties.wxi              |   60 +
 src/VBox/Installer/win/Stub/VBoxStub.cpp           |  263 ++-
 src/VBox/Installer/win/UserInterface.wxi           |   25 +-
 src/VBox/Installer/win/VBoxMergeApp.wxi            |  346 +++
 src/VBox/Installer/win/VBoxMergeApp.wxs            |   69 +
 src/VBox/Installer/win/VBoxMergeAppCA.wxi          |   19 +
 src/VBox/Installer/win/VBoxMergeAppSeq.wxi         |   19 +
 src/VBox/Installer/win/VBoxMergeCOM32On64.wxi      |   55 +
 src/VBox/Installer/win/VBoxMergeCOM32On64.wxs      |   46 +
 src/VBox/Installer/win/VBoxMergeCOM32On64CA.wxi    |   19 +
 src/VBox/Installer/win/VBoxMergeCOM32On64Seq.wxi   |   19 +
 src/VBox/Installer/win/VBoxMergeNetAdp.wxi         |   29 +
 src/VBox/Installer/win/VBoxMergeNetAdp.wxs         |   54 +
 src/VBox/Installer/win/VBoxMergeNetAdpCA.wxi       |   26 +
 src/VBox/Installer/win/VBoxMergeNetAdpSeq.wxi      |   44 +
 src/VBox/Installer/win/VBoxMergeNetFlt.wxi         |   35 +
 src/VBox/Installer/win/VBoxMergeNetFlt.wxs         |   54 +
 src/VBox/Installer/win/VBoxMergeNetFltCA.wxi       |   33 +
 src/VBox/Installer/win/VBoxMergeNetFltSeq.wxi      |   78 +
 src/VBox/Installer/win/VBoxMergePython.wxi         |   41 +
 src/VBox/Installer/win/VBoxMergePython.wxs         |   54 +
 src/VBox/Installer/win/VBoxMergePythonCA.wxi       |   22 +
 src/VBox/Installer/win/VBoxMergePythonSeq.wxi      |   34 +
 src/VBox/Installer/win/VBoxMergeUSB.wxi            |   49 +
 src/VBox/Installer/win/VBoxMergeUSB.wxs            |   46 +
 src/VBox/Installer/win/VBoxMergeUSBCA.wxi          |   19 +
 src/VBox/Installer/win/VBoxMergeUSBSeq.wxi         |   19 +
 src/VBox/Installer/win/VirtualBox.wxs              | 1184 ++++------
 src/VBox/Main/Makefile.kmk                         |    3 +-
 src/VBox/Main/cbinding/Makefile.kmk                |    3 +-
 src/VBox/Main/cbinding/VBoxCAPI.cpp                |  142 +-
 src/VBox/Main/cbinding/capiidl.xsl                 |   34 +-
 src/VBox/Main/cbinding/tstCAPIGlue.c               |   31 +-
 src/VBox/Main/include/ApplianceImpl.h              |    1 +
 src/VBox/Main/include/ConsoleImpl.h                |   59 +-
 src/VBox/Main/include/DisplayImpl.h                |   21 +-
 src/VBox/Main/include/EventImpl.h                  |    2 +-
 src/VBox/Main/include/MachineImpl.h                |    2 +
 src/VBox/Main/src-all/EventImpl.cpp                |  420 ++--
 src/VBox/Main/src-all/win/comregister.cmd          |   12 +-
 src/VBox/Main/src-client/ConsoleImpl.cpp           |  708 ++----
 src/VBox/Main/src-client/ConsoleImpl2.cpp          |    8 +-
 src/VBox/Main/src-client/DisplayImpl.cpp           |   89 +-
 src/VBox/Main/src-client/GuestFileImpl.cpp         |    2 +-
 src/VBox/Main/src-client/GuestImpl.cpp             |    2 +-
 src/VBox/Main/src-client/GuestProcessImpl.cpp      |    2 +-
 src/VBox/Main/src-client/GuestSessionImpl.cpp      |    2 +-
 src/VBox/Main/src-client/KeyboardImpl.cpp          |    2 +-
 src/VBox/Main/src-client/MouseImpl.cpp             |    2 +-
 src/VBox/Main/src-client/VirtualBoxClientImpl.cpp  |    2 +-
 src/VBox/Main/src-server/ApplianceImpl.cpp         |    2 +
 src/VBox/Main/src-server/ApplianceImplExport.cpp   |   17 +-
 src/VBox/Main/src-server/HostDnsService.cpp        |    4 +-
 src/VBox/Main/src-server/MachineImpl.cpp           |   92 +-
 src/VBox/Main/src-server/NATNetworkImpl.cpp        |    4 +-
 src/VBox/Main/src-server/VirtualBoxImpl.cpp        |    8 +-
 src/VBox/Main/src-server/darwin/iokit.cpp          |   26 +-
 src/VBox/Main/src-server/linux/USBGetDevices.cpp   |    4 +-
 src/VBox/Main/src-server/win/HostPowerWin.cpp      |   19 +-
 src/VBox/Main/src-server/win/svcmain.cpp           |    4 +-
 src/VBox/NetworkServices/DHCP/VBoxNetDHCP.cpp      |    6 +-
 src/VBox/NetworkServices/NAT/Makefile.kmk          |    1 +
 src/VBox/NetworkServices/NAT/VBoxNetLwipNAT.cpp    |  421 +++-
 .../include => NetworkServices/NAT}/lwipopts.h     |   67 +-
 src/VBox/NetworkServices/NAT/portfwd.c             |   57 +-
 src/VBox/NetworkServices/NAT/proxy.c               |    4 +-
 .../NetworkServices/NetLib/VBoxNetBaseService.cpp  |   14 +-
 .../NetLib/VBoxNetPortForwardString.cpp            |   27 +-
 .../NetworkServices/NetLib/VBoxPortForwardString.h |    2 -
 src/VBox/Runtime/Makefile.kmk                      |   10 +-
 src/VBox/Runtime/VBox/log-vbox.cpp                 |    1 +
 .../Runtime/common/asm/ASMAtomicCmpXchgExU64.asm   |    8 +-
 .../Runtime/common/asm/ASMAtomicCmpXchgU64.asm     |    4 +-
 src/VBox/Runtime/common/asm/ASMAtomicUoAndU32.asm  |    4 +-
 src/VBox/Runtime/common/asm/ASMAtomicUoOrU32.asm   |    4 +-
 src/VBox/Runtime/common/asm/ASMCpuIdExSlow.asm     |    5 +-
 src/VBox/Runtime/common/asm/ASMCpuId_Idx_ECX.asm   |   10 +-
 src/VBox/Runtime/common/log/log.cpp                |   54 +-
 src/VBox/Runtime/common/string/strformatrt.cpp     |  173 +-
 src/VBox/Runtime/common/string/utf-16.cpp          |  109 +
 src/VBox/Runtime/common/string/utf-8.cpp           |   18 +-
 src/VBox/Runtime/generic/env-generic.cpp           |    5 +
 src/VBox/Runtime/r0drv/nt/ntBldSymDb.cpp           |   19 +-
 src/VBox/Runtime/r0drv/nt/symdbdata.h              |   96 +-
 src/VBox/Runtime/r3/linux/sysfs.cpp                |  164 +-
 .../Runtime/r3/posix/process-creation-posix.cpp    |   17 +-
 .../Runtime/r3/win/RTSystemQueryDmiString-win.cpp  |    8 +-
 .../Runtime/r3/win/RTSystemQueryOSInfo-win.cpp     |    9 +-
 src/VBox/Runtime/r3/win/init-win.cpp               |   74 +-
 src/VBox/Runtime/r3/win/internal-r3-win.h          |   10 +-
 src/VBox/Runtime/testcase/tstHandleTable.cpp       |    8 +-
 src/VBox/Runtime/testcase/tstMemAutoPtr.cpp        |    6 +-
 src/VBox/Runtime/testcase/tstRTStrFormat.cpp       |  108 +-
 src/VBox/Storage/VD.cpp                            |    2 +-
 src/VBox/Storage/VHD.cpp                           |   19 +-
 src/VBox/VMM/VMMAll/CPUMAllMsrs.cpp                |  222 +-
 src/VBox/VMM/VMMAll/IEMAll.cpp                     |    2 +-
 src/VBox/VMM/VMMAll/PGMAllPool.cpp                 |    7 +-
 src/VBox/VMM/VMMR0/HMR0.cpp                        |    2 +-
 src/VBox/VMM/VMMR0/HMVMXR0.cpp                     |  214 +-
 src/VBox/VMM/VMMR3/CPUM.cpp                        |    8 +
 src/VBox/VMM/VMMR3/CPUMR3CpuId.cpp                 |   65 +-
 src/VBox/VMM/VMMR3/CPUMR3Db.cpp                    |   11 +
 src/VBox/VMM/VMMR3/CSAM.cpp                        |   15 +-
 src/VBox/VMM/VMMR3/PATM.cpp                        |    5 +-
 src/VBox/VMM/VMMR3/PATMSSM.cpp                     |    9 -
 src/VBox/VMM/VMMR3/SSM.cpp                         |   31 +
 src/VBox/VMM/VMMR3/VM.cpp                          |    9 +
 src/VBox/VMM/VMMR3/cpus/AMD_Athlon_64_3200.h       |    1 +
 ...64_3200.h => AMD_Athlon_64_X2_Dual_Core_4200.h} |  153 +-
 src/VBox/VMM/VMMR3/cpus/AMD_FX_8150_Eight_Core.h   |    1 +
 src/VBox/VMM/VMMR3/cpus/AMD_Phenom_II_X6_1100T.h   |    1 +
 src/VBox/VMM/VMMR3/cpus/Intel_Core_i5_3570.h       |    9 +-
 ...Intel_Core_i5_3570.h => Intel_Core_i7_2635QM.h} |  358 ++-
 src/VBox/VMM/VMMR3/cpus/Intel_Core_i7_3820QM.h     |    5 +-
 src/VBox/VMM/VMMR3/cpus/Intel_Core_i7_3960X.h      |    9 +-
 src/VBox/VMM/VMMR3/cpus/Intel_Pentium_4_3_00GHz.h  |    3 +-
 .../VMMR3/cpus/Intel_Pentium_M_processor_2_00GHz.h |    5 +-
 src/VBox/VMM/VMMR3/cpus/Intel_Xeon_X5482_3_20GHz.h |    5 +-
 .../VMM/VMMR3/cpus/Quad_Core_AMD_Opteron_2384.h    |    1 +
 .../VMM/VMMR3/cpus/VIA_QuadCore_L4700_1_2_GHz.h    |    3 +-
 src/VBox/VMM/include/CPUMInternal.h                |   18 +-
 src/VBox/VMM/include/CPUMInternal.mac              |    2 +-
 src/VBox/VMM/include/HMInternal.h                  |    2 +-
 src/VBox/VMM/include/PATMInternal.h                |    1 -
 src/VBox/VMM/testcase/tstGlobalConfig.cpp          |    4 +-
 src/VBox/VMM/testcase/tstInstrEmul.cpp             |   10 +-
 src/VBox/VMM/testcase/tstVMMFork.cpp               |    4 +-
 src/VBox/VMM/tools/Makefile.kmk                    |    2 +-
 src/VBox/VMM/tools/VBoxCpuReport.cpp               |  168 +-
 src/libs/xpcom18a4/python/server/loader.py         |   14 +-
 src/libs/xpcom18a4/python/src/PyGBase.cpp          |    3 +-
 src/libs/xpcom18a4/python/src/PyIID.cpp            |    2 +-
 src/libs/xpcom18a4/python/src/PyISupports.cpp      |    4 +-
 353 files changed, 12756 insertions(+), 5887 deletions(-)

diff --cc debian/changelog
index c5d479d,525e11e..8abef42
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,25 +1,27 @@@
- virtualbox (4.3.8-dfsg-1) unstable; urgency=medium
+ virtualbox (4.3.12-dfsg-1) UNRELEASED; urgency=medium
  
-   * Team upload.
+   * New upstream release.
+ 
+  -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Tue, 27 May 2014 15:08:04 +0200
+ 
+ virtualbox (4.3.10-dfsg-1) unstable; urgency=high
+ 
+   * New upstream release.
+     - Fixes multiple memory corruption vulnerabilities in the 3D acceleration
+       code. (Closes: #741602)
+       CVE-2014-0981, CVE-2014-0983
  
    [ Gianfranco Costamagna ]
-   * New upstream release, patch refresh.
+   * Patch refresh.
    * d/control, enforcing gsoap min required version.
 +  * Add module-assistant as dependency, fixing broken symlink
 +  * disabled some old unused lintian overrides.
  
    [ Felix Geyer ]
-   * 39-fix-wrong-vboxvideo_drv-source.patch: fixed build failure.
+   * Override embedded-library nspr lintian warning, it's a locally modified
+     version.
  
-  -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Mon, 10 Mar 2014 10:35:35 +0100
+  -- Felix Geyer <fgeyer at debian.org>  Sun, 06 Apr 2014 15:31:09 +0200
  
  virtualbox (4.3.6-dfsg-2) unstable; urgency=medium
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-virtualbox/virtualbox.git



More information about the Pkg-virtualbox-commits mailing list