From 3056d68fa7716816942848ad1492c5642cd067afba82f509e47086ce1006afa9 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Fri, 5 Apr 2019 22:17:46 +0000 Subject: [PATCH] - 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