jengelh/virtualbox
SHA256
1
0
Fork 1
forked from pool/virtualbox
Code Pull Requests Activity

Accepting request 58644 from Virtualization

Browse Source 
Accepted submit request 58644 from user mseben

OBS-URL: https://build.opensuse.org/request/show/58644
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virtualbox?expand=0&rev=7
This commit is contained in:
Marcus Rückert 2011-01-18 10:52:47 +00:00 committed by Git OBS Bridge
commit a768a0ba4e
4 changed files with 78 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
vbox-disable-updates.diff
View File

@ -1,66 +1,70 @@
Index: src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp
Index: VirtualBox-4.0.0_OSE/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp
===================================================================
--- src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp.orig
+++ src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp
@@ -45,7 +45,8 @@ void VBoxGLSettingsUpdate::getFrom (cons
--- VirtualBox-4.0.0_OSE.orig/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp
+++ VirtualBox-4.0.0_OSE/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp
@@ -63,7 +63,7 @@ void UIGlobalSettingsUpdate::loadToCache
void UIGlobalSettingsUpdate::getFromCache()
{
VBoxUpdateData data (vboxGlobal().virtualBox().GetExtraData (VBoxDefs::GUI_UpdateDate));
- mCbCheck->setChecked (!data.isNoNeedToCheck());
+ mCbCheck->setChecked (false);
+
if (mCbCheck->isChecked())
/* Apply internal variables data to QWidget(s): */
- m_pEnableUpdateCheckbox->setChecked(m_cache.m_fCheckEnabled);
+ m_pEnableUpdateCheckbox->setChecked(false);
if (m_pEnableUpdateCheckbox->isChecked())
{
mCbOncePer->setCurrentIndex (data.periodIndex());
Index: src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp
m_pUpdatePeriodCombo->setCurrentIndex(m_cache.m_periodIndex);
Index: VirtualBox-4.0.0_OSE/src/VBox/Frontends/VirtualBox/src/VBoxHelpActions.cpp
===================================================================
--- src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp.orig
+++ src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp
@@ -5115,6 +5115,9 @@ void VBoxGlobal::showRegistrationDialog
*/
void VBoxGlobal::showUpdateDialog (bool aForce)
{
+ // Disable update dialog for openSUSE
+ return;
+
/* Silently check in one day after current time-stamp */
QTimer::singleShot (24 /* hours */ * 60 /* minutes */ *
60 /* seconds */ * 1000 /* milliseconds */,
Index: src/VBox/Frontends/VirtualBox/src/VBoxProblemReporter.cpp
===================================================================
--- src/VBox/Frontends/VirtualBox/src/VBoxHelpActions.cpp.orig 2009-03-13 11:38:50.000000000 +0100
+++ src/VBox/Frontends/VirtualBox/src/VBoxHelpActions.cpp 2009-04-15 17:03:52.000000000 +0200
@@ -87,8 +87,8 @@
--- VirtualBox-4.0.0_OSE.orig/src/VBox/Frontends/VirtualBox/src/VBoxHelpActions.cpp
+++ VirtualBox-4.0.0_OSE/src/VBox/Frontends/VirtualBox/src/VBoxHelpActions.cpp
@@ -91,8 +91,7 @@ void VBoxHelpActions::addTo (QMenu *aMen
#endif
aMenu->addAction (updateAction);
- updateAction->setEnabled (vboxGlobal().virtualBox().
- GetExtraData (VBoxDefs::GUI_UpdateDlgWinID).isEmpty());
+ updateAction->setDisabled( true );
+
+ updateAction->setDisabled ( true );
#ifndef Q_WS_MAC
aMenu->addSeparator();
Index: src/VBox/Frontends/VirtualBox/src/settings/global/VBoxGLSettingsUpdate.ui
Index: VirtualBox-4.0.0_OSE/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
===================================================================
--- src/VBox/Frontends/VirtualBox/src/settings/global/VBoxGLSettingsUpdate.ui.orig
+++ src/VBox/Frontends/VirtualBox/src/settings/global/VBoxGLSettingsUpdate.ui
@@ -18,6 +18,9 @@
</comment>
<class>VBoxGLSettingsUpdate</class>
<widget class="QWidget" name="VBoxGLSettingsUpdate" >
+ <property name="enabled" >
+ <bool>false</bool>
+ </property>
<property name="geometry" >
<rect>
<x>0</x>
@@ -48,7 +51,7 @@
<string>&amp;Check for updates</string>
</property>
<property name="checked" >
- <bool>true</bool>
+ <bool>false</bool>
</property>
</widget>
</item>
--- VirtualBox-4.0.0_OSE.orig/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
+++ VirtualBox-4.0.0_OSE/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
@@ -322,16 +322,6 @@ UIGLSettingsDlg::UIGLSettingsDlg(QWidget
i, "#input", pSettingsPage);
break;
}
- /* Update page: */
- case GLSettingsPage_Update:
- {
- UISettingsPage *pSettingsPage = new UIGlobalSettingsUpdate;
- pSettingsPage->setId(i);
- addItem(":/refresh_32px.png", ":/refresh_disabled_32px.png",
- ":/refresh_16px.png", ":/refresh_disabled_16px.png",
- i, "#update", pSettingsPage);
- break;
- }
/* Language page: */
case GLSettingsPage_Language:
{
@@ -442,9 +432,6 @@ void UIGLSettingsDlg::retranslateUi()
/* Input page: */
m_pSelector->setItemText(GLSettingsPage_Input, tr("Input"));
- /* Update page: */
- m_pSelector->setItemText(GLSettingsPage_Update, tr("Update"));
-
/* Language page: */
m_pSelector->setItemText(GLSettingsPage_Language, tr("Language"));
Index: VirtualBox-4.0.0_OSE/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.h
===================================================================
--- VirtualBox-4.0.0_OSE.orig/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.h
+++ VirtualBox-4.0.0_OSE/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.h
@@ -34,7 +34,6 @@ public:
{
GLSettingsPage_General = 0,
GLSettingsPage_Input,
- GLSettingsPage_Update,
GLSettingsPage_Language,
GLSettingsPage_USB,
GLSettingsPage_Network,

4
virtualbox-60-vboxdrv.rules
View File

@ -1 +1,5 @@
KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="root", MODE="0600"
#these two lines give access permission to vboxusers to properly work with usb nodes, this could be security risk (bnc#664520) !!
#SUBSYSTEM=="usb_device", ATTR{devnum}=="?*", ATTR{busnum}=="?*",NAME="vboxusb/$attr{busnum}/$attr{devnum}", GROUP="vboxusers"
#SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{devnum}=="?*", ATTR{busnum}=="?*",NAME="vboxusb/$attr{busnum}/$attr{devnum}", GROUP="vboxusers"

9
virtualbox.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Fri Jan 14 21:58:00 UTC 2011 - mseben@gmail.com
- reworked vbox-disable-updates.diff for virtualbox 4.0.0
- modified virtualbox-60-vboxdrv.rules : added comment with udev
rules inside for assign full usb access to vboxusers - don't
uncomment these lines if you don't understand possible security
risk (bnc#664520)
-------------------------------------------------------------------
Wed Jan 12 13:29:36 UTC 2011 - mseben@gmail.com

17
virtualbox.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package virtualbox
# spec file for package virtualbox (Version 3.9.80)
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -32,7 +32,7 @@ BuildRequires: e2fsprogs-devel libcap-devel libcurl-devel python-devel update-d
BuildRequires: hal-devel pulseaudio-devel xorg-x11 xorg-x11-devel xorg-x11-server xorg-x11-server-sdk
BuildRequires: LibVNCServer-devel gcc43-c++ kbuild pam-devel udev
%if %suse_version > 1110
BuildRequires: zlib-devel-static
BuildRequires: zlib-devel-static
%endif
%ifarch amd64 x86_64 ia32e em64t
BuildRequires: hal-32bit
@ -43,7 +43,7 @@ BuildRequires: gcc43-32bit libstdc++43-devel-32bit
#
ExclusiveArch: %ix86 x86_64
Version: 4.0.0
Release: 3
Release: 1
Summary: VirtualBox is an Emulator
License: GPLv2+
Group: System/Emulators/PC
@ -73,8 +73,6 @@ Source99: %{name}-patch-source.sh
#rework init script
Patch1: vbox-vboxdrv-init-script.diff
Patch2: vbox-vboxadd-init-script.diff
#disable update in vbox gui
##Patch3: vbox-disable-updates.diff
#fix return values which trigger post build checks and coused build error - should goes to upstream
Patch4: vbox-ret-in-nonvoid-fnc.diff
#fix rpath
@ -90,6 +88,8 @@ Patch99: vbox-permissions_warning.diff
#PATCH-FIX-OPENSUSE Do not include build dates on binaries, makes build-compare happier
Patch100: vbox-no-build-dates.diff
Patch101: vbox-default-os-type.diff
#disable update in vbox gui
Patch102: vbox-disable-updates.diff
#
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: pwdutils permissions
@ -118,6 +118,7 @@ Provides: %{name}-ose:/usr/lib/virtualbox/VirtualBox.so
Provides: %{name}-ose-qt = %version
Obsoletes: %{name}-ose-qt < %version
%description qt
Qt GUI part for %{name}.
#########################################
@ -170,7 +171,6 @@ VirtualBox guest addition tools.
###########################################
%package -n python-%{name}
Summary: Python bindings for %{name}
Group: Development/Libraries/Python
Requires: %{name} = %{version}
@ -198,13 +198,13 @@ Development file for %{name}
%setup -q -n VirtualBox-%{version}_OSE
%patch1
%patch2
##%patch3
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch99 -p1
%patch100
%patch101
%patch102 -p1
#copy user manual
%__cp %{S:1} ./UserManual.pdf
@ -611,7 +611,6 @@ exit 0
%config %{_sysconfdir}/init.d/vboxadd
%{_sbindir}/rcvboxadd
#
%files -n python-%{name}
%defattr(-,root, root)
%dir %{_vbox_instdir}/sdk