From ba6b212140b0d0ea98ca07d80ea6552f4ea007b2a52fcbcf88075f6595e6a3e2 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Wed, 27 Mar 2019 17:54:35 +0000 Subject: [PATCH 1/7] - Fix build with the pending Qt 5.13. File "fixes_for_qt5.13.patch" is added. OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=475 --- virtualbox.changes | 5 +++++ virtualbox.spec | 3 +++ 2 files changed, 8 insertions(+) diff --git a/virtualbox.changes b/virtualbox.changes index def803a..8e36393 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Mar 27 17:53:11 UTC 2019 - Larry Finger + +- Fix build with the pending Qt 5.13. File "fixes_for_qt5.13.patch" is added. + ------------------------------------------------------------------- Wed Mar 20 19:31:19 UTC 2019 - Larry Finger diff --git a/virtualbox.spec b/virtualbox.spec index 06a91fb..44a10c0 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -135,6 +135,8 @@ Patch128: fix_lib_search.patch Patch129: fixes_for_Leap15.1.patch # Fixes for kernel 5.1 Patch130: fixes_for_5.1.patch +# Fixes for Qt5.13 +Patch131: fixes_for_qt5.13.patch #endif # BuildRequires: LibVNCServer-devel @@ -438,6 +440,7 @@ as an "extpack" for VirtualBox. The implementation is licensed under GPL. %patch128 -p1 %patch129 -p1 %patch130 -p1 +%patch131 -p1 #copy user manual cp %{SOURCE1} UserManual.pdf From 20daf126970dffada13a3d1ba9cd62faf9de1de4ab15ce1eda4a6f623c23cda7 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Wed, 27 Mar 2019 18:52:03 +0000 Subject: [PATCH 2/7] - Fix build with the pending Qt 5.13. File "fixes_for_qt5.13.patch" is added. bsc#1130503 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=476 --- fixes_for_qt5.13.patch | 131 +++++++++++++++++++++++++++++++++++++++++ virtualbox.changes | 2 +- 2 files changed, 132 insertions(+), 1 deletion(-) create mode 100644 fixes_for_qt5.13.patch diff --git a/fixes_for_qt5.13.patch b/fixes_for_qt5.13.patch new file mode 100644 index 0000000..436f721 --- /dev/null +++ b/fixes_for_qt5.13.patch @@ -0,0 +1,131 @@ +Index: VirtualBox-6.0.4/include/VBox/VBoxGL2D.h +=================================================================== +--- VirtualBox-6.0.4.orig/include/VBox/VBoxGL2D.h ++++ VirtualBox-6.0.4/include/VBox/VBoxGL2D.h +@@ -113,8 +113,10 @@ typedef GLvoid (APIENTRY *PFNVBOXVHWA_UN + /* GL_ARB_pixel_buffer_object*/ + #ifndef Q_WS_MAC + /* apears to be defined on mac */ ++#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) + typedef ptrdiff_t GLsizeiptr; + #endif ++#endif + + #ifndef GL_READ_ONLY + # define GL_READ_ONLY 0x88B8 +Index: VirtualBox-6.0.4/include/VBox/HostServices/glext.h +=================================================================== +--- VirtualBox-6.0.4.orig/include/VBox/HostServices/glext.h ++++ VirtualBox-6.0.4/include/VBox/HostServices/glext.h +@@ -3395,8 +3395,10 @@ typedef char GLchar; /* native charact + #ifndef GL_VERSION_1_5 + /* GL types for handling large vertex buffer objects */ + typedef ptrdiff_t GLintptr; ++#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) + typedef ptrdiff_t GLsizeiptr; + #endif ++#endif + + #ifndef GL_ARB_vertex_buffer_object + /* GL types for handling large vertex buffer objects */ +Index: VirtualBox-6.0.4/src/VBox/Additions/3D/mesa/mesa-17.3.9/include/GL/glext.h +=================================================================== +--- VirtualBox-6.0.4.orig/src/VBox/Additions/3D/mesa/mesa-17.3.9/include/GL/glext.h ++++ VirtualBox-6.0.4/src/VBox/Additions/3D/mesa/mesa-17.3.9/include/GL/glext.h +@@ -465,7 +465,9 @@ GLAPI void APIENTRY glBlendEquation (GLe + #ifndef GL_VERSION_1_5 + #define GL_VERSION_1_5 1 + #include ++#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) + typedef ptrdiff_t GLsizeiptr; ++#endif + typedef ptrdiff_t GLintptr; + #define GL_BUFFER_SIZE 0x8764 + #define GL_BUFFER_USAGE 0x8765 +Index: VirtualBox-6.0.4/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcorearb.h +=================================================================== +--- VirtualBox-6.0.4.orig/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcorearb.h ++++ VirtualBox-6.0.4/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcorearb.h +@@ -614,7 +614,9 @@ GLAPI void APIENTRY glBlendEquation (GLe + #ifndef GL_VERSION_1_5 + #define GL_VERSION_1_5 1 + #include ++#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) + typedef ptrdiff_t GLsizeiptr; ++#endif + typedef ptrdiff_t GLintptr; + #define GL_BUFFER_SIZE 0x8764 + #define GL_BUFFER_USAGE 0x8765 +Index: VirtualBox-6.0.4/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext.h +=================================================================== +--- VirtualBox-6.0.4.orig/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext.h ++++ VirtualBox-6.0.4/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext.h +@@ -465,7 +465,9 @@ GLAPI void APIENTRY glBlendEquation (GLe + #ifndef GL_VERSION_1_5 + #define GL_VERSION_1_5 1 + #include ++#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) + typedef ptrdiff_t GLsizeiptr; ++#endif + typedef ptrdiff_t GLintptr; + #define GL_BUFFER_SIZE 0x8764 + #define GL_BUFFER_USAGE 0x8765 +Index: VirtualBox-6.0.4/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h +=================================================================== +--- VirtualBox-6.0.4.orig/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h ++++ VirtualBox-6.0.4/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h +@@ -3708,8 +3708,10 @@ typedef char GLchar; /* native charact + #ifndef GL_VERSION_1_5 + /* GL types for handling large vertex buffer objects */ + typedef ptrdiff_t GLintptr; ++#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) + typedef ptrdiff_t GLsizeiptr; + #endif ++#endif + + #ifndef GL_ARB_vertex_buffer_object + /* GL types for handling large vertex buffer objects */ +Index: VirtualBox-6.0.4/src/VBox/Devices/Graphics/vmsvga_glext/glext.h +=================================================================== +--- VirtualBox-6.0.4.orig/src/VBox/Devices/Graphics/vmsvga_glext/glext.h ++++ VirtualBox-6.0.4/src/VBox/Devices/Graphics/vmsvga_glext/glext.h +@@ -6194,8 +6194,10 @@ typedef char GLchar; + #ifndef GL_VERSION_1_5 + /* GL types for handling large vertex buffer objects */ + typedef ptrdiff_t GLintptr; ++#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) + typedef ptrdiff_t GLsizeiptr; + #endif ++#endif + + #ifndef GL_ARB_vertex_buffer_object + /* GL types for handling large vertex buffer objects */ +Index: VirtualBox-6.0.4/src/VBox/GuestHost/OpenGL/include/GL/glext.h +=================================================================== +--- VirtualBox-6.0.4.orig/src/VBox/GuestHost/OpenGL/include/GL/glext.h ++++ VirtualBox-6.0.4/src/VBox/GuestHost/OpenGL/include/GL/glext.h +@@ -3717,8 +3717,10 @@ typedef char GLchar; /* native charact + #ifndef GL_VERSION_1_5 + /* GL types for handling large vertex buffer objects */ + typedef ptrdiff_t GLintptr; ++#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) + typedef ptrdiff_t GLsizeiptr; + #endif ++#endif + + #ifndef GL_ARB_vertex_buffer_object + /* GL types for handling large vertex buffer objects */ +Index: VirtualBox-6.0.4/src/VBox/GuestHost/OpenGL/include/chromium.h +=================================================================== +--- VirtualBox-6.0.4.orig/src/VBox/GuestHost/OpenGL/include/chromium.h ++++ VirtualBox-6.0.4/src/VBox/GuestHost/OpenGL/include/chromium.h +@@ -499,7 +499,9 @@ PROC WINAPI wglGetProcAddress_prox( LPCS + #ifndef GL_VERSION_1_5 + + typedef ptrdiff_t GLintptr; ++#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) + typedef ptrdiff_t GLsizeiptr; ++#endif + + /* prototype these functions for opengl_stub/getprocaddress.c */ + extern void APIENTRY glGenQueries(GLsizei n, GLuint *ids); diff --git a/virtualbox.changes b/virtualbox.changes index 8e36393..5b7a332 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Wed Mar 27 17:53:11 UTC 2019 - Larry Finger -- Fix build with the pending Qt 5.13. File "fixes_for_qt5.13.patch" is added. +- Fix build with the pending Qt 5.13. File "fixes_for_qt5.13.patch" is added. bsc#1130503 ------------------------------------------------------------------- Wed Mar 20 19:31:19 UTC 2019 - Larry Finger From 77770112622f5267c8aeeb1c6cfac0b07f0d37d11fb0777699473c20c252ccdd Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Thu, 28 Mar 2019 00:22:04 +0000 Subject: [PATCH 3/7] OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=477 --- fixes_for_qt5.13.patch | 51 ++++++++++++++++++++++++++---------------- virtualbox.changes | 2 +- 2 files changed, 33 insertions(+), 20 deletions(-) diff --git a/fixes_for_qt5.13.patch b/fixes_for_qt5.13.patch index 436f721..3506d6f 100644 --- a/fixes_for_qt5.13.patch +++ b/fixes_for_qt5.13.patch @@ -2,42 +2,46 @@ Index: VirtualBox-6.0.4/include/VBox/VBoxGL2D.h =================================================================== --- VirtualBox-6.0.4.orig/include/VBox/VBoxGL2D.h +++ VirtualBox-6.0.4/include/VBox/VBoxGL2D.h -@@ -113,8 +113,10 @@ typedef GLvoid (APIENTRY *PFNVBOXVHWA_UN +@@ -113,7 +113,11 @@ typedef GLvoid (APIENTRY *PFNVBOXVHWA_UN /* GL_ARB_pixel_buffer_object*/ #ifndef Q_WS_MAC /* apears to be defined on mac */ +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) typedef ptrdiff_t GLsizeiptr; - #endif ++#else ++typedef long int GLsizeiptr +#endif + #endif #ifndef GL_READ_ONLY - # define GL_READ_ONLY 0x88B8 Index: VirtualBox-6.0.4/include/VBox/HostServices/glext.h =================================================================== --- VirtualBox-6.0.4.orig/include/VBox/HostServices/glext.h +++ VirtualBox-6.0.4/include/VBox/HostServices/glext.h -@@ -3395,8 +3395,10 @@ typedef char GLchar; /* native charact +@@ -3395,7 +3395,11 @@ typedef char GLchar; /* native charact #ifndef GL_VERSION_1_5 /* GL types for handling large vertex buffer objects */ typedef ptrdiff_t GLintptr; +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) typedef ptrdiff_t GLsizeiptr; - #endif ++#else ++typedef long int GLsizeiptr +#endif + #endif #ifndef GL_ARB_vertex_buffer_object - /* GL types for handling large vertex buffer objects */ Index: VirtualBox-6.0.4/src/VBox/Additions/3D/mesa/mesa-17.3.9/include/GL/glext.h =================================================================== --- VirtualBox-6.0.4.orig/src/VBox/Additions/3D/mesa/mesa-17.3.9/include/GL/glext.h +++ VirtualBox-6.0.4/src/VBox/Additions/3D/mesa/mesa-17.3.9/include/GL/glext.h -@@ -465,7 +465,9 @@ GLAPI void APIENTRY glBlendEquation (GLe +@@ -465,7 +465,11 @@ GLAPI void APIENTRY glBlendEquation (GLe #ifndef GL_VERSION_1_5 #define GL_VERSION_1_5 1 #include +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) typedef ptrdiff_t GLsizeiptr; ++#else ++typedef long int GLsizeiptr +#endif typedef ptrdiff_t GLintptr; #define GL_BUFFER_SIZE 0x8764 @@ -46,12 +50,14 @@ Index: VirtualBox-6.0.4/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcorea =================================================================== --- VirtualBox-6.0.4.orig/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcorearb.h +++ VirtualBox-6.0.4/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcorearb.h -@@ -614,7 +614,9 @@ GLAPI void APIENTRY glBlendEquation (GLe +@@ -614,7 +614,11 @@ GLAPI void APIENTRY glBlendEquation (GLe #ifndef GL_VERSION_1_5 #define GL_VERSION_1_5 1 #include +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) typedef ptrdiff_t GLsizeiptr; ++#else ++typedef long int GLsizeiptr +#endif typedef ptrdiff_t GLintptr; #define GL_BUFFER_SIZE 0x8764 @@ -60,12 +66,14 @@ Index: VirtualBox-6.0.4/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext.h =================================================================== --- VirtualBox-6.0.4.orig/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext.h +++ VirtualBox-6.0.4/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext.h -@@ -465,7 +465,9 @@ GLAPI void APIENTRY glBlendEquation (GLe +@@ -465,7 +465,11 @@ GLAPI void APIENTRY glBlendEquation (GLe #ifndef GL_VERSION_1_5 #define GL_VERSION_1_5 1 #include +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) typedef ptrdiff_t GLsizeiptr; ++#else ++typedef long int GLsizeiptr +#endif typedef ptrdiff_t GLintptr; #define GL_BUFFER_SIZE 0x8764 @@ -74,57 +82,62 @@ Index: VirtualBox-6.0.4/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h =================================================================== --- VirtualBox-6.0.4.orig/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h +++ VirtualBox-6.0.4/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h -@@ -3708,8 +3708,10 @@ typedef char GLchar; /* native charact +@@ -3708,7 +3708,11 @@ typedef char GLchar; /* native charact #ifndef GL_VERSION_1_5 /* GL types for handling large vertex buffer objects */ typedef ptrdiff_t GLintptr; +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) typedef ptrdiff_t GLsizeiptr; - #endif ++#else ++typedef long int GLsizeiptr +#endif + #endif #ifndef GL_ARB_vertex_buffer_object - /* GL types for handling large vertex buffer objects */ Index: VirtualBox-6.0.4/src/VBox/Devices/Graphics/vmsvga_glext/glext.h =================================================================== --- VirtualBox-6.0.4.orig/src/VBox/Devices/Graphics/vmsvga_glext/glext.h +++ VirtualBox-6.0.4/src/VBox/Devices/Graphics/vmsvga_glext/glext.h -@@ -6194,8 +6194,10 @@ typedef char GLchar; +@@ -6194,7 +6194,11 @@ typedef char GLchar; #ifndef GL_VERSION_1_5 /* GL types for handling large vertex buffer objects */ typedef ptrdiff_t GLintptr; +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) typedef ptrdiff_t GLsizeiptr; - #endif ++#else ++typedef long int GLsizeiptr +#endif + #endif #ifndef GL_ARB_vertex_buffer_object - /* GL types for handling large vertex buffer objects */ Index: VirtualBox-6.0.4/src/VBox/GuestHost/OpenGL/include/GL/glext.h =================================================================== --- VirtualBox-6.0.4.orig/src/VBox/GuestHost/OpenGL/include/GL/glext.h +++ VirtualBox-6.0.4/src/VBox/GuestHost/OpenGL/include/GL/glext.h -@@ -3717,8 +3717,10 @@ typedef char GLchar; /* native charact +@@ -3717,7 +3717,11 @@ typedef char GLchar; /* native charact #ifndef GL_VERSION_1_5 /* GL types for handling large vertex buffer objects */ typedef ptrdiff_t GLintptr; +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) typedef ptrdiff_t GLsizeiptr; - #endif ++#else ++typedef long int GLsizeiptr +#endif + #endif #ifndef GL_ARB_vertex_buffer_object - /* GL types for handling large vertex buffer objects */ Index: VirtualBox-6.0.4/src/VBox/GuestHost/OpenGL/include/chromium.h =================================================================== --- VirtualBox-6.0.4.orig/src/VBox/GuestHost/OpenGL/include/chromium.h +++ VirtualBox-6.0.4/src/VBox/GuestHost/OpenGL/include/chromium.h -@@ -499,7 +499,9 @@ PROC WINAPI wglGetProcAddress_prox( LPCS +@@ -499,7 +499,11 @@ PROC WINAPI wglGetProcAddress_prox( LPCS #ifndef GL_VERSION_1_5 typedef ptrdiff_t GLintptr; +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) typedef ptrdiff_t GLsizeiptr; ++#else ++typedef long int GLsizeiptr +#endif /* prototype these functions for opengl_stub/getprocaddress.c */ diff --git a/virtualbox.changes b/virtualbox.changes index 5b7a332..16bb924 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Wed Mar 27 17:53:11 UTC 2019 - Larry Finger +Thu Mar 28 00:20:43 UTC 2019 - Larry Finger - Fix build with the pending Qt 5.13. File "fixes_for_qt5.13.patch" is added. bsc#1130503 From 5447aabb6ce80b0a957acc3dcf1d7c9168da6f78654ad3ad6b017d8d52814e5b Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Thu, 28 Mar 2019 00:47:13 +0000 Subject: [PATCH 4/7] OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=478 --- fixes_for_qt5.13.patch | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/fixes_for_qt5.13.patch b/fixes_for_qt5.13.patch index 3506d6f..36dbcea 100644 --- a/fixes_for_qt5.13.patch +++ b/fixes_for_qt5.13.patch @@ -9,7 +9,7 @@ Index: VirtualBox-6.0.4/include/VBox/VBoxGL2D.h +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) typedef ptrdiff_t GLsizeiptr; +#else -+typedef long int GLsizeiptr ++typedef long int GLsizeiptr; +#endif #endif @@ -25,7 +25,7 @@ Index: VirtualBox-6.0.4/include/VBox/HostServices/glext.h +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) typedef ptrdiff_t GLsizeiptr; +#else -+typedef long int GLsizeiptr ++typedef long int GLsizeiptr; +#endif #endif @@ -41,7 +41,7 @@ Index: VirtualBox-6.0.4/src/VBox/Additions/3D/mesa/mesa-17.3.9/include/GL/glext. +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) typedef ptrdiff_t GLsizeiptr; +#else -+typedef long int GLsizeiptr ++typedef long int GLsizeiptr; +#endif typedef ptrdiff_t GLintptr; #define GL_BUFFER_SIZE 0x8764 @@ -57,7 +57,7 @@ Index: VirtualBox-6.0.4/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcorea +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) typedef ptrdiff_t GLsizeiptr; +#else -+typedef long int GLsizeiptr ++typedef long int GLsizeiptr; +#endif typedef ptrdiff_t GLintptr; #define GL_BUFFER_SIZE 0x8764 @@ -73,7 +73,7 @@ Index: VirtualBox-6.0.4/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext.h +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) typedef ptrdiff_t GLsizeiptr; +#else -+typedef long int GLsizeiptr ++typedef long int GLsizeiptr; +#endif typedef ptrdiff_t GLintptr; #define GL_BUFFER_SIZE 0x8764 @@ -89,7 +89,7 @@ Index: VirtualBox-6.0.4/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) typedef ptrdiff_t GLsizeiptr; +#else -+typedef long int GLsizeiptr ++typedef long int GLsizeiptr; +#endif #endif @@ -105,7 +105,7 @@ Index: VirtualBox-6.0.4/src/VBox/Devices/Graphics/vmsvga_glext/glext.h +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) typedef ptrdiff_t GLsizeiptr; +#else -+typedef long int GLsizeiptr ++typedef long int GLsizeiptr; +#endif #endif @@ -121,7 +121,7 @@ Index: VirtualBox-6.0.4/src/VBox/GuestHost/OpenGL/include/GL/glext.h +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) typedef ptrdiff_t GLsizeiptr; +#else -+typedef long int GLsizeiptr ++typedef long int GLsizeiptr; +#endif #endif @@ -137,8 +137,9 @@ Index: VirtualBox-6.0.4/src/VBox/GuestHost/OpenGL/include/chromium.h +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) typedef ptrdiff_t GLsizeiptr; +#else -+typedef long int GLsizeiptr ++typedef long int GLsizeiptr; +#endif /* prototype these functions for opengl_stub/getprocaddress.c */ extern void APIENTRY glGenQueries(GLsizei n, GLuint *ids); + From 606a5f1184b5508d11ffbea81943c4f5ad27d702363c016b0b44452779ad1542 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Fri, 5 Apr 2019 14:49:14 +0000 Subject: [PATCH 5/7] Accepting request 690451 from home:frispete:kernel Hi Larry, here's is my current state of VB affairs. It's more a RFC, but it contains everything to build that biest for the most prominent distributions. The new patch virtualbox-fix-ui-background-color.patch is an attempt to deuglify the UI with certain color schemes. Again, RFC stuff for you to look at. Thanks, Pete - adjust patch virtualbox-fix-ui-background-color.patch to really fix the background color messing... - add patch to stop UI messing with Highlight Color for background - apply fixes_for_qt5.13.patch for Qt versions >= 5.13.0 only - Add setBadness('permissions-unauthorized-file',333) to rpmlintrc - Remove suid attributes from all files - add libgsoap version dependency >= 2.8.50 (recv_maxlength) - Fix virtualbox wrapper script virtualbox-wrapper.sh to check 60-vboxdrv.rules in /usr/lib/udev/rules.d, not /etc/udev/rules.d Logic is still flawed, until it doesn't take both locations into account - Add custom /etc/permission.d/virtualbox{,.paranoid} definitions - Add compatibility symlink to keep old desktop links functional OBS-URL: https://build.opensuse.org/request/show/690451 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=479 --- virtualbox-fix-ui-background-color.patch | 301 +++++++++++++++++++++++ virtualbox-rpmlintrc | 1 + virtualbox-wrapper.sh | 8 +- virtualbox.changes | 29 +++ virtualbox.permissions | 9 + virtualbox.permissions.paranoid | 9 + virtualbox.spec | 35 ++- 7 files changed, 381 insertions(+), 11 deletions(-) create mode 100644 virtualbox-fix-ui-background-color.patch create mode 100644 virtualbox.permissions create mode 100644 virtualbox.permissions.paranoid diff --git a/virtualbox-fix-ui-background-color.patch b/virtualbox-fix-ui-background-color.patch new file mode 100644 index 0000000..27240a1 --- /dev/null +++ b/virtualbox-fix-ui-background-color.patch @@ -0,0 +1,301 @@ +Index: b/src/VBox/Frontends/VirtualBox/src/manager/tools/UITools.cpp +=================================================================== +--- a/src/VBox/Frontends/VirtualBox/src/manager/tools/UITools.cpp ++++ b/src/VBox/Frontends/VirtualBox/src/manager/tools/UITools.cpp +@@ -114,10 +114,6 @@ void UITools::preparePalette() + { + /* Setup palette: */ + setAutoFillBackground(true); +- QPalette pal = palette(); +- QColor bodyColor = pal.color(QPalette::Active, QPalette::Midlight).darker(110); +- pal.setColor(QPalette::Window, bodyColor); +- setPalette(pal); + } + + void UITools::prepareLayout() +Index: b/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp +=================================================================== +--- a/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp ++++ b/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp +@@ -1299,7 +1299,7 @@ void UIVirtualBoxManager::prepareMenuBar + /* Make sure menu-bar fills own solid background: */ + menuBar()->setAutoFillBackground(true); + QPalette pal = menuBar()->palette(); +- const QColor color = pal.color(QPalette::Active, QPalette::Mid).lighter(160); ++ const QColor color = pal.color(QPalette::Active, QPalette::Window); + pal.setColor(QPalette::Active, QPalette::Button, color); + menuBar()->setPalette(pal); + } +Index: b/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooser.cpp +=================================================================== +--- a/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooser.cpp ++++ b/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooser.cpp +@@ -121,10 +121,6 @@ void UIChooser::preparePalette() + { + /* Setup palette: */ + setAutoFillBackground(true); +- QPalette pal = palette(); +- QColor bodyColor = pal.color(QPalette::Active, QPalette::Midlight).darker(110); +- pal.setColor(QPalette::Window, bodyColor); +- setPalette(pal); + } + + void UIChooser::prepareLayout() +Index: b/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemMachine.cpp +=================================================================== +--- a/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemMachine.cpp ++++ b/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemMachine.cpp +@@ -1025,7 +1025,7 @@ void UIChooserItemMachine::paintBackgrou + else + { + /* Prepare color: */ +- QColor backgroundColor = pal.color(QPalette::Active, QPalette::Mid); ++ QColor backgroundColor = pal.color(QPalette::Active, QPalette::Button); + /* Draw gradient: */ + QLinearGradient bgGrad(rectangle.topLeft(), rectangle.bottomLeft()); + bgGrad.setColorAt(0, backgroundColor.lighter(m_iDefaultLightnessMax)); +@@ -1054,7 +1054,7 @@ void UIChooserItemMachine::paintBackgrou + /* Default background: */ + else + { +- QColor backgroundColor = pal.color(QPalette::Active, QPalette::Mid); ++ QColor backgroundColor = pal.color(QPalette::Active, QPalette::Button); + color1 = backgroundColor.lighter(m_iDefaultLightnessMax); + color2 = backgroundColor.lighter(m_iDefaultLightnessMax - 70); + } +@@ -1075,7 +1075,7 @@ void UIChooserItemMachine::paintBackgrou + /* Default background: */ + else + { +- QColor backgroundColor = pal.color(QPalette::Active, QPalette::Mid); ++ QColor backgroundColor = pal.color(QPalette::Active, QPalette::Button); + color1 = backgroundColor.lighter(m_iDefaultLightnessMin); + color2 = backgroundColor.lighter(m_iDefaultLightnessMin - 40); + } +@@ -1110,7 +1110,7 @@ void UIChooserItemMachine::paintFrame(QP + strokeColor = pal.color(QPalette::Active, QPalette::Highlight).lighter(m_iHoverLightnessMin - 50); + /* Default frame: */ + else +- strokeColor = pal.color(QPalette::Active, QPalette::Mid).lighter(m_iDefaultLightnessMin); ++ strokeColor = pal.color(QPalette::Active, QPalette::Button).lighter(m_iDefaultLightnessMin); + + /* Create/assign pen: */ + QPen pen(strokeColor); +Index: b/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsItem.cpp +=================================================================== +--- a/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsItem.cpp ++++ b/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsItem.cpp +@@ -710,7 +710,7 @@ void UIToolsItem::paintBackground(QPaint + /* Prepare color: */ + const QColor backgroundColor = isEnabled() + ? pal.color(QPalette::Active, QPalette::Highlight) +- : pal.color(QPalette::Disabled, QPalette::Midlight); ++ : pal.color(QPalette::Disabled, QPalette::Highlight); + /* Draw gradient: */ + QLinearGradient bgGrad(rectangle.topLeft(), rectangle.bottomLeft()); + bgGrad.setColorAt(0, backgroundColor.lighter(m_iHighlightLightnessMax)); +@@ -749,7 +749,7 @@ void UIToolsItem::paintBackground(QPaint + /* Prepare color: */ + const QColor backgroundColor = isEnabled() + ? pal.color(QPalette::Active, QPalette::Highlight) +- : pal.color(QPalette::Disabled, QPalette::Midlight); ++ : pal.color(QPalette::Disabled, QPalette::Highlight); + /* Draw gradient: */ + QLinearGradient bgGrad(rectangle.topLeft(), rectangle.bottomLeft()); + bgGrad.setColorAt(0, backgroundColor.lighter(m_iHoverLightnessMax)); +@@ -787,8 +787,8 @@ void UIToolsItem::paintBackground(QPaint + { + /* Prepare color: */ + const QColor backgroundColor = isEnabled() +- ? pal.color(QPalette::Active, QPalette::Mid) +- : pal.color(QPalette::Disabled, QPalette::Midlight); ++ ? pal.color(QPalette::Active, QPalette::Window) ++ : pal.color(QPalette::Disabled, QPalette::Window); + /* Draw gradient: */ + QLinearGradient bgGrad(rectangle.topLeft(), rectangle.bottomLeft()); + bgGrad.setColorAt(0, backgroundColor.lighter(m_iDefaultLightnessMax)); +@@ -821,7 +821,7 @@ void UIToolsItem::paintFrame(QPainter *p + strokeColor = pal.color(QPalette::Active, QPalette::Highlight).lighter(m_iHoverLightnessMin - 50); + /* Default frame: */ + else +- strokeColor = pal.color(QPalette::Active, QPalette::Mid).lighter(m_iDefaultLightnessMin); ++ strokeColor = pal.color(QPalette::Active, QPalette::Button).lighter(m_iDefaultLightnessMin); + + /* Create/assign pen: */ + QPen pen(strokeColor); +Index: b/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp +=================================================================== +--- a/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp ++++ b/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp +@@ -355,14 +355,6 @@ void UIVirtualBoxManagerWidget::prepare( + { + /* Configure palette: */ + setAutoFillBackground(true); +- QPalette pal = palette(); +-#ifdef VBOX_WS_MAC +- const QColor color = pal.color(QPalette::Active, QPalette::Mid).lighter(145); +-#else +- const QColor color = pal.color(QPalette::Active, QPalette::Mid).lighter(160); +-#endif +- pal.setColor(QPalette::Window, color); +- setPalette(pal); + + /* Prepare: */ + prepareWidgets(); +@@ -490,7 +482,7 @@ void UIVirtualBoxManagerWidget::prepareW + } + + /* Adjust splitter colors according to main widgets it splits: */ +- m_pSplitter->configureColor(palette().color(QPalette::Active, QPalette::Midlight).darker(110)); ++ m_pSplitter->configureColor(palette().color(QPalette::Active, QPalette::Button).darker(110)); + /* Set the initial distribution. The right site is bigger. */ + m_pSplitter->setStretchFactor(0, 2); + m_pSplitter->setStretchFactor(1, 3); +Index: b/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItem.cpp +=================================================================== +--- a/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItem.cpp ++++ b/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItem.cpp +@@ -642,7 +642,7 @@ void UIChooserItem::paintFlatButton(QPai + + /* Prepare colors: */ + const QPalette pal = QApplication::palette(); +- const QColor color = pal.color(QPalette::Active, QPalette::Mid); ++ const QColor color = pal.color(QPalette::Active, QPalette::Button); + + /* Prepare pen: */ + QPen pen; +Index: b/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserView.cpp +=================================================================== +--- a/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserView.cpp ++++ b/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserView.cpp +@@ -178,10 +178,6 @@ void UIChooserView::prepare() + void UIChooserView::preparePalette() + { + /* Setup palette: */ +- QPalette pal = qApp->palette(); +- const QColor bodyColor = pal.color(QPalette::Active, QPalette::Midlight).darker(110); +- pal.setColor(QPalette::Base, bodyColor); +- setPalette(pal); + } + + void UIChooserView::resizeEvent(QResizeEvent *pEvent) +Index: b/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsView.cpp +=================================================================== +--- a/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsView.cpp ++++ b/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsView.cpp +@@ -182,10 +182,6 @@ void UIToolsView::prepare() + void UIToolsView::preparePalette() + { + /* Setup palette: */ +- QPalette pal = qApp->palette(); +- const QColor bodyColor = pal.color(QPalette::Active, QPalette::Midlight).darker(110); +- pal.setColor(QPalette::Base, bodyColor); +- setPalette(pal); + } + + void UIToolsView::resizeEvent(QResizeEvent *pEvent) +Index: b/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElement.cpp +=================================================================== +--- a/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElement.cpp ++++ b/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElement.cpp +@@ -667,7 +667,7 @@ void UIDetailsElement::paintBackground(Q + const QPalette pal = palette(); + + /* Paint default background: */ +- const QColor defaultColor = pal.color(QPalette::Active, QPalette::Mid); ++ const QColor defaultColor = pal.color(QPalette::Active, QPalette::Window); + const QColor dcTone1 = defaultColor.lighter(m_iDefaultToneFinal); + const QColor dcTone2 = defaultColor.lighter(m_iDefaultToneStart); + QLinearGradient gradientDefault(fullRect.topLeft(), fullRect.bottomLeft()); +@@ -708,7 +708,7 @@ void UIDetailsElement::paintFrame(QPaint + : optionRect; + + /* Paint frame: */ +- const QColor strokeColor = palette().color(QPalette::Active, QPalette::Mid).lighter(m_iDefaultToneStart); ++ const QColor strokeColor = palette().color(QPalette::Active, QPalette::Window).lighter(m_iDefaultToneStart); + QPen pen(strokeColor); + pen.setWidth(0); + pPainter->setPen(pen); +Index: b/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBar.cpp +=================================================================== +--- a/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBar.cpp ++++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBar.cpp +@@ -110,7 +110,7 @@ void UIToolBar::paintEvent(QPaintEvent * + const QRect rectangle = pEvent->rect(); + + /* Prepare gradient: */ +- const QColor backgroundColor = palette().color(QPalette::Active, QPalette::Mid); ++ const QColor backgroundColor = palette().color(QPalette::Active, QPalette::Window); + QLinearGradient gradient(rectangle.topLeft(), rectangle.bottomLeft()); + gradient.setColorAt(0, backgroundColor.lighter(130)); + gradient.setColorAt(1, backgroundColor.lighter(125)); +Index: b/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsSet.cpp +=================================================================== +--- a/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsSet.cpp ++++ b/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsSet.cpp +@@ -700,7 +700,7 @@ void UIDetailsSet::paintBackground(QPain + const QRect optionRect = pOptions->rect; + + /* Paint default background: */ +- const QColor defaultColor = palette().color(QPalette::Active, QPalette::Midlight).darker(110); ++ const QColor defaultColor = palette().color(QPalette::Active, QPalette::Window).darker(110); + pPainter->fillRect(optionRect, defaultColor); + + /* Restore painter: */ +Index: b/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGlobal.cpp +=================================================================== +--- a/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGlobal.cpp ++++ b/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGlobal.cpp +@@ -655,7 +655,7 @@ void UIChooserItemGlobal::paintBackgroun + pPainter->fillRect(rectangle, bgGrad); + #else + /* Prepare color: */ +- QColor backgroundColor = pal.color(QPalette::Active, QPalette::Mid).lighter(160); ++ QColor backgroundColor = pal.color(QPalette::Active, QPalette::Window).lighter(160); + /* Draw gradient: */ + pPainter->fillRect(rectangle, backgroundColor); + #endif +@@ -686,7 +686,7 @@ void UIChooserItemGlobal::paintFrame(QPa + strokeColor = pal.color(QPalette::Active, QPalette::Highlight).lighter(m_iHoverLightnessMin - 50); + /* Default frame: */ + else +- strokeColor = pal.color(QPalette::Active, QPalette::Mid).lighter(m_iDefaultLightnessMin); ++ strokeColor = pal.color(QPalette::Active, QPalette::Window).lighter(m_iDefaultLightnessMin); + + /* Create/assign pen: */ + QPen pen(strokeColor); +Index: b/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsGroup.cpp +=================================================================== +--- a/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsGroup.cpp ++++ b/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsGroup.cpp +@@ -288,7 +288,7 @@ void UIDetailsGroup::paintBackground(QPa + #ifdef VBOX_WS_MAC + const QColor defaultColor = palette().color(QPalette::Active, QPalette::Mid).lighter(145); + #else +- const QColor defaultColor = palette().color(QPalette::Active, QPalette::Mid).lighter(160); ++ const QColor defaultColor = palette().color(QPalette::Active, QPalette::Window).lighter(160); + #endif + pPainter->fillRect(optionRect, defaultColor); + +Index: b/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGroup.cpp +=================================================================== +--- a/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGroup.cpp ++++ b/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGroup.cpp +@@ -1630,7 +1630,7 @@ void UIChooserItemGroup::paintBackground + const QPalette pal = palette(); + const QColor headerColor = pal.color(QPalette::Active, + model()->currentItems().contains(this) ? +- QPalette::Highlight : QPalette::Midlight); ++ QPalette::Highlight : QPalette::Button); + + /* Root-item: */ + if (isRoot()) +@@ -1714,7 +1714,7 @@ void UIChooserItemGroup::paintFrame(QPai + const QPalette pal = palette(); + const QColor strokeColor = pal.color(QPalette::Active, + model()->currentItems().contains(this) ? +- QPalette::Highlight : QPalette::Midlight).darker(headerDarkness() + 10); ++ QPalette::Highlight : QPalette::Button).darker(headerDarkness() + 10); + + /* Create/assign pen: */ + QPen pen(strokeColor); diff --git a/virtualbox-rpmlintrc b/virtualbox-rpmlintrc index b32bd29..0336de8 100644 --- a/virtualbox-rpmlintrc +++ b/virtualbox-rpmlintrc @@ -1,3 +1,4 @@ addFilter("incoherent-init-script-name vboxdrv") addFilter("incoherent-init-script-name vboxadd") addFilter("xorg-x11-driver-virtualbox-ose.* shlib-policy-missing-suffix") +setBadness("permissions-unauthorized-file", 333) diff --git a/virtualbox-wrapper.sh b/virtualbox-wrapper.sh index 4bd3b0a..2e4ce1f 100644 --- a/virtualbox-wrapper.sh +++ b/virtualbox-wrapper.sh @@ -6,7 +6,7 @@ export QT_NO_KDE_INTEGRATION=1 # Handle the issue regarding USB passthru # The following conditions apply: # 1. If ~/.vbox/enable exists, the user accepts the security risk. -# 2. If ~/.vbox/disable exists, the user does not accept the risk. That file will contain the inode of /etc/udev/rules.d/60-vboxdrv.rules. +# 2. If ~/.vbox/disable exists, the user does not accept the risk. That file will contain the inode of /usr/lib/udev/rules.d/60-vboxdrv.rules. # When that changes, the VBoxUSB_DevRules will again be displayed as that means that VB has been reloaded. # devrules() @@ -26,8 +26,8 @@ devrules() # # Ensure that ~/.vbox exists mkdir -p ~/.vbox/ -# Get the inode for /etc/udev/rules.d/60-vboxdrv.rules -INODE=$(stat /etc/udev/rules.d/60-vboxdrv.rules | grep Inode | cut -d' ' -f3) +# Get the inode for /usr/lib/udev/rules.d/60-vboxdrv.rules +INODE=$(stat /usr/lib/udev/rules.d/60-vboxdrv.rules | grep Inode | cut -d' ' -f3) if [ ! -f ~/.vbox/enable ] && [ ! -f ~/.vbox/disable ] ; then # Neither file exists - find what the user wants devrules @@ -38,7 +38,7 @@ if [ -f ~/.vbox/disable ] ; then else LINE=" " fi -# If user originally declined, make certain that /etc/udev/rules.d/60-vboxdrv.rules has not been changed +# If user originally declined, make certain that /usr/lib/udev/rules.d/60-vboxdrv.rules has not been changed if [ -f ~/.vbox/disable ] && [ "$LINE" != "$INODE" ] && [ "$LINE" != "" ] ; then # disable is selected and the Inode has changed - ask again devrules diff --git a/virtualbox.changes b/virtualbox.changes index 16bb924..cb2464b 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Sun Mar 31 21:02:36 UTC 2019 - Hans-Peter Jansen + +- adjust patch virtualbox-fix-ui-background-color.patch to really + fix the background color messing... + +------------------------------------------------------------------- +Sat Mar 30 18:36:47 UTC 2019 - Hans-Peter Jansen + +- add patch to stop UI messing with Highlight Color for background +- apply fixes_for_qt5.13.patch for Qt versions >= 5.13.0 only + ------------------------------------------------------------------- Thu Mar 28 00:20:43 UTC 2019 - Larry Finger @@ -13,6 +25,23 @@ Wed Feb 20 16:31:23 UTC 2019 - Larry Finger - Remove requires on libvncserver for virtualbox-vnc. +------------------------------------------------------------------- +Tue Feb 12 12:05:48 UTC 2019 - Hans-Peter Jansen + +- Add setBadness('permissions-unauthorized-file',333) to rpmlintrc +- Remove suid attributes from all files +- add libgsoap version dependency >= 2.8.50 (recv_maxlength) + +------------------------------------------------------------------- +Mon Feb 11 12:46:26 UTC 2019 - Hans-Peter Jansen + +- Fix virtualbox wrapper script virtualbox-wrapper.sh to check + 60-vboxdrv.rules in /usr/lib/udev/rules.d, not /etc/udev/rules.d + Logic is still flawed, until it doesn't take both locations into + account +- Add custom /etc/permission.d/virtualbox{,.paranoid} definitions +- Add compatibility symlink to keep old desktop links functional + ------------------------------------------------------------------- Thu Jan 31 19:31:20 UTC 2019 - Larry Finger diff --git a/virtualbox.permissions b/virtualbox.permissions new file mode 100644 index 0000000..896db7f --- /dev/null +++ b/virtualbox.permissions @@ -0,0 +1,9 @@ +# virtualbox +/usr/lib/virtualbox/VBoxNetNAT root:vboxusers 4750 +/usr/lib/virtualbox/VBoxNetDHCP root:vboxusers 4750 +/usr/lib/virtualbox/VBoxNetAdpCtl root:vboxusers 4750 +/usr/lib/virtualbox/VBoxHeadless root:vboxusers 4750 +# Virtualbox-qt +/usr/lib/virtualbox/VirtualBoxVM root:vboxusers 4750 +/usr/lib/virtualbox/VBoxSDL root:vboxusers 4750 + diff --git a/virtualbox.permissions.paranoid b/virtualbox.permissions.paranoid new file mode 100644 index 0000000..b286d6c --- /dev/null +++ b/virtualbox.permissions.paranoid @@ -0,0 +1,9 @@ +# virtualbox +/usr/lib/virtualbox/VBoxNetNAT root:vboxusers 0750 +/usr/lib/virtualbox/VBoxNetDHCP root:vboxusers 0750 +/usr/lib/virtualbox/VBoxNetAdpCtl root:vboxusers 0750 +/usr/lib/virtualbox/VBoxHeadless root:vboxusers 0750 +# Virtualbox-qt +/usr/lib/virtualbox/VirtualBoxVM root:vboxusers 0750 +/usr/lib/virtualbox/VBoxSDL root:vboxusers 0750 + diff --git a/virtualbox.spec b/virtualbox.spec index 44a10c0..b772d88 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -16,6 +16,8 @@ # +%define qt5ver %(rpm -q --queryformat %%{version} libQt5Core5|perl -ne '/(\\d+)\\.(\\d+)\\.(\\d+)?/&&printf "%%d%%02d%%02d\\n",$1,$2,$3') + #Compat macro for new _fillupdir macro introduced in Nov 2017 %if ! %{defined _fillupdir} %define _fillupdir /var/adm/fillup-templates @@ -62,6 +64,8 @@ Source8: %{name}-guest-preamble Source9: %{name}-wrapper.sh Source10: %{name}-LocalConfig.kmk Source11: %{name}-60-vboxdrv.rules +Source12: %{name}.permissions +Source13: %{name}.permissions.paranoid Source14: vboxdrv.service Source15: vboxadd-service.service Source16: vboxconfig.sh @@ -138,6 +142,7 @@ Patch130: fixes_for_5.1.patch # Fixes for Qt5.13 Patch131: fixes_for_qt5.13.patch #endif +Patch999: virtualbox-fix-ui-background-color.patch # BuildRequires: LibVNCServer-devel BuildRequires: SDL-devel @@ -160,7 +165,7 @@ BuildRequires: fdupes BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: glibc-devel-static -BuildRequires: gsoap-devel +BuildRequires: gsoap-devel >= 2.8.50 BuildRequires: java-devel >= 1.6.0 BuildRequires: kbuild >= 0.1.9998svn3101 #BuildRequires: kernel-syms @@ -440,7 +445,11 @@ as an "extpack" for VirtualBox. The implementation is licensed under GPL. %patch128 -p1 %patch129 -p1 %patch130 -p1 + +%if %{qt5ver} >= 51300 %patch131 -p1 +%endif +%patch999 -p1 #copy user manual cp %{SOURCE1} UserManual.pdf @@ -569,6 +578,8 @@ install -d -m 755 %{buildroot}%{_libdir}/dri install -d -m 755 %{buildroot}%{_libdir}/xorg/modules/drivers install -d -m 755 %{buildroot}%{_libdir}/xorg/modules/input install -d -m 755 %{buildroot}%{_sysconfdir}/default +install -d -m 755 %{buildroot}%{_sysconfdir}/init.d +install -d -m 755 %{buildroot}%{_sysconfdir}/permissions.d install -d %{buildroot}%{_unitdir} install -d %{buildroot}%{_unitdir}/multi-user.target.wants install -d -m 755 %{buildroot}%{_sysconfdir}/vbox @@ -655,6 +666,8 @@ install -m 755 VBoxNetDHCP %{buildroot}%{_vbox_instdir} install -m 755 VBoxNetAdpCtl %{buildroot}%{_vbox_instdir} install -m 755 VirtualBox %{buildroot}%{_vbox_instdir}/VirtualBox6 install -m 755 VirtualBoxVM %{buildroot}%{_vbox_instdir} +# compatibility symlink in order to keep old desktop links functional +ln -s %{_vbox_instdir}/VirtualBoxVM %{buildroot}%{_vbox_instdir}/VirtualBox install -m 755 VBoxEFI*.fd %{buildroot}%{_vbox_instdir} install -m 755 VBoxSysInfo.sh %{buildroot}%{_vbox_instdir} install -m 644 *.so %{buildroot}%{_vbox_instdir} @@ -682,6 +695,10 @@ install -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/default/virtualbox #install wrapper script install -m 644 %{SOURCE9} %{buildroot}%{_bindir}/VirtualBox +# permissions +install -m 644 %{SOURCE12} %{buildroot}%{_sysconfdir}/permissions.d/virtualbox +install -m 644 %{SOURCE13} %{buildroot}%{_sysconfdir}/permissions.d/virtualbox.paranoid + # Service files to load kernel modules on boot install -m 0644 %{SOURCE14} %{buildroot}%{_unitdir}/vboxdrv.service ln -s -f %{_sbindir}/service %{buildroot}%{_sbindir}/rcvboxdrv @@ -934,10 +951,13 @@ export DISABLE_RESTART_ON_UPDATE=yes %{_sbindir}/rcvboxdrv /sbin/vboxconfig %{_vbox_instdir}/VBoxCreateUSBNode.sh -%verify(not mode) %attr(4755,root,vboxusers) %{_vbox_instdir}/VBoxNetNAT -%verify(not mode) %attr(4750,root,vboxusers) %{_vbox_instdir}/VBoxNetDHCP -%verify(not mode) %attr(4750,root,vboxusers) %{_vbox_instdir}/VBoxNetAdpCtl -%verify(not mode) %attr(4750,root,vboxusers) %{_vbox_instdir}/VBoxHeadless +%verify(not mode) %attr(0750,root,vboxusers) %{_vbox_instdir}/VBoxNetNAT +%verify(not mode) %attr(0750,root,vboxusers) %{_vbox_instdir}/VBoxNetDHCP +%verify(not mode) %attr(0750,root,vboxusers) %{_vbox_instdir}/VBoxNetAdpCtl +%verify(not mode) %attr(0750,root,vboxusers) %{_vbox_instdir}/VBoxHeadless +# not %config tagged for security reasons +%{_sysconfdir}/permissions.d/virtualbox +%{_sysconfdir}/permissions.d/virtualbox.paranoid %dir %{_sysconfdir}/vbox %attr(1775,root,vboxusers) %{_sysconfdir}/vbox %config %attr(644,root,vboxusers) %{_sysconfdir}/vbox/vbox.cfg @@ -948,8 +968,9 @@ export DISABLE_RESTART_ON_UPDATE=yes %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxPermissionMessage %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxUSB_DevRules %attr(0755,root,vboxusers) %{_vbox_instdir}/VirtualBox6 -%verify(not mode) %attr(4750,root,vboxusers) %{_vbox_instdir}/VirtualBoxVM -%verify(not mode) %attr(4750,root,vboxusers) %{_vbox_instdir}/VBoxSDL +%verify(not mode) %attr(0750,root,vboxusers) %{_vbox_instdir}/VirtualBoxVM +%verify(not mode) %attr(0750,root,vboxusers) %{_vbox_instdir}/VBoxSDL +%{_vbox_instdir}/VirtualBox #wrapper script is in bindir %attr(0755,root,root) %{_bindir}/VirtualBox #rules fixing script is in /sbin From 6b9b49ab29eef9cda5fbeef6242257af970240f7dae0c1c9fbd87e35b2216f6c Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Fri, 5 Apr 2019 16:15:43 +0000 Subject: [PATCH 6/7] - Fix file "fixes_for_qt5.13.patch" - macro QT_VERSION_CHECK is not available for Qt < 5.13. Substitute the equivalent (qtmajor << 16 + qtminor << 8). OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=480 --- fixes_for_qt5.13.patch | 19 +++++++++---------- virtualbox.changes | 6 ++++++ 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/fixes_for_qt5.13.patch b/fixes_for_qt5.13.patch index 36dbcea..5fccd27 100644 --- a/fixes_for_qt5.13.patch +++ b/fixes_for_qt5.13.patch @@ -6,7 +6,7 @@ Index: VirtualBox-6.0.4/include/VBox/VBoxGL2D.h /* GL_ARB_pixel_buffer_object*/ #ifndef Q_WS_MAC /* apears to be defined on mac */ -+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) ++#if QT_VERSION < 0x50D00 typedef ptrdiff_t GLsizeiptr; +#else +typedef long int GLsizeiptr; @@ -22,7 +22,7 @@ Index: VirtualBox-6.0.4/include/VBox/HostServices/glext.h #ifndef GL_VERSION_1_5 /* GL types for handling large vertex buffer objects */ typedef ptrdiff_t GLintptr; -+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) ++#if QT_VERSION < 0x50D00 typedef ptrdiff_t GLsizeiptr; +#else +typedef long int GLsizeiptr; @@ -38,7 +38,7 @@ Index: VirtualBox-6.0.4/src/VBox/Additions/3D/mesa/mesa-17.3.9/include/GL/glext. #ifndef GL_VERSION_1_5 #define GL_VERSION_1_5 1 #include -+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) ++#if QT_VERSION < 0x50D00 typedef ptrdiff_t GLsizeiptr; +#else +typedef long int GLsizeiptr; @@ -54,7 +54,7 @@ Index: VirtualBox-6.0.4/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcorea #ifndef GL_VERSION_1_5 #define GL_VERSION_1_5 1 #include -+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) ++#if QT_VERSION < 0x50D00 typedef ptrdiff_t GLsizeiptr; +#else +typedef long int GLsizeiptr; @@ -70,7 +70,7 @@ Index: VirtualBox-6.0.4/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext.h #ifndef GL_VERSION_1_5 #define GL_VERSION_1_5 1 #include -+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) ++#if QT_VERSION < 0x50D00 typedef ptrdiff_t GLsizeiptr; +#else +typedef long int GLsizeiptr; @@ -86,7 +86,7 @@ Index: VirtualBox-6.0.4/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h #ifndef GL_VERSION_1_5 /* GL types for handling large vertex buffer objects */ typedef ptrdiff_t GLintptr; -+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) ++#if QT_VERSION < 0x50D00 typedef ptrdiff_t GLsizeiptr; +#else +typedef long int GLsizeiptr; @@ -102,7 +102,7 @@ Index: VirtualBox-6.0.4/src/VBox/Devices/Graphics/vmsvga_glext/glext.h #ifndef GL_VERSION_1_5 /* GL types for handling large vertex buffer objects */ typedef ptrdiff_t GLintptr; -+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) ++#if QT_VERSION < 0x50D00 typedef ptrdiff_t GLsizeiptr; +#else +typedef long int GLsizeiptr; @@ -118,7 +118,7 @@ Index: VirtualBox-6.0.4/src/VBox/GuestHost/OpenGL/include/GL/glext.h #ifndef GL_VERSION_1_5 /* GL types for handling large vertex buffer objects */ typedef ptrdiff_t GLintptr; -+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) ++#if QT_VERSION < 0x50D00 typedef ptrdiff_t GLsizeiptr; +#else +typedef long int GLsizeiptr; @@ -134,7 +134,7 @@ Index: VirtualBox-6.0.4/src/VBox/GuestHost/OpenGL/include/chromium.h #ifndef GL_VERSION_1_5 typedef ptrdiff_t GLintptr; -+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) ++#if QT_VERSION < 0x50d00 typedef ptrdiff_t GLsizeiptr; +#else +typedef long int GLsizeiptr; @@ -142,4 +142,3 @@ Index: VirtualBox-6.0.4/src/VBox/GuestHost/OpenGL/include/chromium.h /* prototype these functions for opengl_stub/getprocaddress.c */ extern void APIENTRY glGenQueries(GLsizei n, GLuint *ids); - diff --git a/virtualbox.changes b/virtualbox.changes index cb2464b..5c56c4d 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Apr 5 16:11:40 UTC 2019 - Larry Finger + +- Fix file "fixes_for_qt5.13.patch" - macro QT_VERSION_CHECK is not available for Qt < 5.13. + Substitute the equivalent (qtmajor << 16 + qtminor << 8). + ------------------------------------------------------------------- Sun Mar 31 21:02:36 UTC 2019 - Hans-Peter Jansen From 3056d68fa7716816942848ad1492c5642cd067afba82f509e47086ce1006afa9 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Fri, 5 Apr 2019 22:17:46 +0000 Subject: [PATCH 7/7] - Fix problems with use of files "virtualbox.permissions" and "virtualbox.permissions.paranoid" - they are deleted Removed setBadness line from virtualbox-rpmlinc. OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=481 --- fixes_for_qt5.13.patch | 64 ++++++++++----------------------- virtualbox-rpmlintrc | 1 - virtualbox.changes | 6 ++++ virtualbox.permissions | 9 ----- virtualbox.permissions.paranoid | 9 ----- virtualbox.spec | 10 ------ 6 files changed, 25 insertions(+), 74 deletions(-) delete mode 100644 virtualbox.permissions delete mode 100644 virtualbox.permissions.paranoid diff --git a/fixes_for_qt5.13.patch b/fixes_for_qt5.13.patch index 5fccd27..90944e1 100644 --- a/fixes_for_qt5.13.patch +++ b/fixes_for_qt5.13.patch @@ -2,15 +2,12 @@ Index: VirtualBox-6.0.4/include/VBox/VBoxGL2D.h =================================================================== --- VirtualBox-6.0.4.orig/include/VBox/VBoxGL2D.h +++ VirtualBox-6.0.4/include/VBox/VBoxGL2D.h -@@ -113,7 +113,11 @@ typedef GLvoid (APIENTRY *PFNVBOXVHWA_UN +@@ -113,7 +113,7 @@ typedef GLvoid (APIENTRY *PFNVBOXVHWA_UN /* GL_ARB_pixel_buffer_object*/ #ifndef Q_WS_MAC /* apears to be defined on mac */ -+#if QT_VERSION < 0x50D00 - typedef ptrdiff_t GLsizeiptr; -+#else +-typedef ptrdiff_t GLsizeiptr; +typedef long int GLsizeiptr; -+#endif #endif #ifndef GL_READ_ONLY @@ -18,15 +15,12 @@ Index: VirtualBox-6.0.4/include/VBox/HostServices/glext.h =================================================================== --- VirtualBox-6.0.4.orig/include/VBox/HostServices/glext.h +++ VirtualBox-6.0.4/include/VBox/HostServices/glext.h -@@ -3395,7 +3395,11 @@ typedef char GLchar; /* native charact +@@ -3395,7 +3395,7 @@ typedef char GLchar; /* native charact #ifndef GL_VERSION_1_5 /* GL types for handling large vertex buffer objects */ typedef ptrdiff_t GLintptr; -+#if QT_VERSION < 0x50D00 - typedef ptrdiff_t GLsizeiptr; -+#else +-typedef ptrdiff_t GLsizeiptr; +typedef long int GLsizeiptr; -+#endif #endif #ifndef GL_ARB_vertex_buffer_object @@ -34,15 +28,13 @@ Index: VirtualBox-6.0.4/src/VBox/Additions/3D/mesa/mesa-17.3.9/include/GL/glext. =================================================================== --- VirtualBox-6.0.4.orig/src/VBox/Additions/3D/mesa/mesa-17.3.9/include/GL/glext.h +++ VirtualBox-6.0.4/src/VBox/Additions/3D/mesa/mesa-17.3.9/include/GL/glext.h -@@ -465,7 +465,11 @@ GLAPI void APIENTRY glBlendEquation (GLe +@@ -465,7 +465,8 @@ GLAPI void APIENTRY glBlendEquation (GLe #ifndef GL_VERSION_1_5 #define GL_VERSION_1_5 1 #include -+#if QT_VERSION < 0x50D00 - typedef ptrdiff_t GLsizeiptr; -+#else +-typedef ptrdiff_t GLsizeiptr; ++#include +typedef long int GLsizeiptr; -+#endif typedef ptrdiff_t GLintptr; #define GL_BUFFER_SIZE 0x8764 #define GL_BUFFER_USAGE 0x8765 @@ -50,15 +42,12 @@ Index: VirtualBox-6.0.4/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcorea =================================================================== --- VirtualBox-6.0.4.orig/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcorearb.h +++ VirtualBox-6.0.4/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcorearb.h -@@ -614,7 +614,11 @@ GLAPI void APIENTRY glBlendEquation (GLe +@@ -614,7 +614,7 @@ GLAPI void APIENTRY glBlendEquation (GLe #ifndef GL_VERSION_1_5 #define GL_VERSION_1_5 1 #include -+#if QT_VERSION < 0x50D00 - typedef ptrdiff_t GLsizeiptr; -+#else +-typedef ptrdiff_t GLsizeiptr; +typedef long int GLsizeiptr; -+#endif typedef ptrdiff_t GLintptr; #define GL_BUFFER_SIZE 0x8764 #define GL_BUFFER_USAGE 0x8765 @@ -66,15 +55,12 @@ Index: VirtualBox-6.0.4/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext.h =================================================================== --- VirtualBox-6.0.4.orig/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext.h +++ VirtualBox-6.0.4/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext.h -@@ -465,7 +465,11 @@ GLAPI void APIENTRY glBlendEquation (GLe +@@ -465,7 +465,7 @@ GLAPI void APIENTRY glBlendEquation (GLe #ifndef GL_VERSION_1_5 #define GL_VERSION_1_5 1 #include -+#if QT_VERSION < 0x50D00 - typedef ptrdiff_t GLsizeiptr; -+#else +-typedef ptrdiff_t GLsizeiptr; +typedef long int GLsizeiptr; -+#endif typedef ptrdiff_t GLintptr; #define GL_BUFFER_SIZE 0x8764 #define GL_BUFFER_USAGE 0x8765 @@ -82,15 +68,12 @@ Index: VirtualBox-6.0.4/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h =================================================================== --- VirtualBox-6.0.4.orig/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h +++ VirtualBox-6.0.4/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h -@@ -3708,7 +3708,11 @@ typedef char GLchar; /* native charact +@@ -3708,7 +3708,7 @@ typedef char GLchar; /* native charact #ifndef GL_VERSION_1_5 /* GL types for handling large vertex buffer objects */ typedef ptrdiff_t GLintptr; -+#if QT_VERSION < 0x50D00 - typedef ptrdiff_t GLsizeiptr; -+#else +-typedef ptrdiff_t GLsizeiptr; +typedef long int GLsizeiptr; -+#endif #endif #ifndef GL_ARB_vertex_buffer_object @@ -98,15 +81,12 @@ Index: VirtualBox-6.0.4/src/VBox/Devices/Graphics/vmsvga_glext/glext.h =================================================================== --- VirtualBox-6.0.4.orig/src/VBox/Devices/Graphics/vmsvga_glext/glext.h +++ VirtualBox-6.0.4/src/VBox/Devices/Graphics/vmsvga_glext/glext.h -@@ -6194,7 +6194,11 @@ typedef char GLchar; +@@ -6194,7 +6194,7 @@ typedef char GLchar; #ifndef GL_VERSION_1_5 /* GL types for handling large vertex buffer objects */ typedef ptrdiff_t GLintptr; -+#if QT_VERSION < 0x50D00 - typedef ptrdiff_t GLsizeiptr; -+#else +-typedef ptrdiff_t GLsizeiptr; +typedef long int GLsizeiptr; -+#endif #endif #ifndef GL_ARB_vertex_buffer_object @@ -114,15 +94,12 @@ Index: VirtualBox-6.0.4/src/VBox/GuestHost/OpenGL/include/GL/glext.h =================================================================== --- VirtualBox-6.0.4.orig/src/VBox/GuestHost/OpenGL/include/GL/glext.h +++ VirtualBox-6.0.4/src/VBox/GuestHost/OpenGL/include/GL/glext.h -@@ -3717,7 +3717,11 @@ typedef char GLchar; /* native charact +@@ -3717,7 +3717,7 @@ typedef char GLchar; /* native charact #ifndef GL_VERSION_1_5 /* GL types for handling large vertex buffer objects */ typedef ptrdiff_t GLintptr; -+#if QT_VERSION < 0x50D00 - typedef ptrdiff_t GLsizeiptr; -+#else +-typedef ptrdiff_t GLsizeiptr; +typedef long int GLsizeiptr; -+#endif #endif #ifndef GL_ARB_vertex_buffer_object @@ -130,15 +107,12 @@ Index: VirtualBox-6.0.4/src/VBox/GuestHost/OpenGL/include/chromium.h =================================================================== --- VirtualBox-6.0.4.orig/src/VBox/GuestHost/OpenGL/include/chromium.h +++ VirtualBox-6.0.4/src/VBox/GuestHost/OpenGL/include/chromium.h -@@ -499,7 +499,11 @@ PROC WINAPI wglGetProcAddress_prox( LPCS +@@ -499,7 +499,7 @@ PROC WINAPI wglGetProcAddress_prox( LPCS #ifndef GL_VERSION_1_5 typedef ptrdiff_t GLintptr; -+#if QT_VERSION < 0x50d00 - typedef ptrdiff_t GLsizeiptr; -+#else +-typedef ptrdiff_t GLsizeiptr; +typedef long int GLsizeiptr; -+#endif /* prototype these functions for opengl_stub/getprocaddress.c */ extern void APIENTRY glGenQueries(GLsizei n, GLuint *ids); diff --git a/virtualbox-rpmlintrc b/virtualbox-rpmlintrc index 0336de8..b32bd29 100644 --- a/virtualbox-rpmlintrc +++ b/virtualbox-rpmlintrc @@ -1,4 +1,3 @@ addFilter("incoherent-init-script-name vboxdrv") addFilter("incoherent-init-script-name vboxadd") addFilter("xorg-x11-driver-virtualbox-ose.* shlib-policy-missing-suffix") -setBadness("permissions-unauthorized-file", 333) diff --git a/virtualbox.changes b/virtualbox.changes index 5c56c4d..406f161 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Apr 5 22:11:52 UTC 2019 - Larry Finger + +- Fix problems with use of files "virtualbox.permissions" and "virtualbox.permissions.paranoid" - they are deleted + Removed setBadness line from virtualbox-rpmlinc. + ------------------------------------------------------------------- Fri Apr 5 16:11:40 UTC 2019 - Larry Finger diff --git a/virtualbox.permissions b/virtualbox.permissions deleted file mode 100644 index 896db7f..0000000 --- a/virtualbox.permissions +++ /dev/null @@ -1,9 +0,0 @@ -# virtualbox -/usr/lib/virtualbox/VBoxNetNAT root:vboxusers 4750 -/usr/lib/virtualbox/VBoxNetDHCP root:vboxusers 4750 -/usr/lib/virtualbox/VBoxNetAdpCtl root:vboxusers 4750 -/usr/lib/virtualbox/VBoxHeadless root:vboxusers 4750 -# Virtualbox-qt -/usr/lib/virtualbox/VirtualBoxVM root:vboxusers 4750 -/usr/lib/virtualbox/VBoxSDL root:vboxusers 4750 - diff --git a/virtualbox.permissions.paranoid b/virtualbox.permissions.paranoid deleted file mode 100644 index b286d6c..0000000 --- a/virtualbox.permissions.paranoid +++ /dev/null @@ -1,9 +0,0 @@ -# virtualbox -/usr/lib/virtualbox/VBoxNetNAT root:vboxusers 0750 -/usr/lib/virtualbox/VBoxNetDHCP root:vboxusers 0750 -/usr/lib/virtualbox/VBoxNetAdpCtl root:vboxusers 0750 -/usr/lib/virtualbox/VBoxHeadless root:vboxusers 0750 -# Virtualbox-qt -/usr/lib/virtualbox/VirtualBoxVM root:vboxusers 0750 -/usr/lib/virtualbox/VBoxSDL root:vboxusers 0750 - diff --git a/virtualbox.spec b/virtualbox.spec index b772d88..0b0a9e9 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -64,8 +64,6 @@ Source8: %{name}-guest-preamble Source9: %{name}-wrapper.sh Source10: %{name}-LocalConfig.kmk Source11: %{name}-60-vboxdrv.rules -Source12: %{name}.permissions -Source13: %{name}.permissions.paranoid Source14: vboxdrv.service Source15: vboxadd-service.service Source16: vboxconfig.sh @@ -579,7 +577,6 @@ install -d -m 755 %{buildroot}%{_libdir}/xorg/modules/drivers install -d -m 755 %{buildroot}%{_libdir}/xorg/modules/input install -d -m 755 %{buildroot}%{_sysconfdir}/default install -d -m 755 %{buildroot}%{_sysconfdir}/init.d -install -d -m 755 %{buildroot}%{_sysconfdir}/permissions.d install -d %{buildroot}%{_unitdir} install -d %{buildroot}%{_unitdir}/multi-user.target.wants install -d -m 755 %{buildroot}%{_sysconfdir}/vbox @@ -695,10 +692,6 @@ install -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/default/virtualbox #install wrapper script install -m 644 %{SOURCE9} %{buildroot}%{_bindir}/VirtualBox -# permissions -install -m 644 %{SOURCE12} %{buildroot}%{_sysconfdir}/permissions.d/virtualbox -install -m 644 %{SOURCE13} %{buildroot}%{_sysconfdir}/permissions.d/virtualbox.paranoid - # Service files to load kernel modules on boot install -m 0644 %{SOURCE14} %{buildroot}%{_unitdir}/vboxdrv.service ln -s -f %{_sbindir}/service %{buildroot}%{_sbindir}/rcvboxdrv @@ -955,9 +948,6 @@ export DISABLE_RESTART_ON_UPDATE=yes %verify(not mode) %attr(0750,root,vboxusers) %{_vbox_instdir}/VBoxNetDHCP %verify(not mode) %attr(0750,root,vboxusers) %{_vbox_instdir}/VBoxNetAdpCtl %verify(not mode) %attr(0750,root,vboxusers) %{_vbox_instdir}/VBoxHeadless -# not %config tagged for security reasons -%{_sysconfdir}/permissions.d/virtualbox -%{_sysconfdir}/permissions.d/virtualbox.paranoid %dir %{_sysconfdir}/vbox %attr(1775,root,vboxusers) %{_sysconfdir}/vbox %config %attr(644,root,vboxusers) %{_sysconfdir}/vbox/vbox.cfg