[Pkg-virtualbox-commits] [virtualbox] 01/01: Upload to unstable

[Gianfranco Costamagna]

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

locutusofborg pushed a commit to branch master
in repository virtualbox.

commit 8e04d5af63cac94cb30c14816309e74a9893cf41
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Fri Dec 8 20:07:36 2017 +0100

    Upload to unstable
---
 debian/changelog           |  8 +++++
 debian/patches/69989.patch | 77 ++++++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series      |  1 +
 3 files changed, 86 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 75e10bf..87985cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+virtualbox (5.2.2-dfsg-3) unstable; urgency=high
+
+  * debian/patches/69989.patch:
+    - cherry-pick fix for GL stuff, breaking login screen
+      on ubuntu 17.10+ releases (virtualbox-guest-x11 package)
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org>  Fri, 08 Dec 2017 20:06:25 +0100
+
 virtualbox (5.2.2-dfsg-2) unstable; urgency=medium
 
   * The new release didn't fix the build failure
diff --git a/debian/patches/69989.patch b/debian/patches/69989.patch
new file mode 100644
index 0000000..1d7aa60
--- /dev/null
+++ b/debian/patches/69989.patch
@@ -0,0 +1,77 @@
+===================================================================
+--- a/src/VBox/GuestHost/OpenGL/util/vboxhgcm.c
++++ b/src/VBox/GuestHost/OpenGL/util/vboxhgcm.c
+@@ -37,4 +37,5 @@
+ #include "cr_process.h"
+ 
++#include <iprt/initterm.h>
+ #include <iprt/thread.h>
+ 
+@@ -705,5 +706,5 @@
+ 
+         rc = crVBoxHGCMCall(conn, &parms.hdr, sizeof(parms));
+-        callRes = parms.hdr.Hdr.rc;
++        callRes = parms.hdr.Hdr.rc; /** @todo now rc == parms.hdr.Hdr.rc */
+     }
+     else
+@@ -719,5 +720,5 @@
+ 
+         rc = crVBoxHGCMCall(conn, &parms.hdr, sizeof(parms));
+-        callRes = parms.hdr.Hdr.rc;
++        callRes = parms.hdr.Hdr.rc; /** @todo now rc == parms.hdr.Hdr.rc */
+     }
+ 
+@@ -759,5 +760,5 @@
+     rc = crVBoxHGCMCall(conn, &parms.hdr, sizeof(parms));
+ 
+-    if (RT_FAILURE(rc) || RT_FAILURE(parms.hdr.Hdr.rc))
++    if (RT_FAILURE(rc) || RT_FAILURE(parms.hdr.Hdr.rc) /** @todo now rc == parms.hdr.Hdr.rc */)
+     {
+         crWarning("SHCRGL_GUEST_FN_READ failed with %x %x\n", rc, parms.hdr.Hdr.rc);
+@@ -835,5 +836,5 @@
+ 
+             rc = crVBoxHGCMCall(conn, &wbParms.hdr, sizeof(wbParms));
+-            if (RT_FAILURE(rc) || RT_FAILURE(wbParms.hdr.Hdr.rc))
++            if (RT_FAILURE(rc) || RT_FAILURE(wbParms.hdr.Hdr.rc) /** @todo now rc == wbParms.hdr.Hdr.rc */)
+             {
+                 crError("SHCRGL_GUEST_FN_WRITE_BUFFER (%i) failed with %x %x\n", wbParms.pBuffer.u.Pointer.size, rc, wbParms.hdr.Hdr.rc);
+@@ -866,8 +867,8 @@
+ #endif
+ 
+-    if (RT_FAILURE(rc) || RT_FAILURE(parms.hdr.Hdr.rc))
+-    {
+-
+-        if ((VERR_BUFFER_OVERFLOW == parms.hdr.Hdr.rc) && RT_SUCCESS(rc))
++    if (RT_FAILURE(rc) || RT_FAILURE(parms.hdr.Hdr.rc) /** @todo now rc == parms.hdr.Hdr.rc */)
++    {
++
++        if ((VERR_BUFFER_OVERFLOW == parms.hdr.Hdr.rc) /* && RT_SUCCESS(rc) */)
+         {
+             /* reallocate buffer and retry */
+@@ -991,5 +992,5 @@
+     rc = crVBoxHGCMCall(conn, &parms.hdr, sizeof(parms));
+ 
+-    if (RT_FAILURE(rc) || RT_FAILURE(parms.hdr.Hdr.rc))
++    if (RT_FAILURE(rc) || RT_FAILURE(parms.hdr.Hdr.rc) /** @todo now rc == parms.hdr.Hdr.rc */)
+     {
+         crDebug("SHCRGL_GUEST_FN_READ failed with %x %x\n", rc, parms.hdr.Hdr.rc);
+@@ -1194,5 +1195,5 @@
+     if (RT_SUCCESS(rc))
+     {
+-        rc =  parms.hdr.Hdr.rc;
++        rc =  parms.hdr.Hdr.rc; /** @todo now rc == parms.hdr.Hdr.rc */
+         if (RT_SUCCESS(rc))
+         {
+@@ -1256,5 +1257,5 @@
+     rc = crVBoxHGCMCall(conn, &parms.hdr, sizeof(parms));
+ 
+-    if (RT_FAILURE(rc) || RT_FAILURE(parms.hdr.Hdr.rc))
++    if (RT_FAILURE(rc) || RT_FAILURE(parms.hdr.Hdr.rc) /** @todo now rc == parms.hdr.Hdr.rc */)
+     {
+         crWarning("SHCRGL_GUEST_FN_SET_PID failed!");
+@@ -1275,4 +1276,5 @@
+     int rc;
+     VBOXCRHGSMIPROFILE_FUNC_PROLOGUE();
++    RTR3InitDll(RTR3INIT_FLAGS_UNOBTRUSIVE);
+     rc = VbglR3InitUser();
+     if (RT_SUCCESS(rc))
diff --git a/debian/patches/series b/debian/patches/series
index 244fb70..991c285 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,3 +16,4 @@
 36-fix-vnc-version-string.patch
 37-python-3.6-support.patch
 fix-build.patch
+69989.patch

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