From dcc81d5a34ff06ae59387a14cae65d5e3925998bc2c85e5efdbfca6acc25fa68 Mon Sep 17 00:00:00 2001 From: Michal Seben Date: Fri, 14 Jan 2011 11:19:53 +0000 Subject: [PATCH 1/4] Accepting request 58151 from home:mseben:branches:Virtualization added new rule to virtualbox-60-vboxdrv.rules to access usb device + from vboxusers group OBS-URL: https://build.opensuse.org/request/show/58151 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=19 --- virtualbox-60-vboxdrv.rules | 3 +++ virtualbox.changes | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/virtualbox-60-vboxdrv.rules b/virtualbox-60-vboxdrv.rules index 00d64c4..2062bd9 100644 --- a/virtualbox-60-vboxdrv.rules +++ b/virtualbox-60-vboxdrv.rules @@ -1 +1,4 @@ KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="root", MODE="0600" +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" + diff --git a/virtualbox.changes b/virtualbox.changes index aae1b19..5fc2d35 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jan 13 14:34:52 UTC 2011 - mseben@gmail.com + +- added new rule to virtualbox-60-vboxdrv.rules to access usb device + from vboxusers group + ------------------------------------------------------------------- Wed Jan 12 13:29:36 UTC 2011 - mseben@gmail.com From 438401675beef19bdcb134374ffd17f0b5bf438d3a90c894a9b55812b604cdc5 Mon Sep 17 00:00:00 2001 From: Michal Seben Date: Sun, 16 Jan 2011 06:19:36 +0000 Subject: [PATCH 2/4] Accepting request 58412 from home:mseben:branches:Virtualization reworked vbox-disable-updates.diff for virtualbox 4.0.0 OBS-URL: https://build.opensuse.org/request/show/58412 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=20 --- vbox-disable-updates.diff | 71 +++++++++++++------------------------ virtualbox-60-vboxdrv.rules | 5 +-- virtualbox.changes | 5 ++- virtualbox.spec | 6 ++-- 4 files changed, 33 insertions(+), 54 deletions(-) diff --git a/vbox-disable-updates.diff b/vbox-disable-updates.diff index 169eb0b..6f4f081 100644 --- a/vbox-disable-updates.diff +++ b/vbox-disable-updates.diff @@ -1,65 +1,44 @@ -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/global/UIGlobalSettingsUpdate.ui =================================================================== ---- src/VBox/Frontends/VirtualBox/src/settings/global/VBoxGLSettingsUpdate.ui.orig -+++ src/VBox/Frontends/VirtualBox/src/settings/global/VBoxGLSettingsUpdate.ui -@@ -18,6 +18,9 @@ - - VBoxGLSettingsUpdate - -+ -+ false -+ - - - 0 -@@ -48,7 +51,7 @@ +--- VirtualBox-4.0.0_OSE.orig/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.ui ++++ VirtualBox-4.0.0_OSE/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.ui +@@ -50,8 +50,11 @@ + &Check for updates - +- - true ++ ++ false ++ ++ + false diff --git a/virtualbox-60-vboxdrv.rules b/virtualbox-60-vboxdrv.rules index 2062bd9..14e91f6 100644 --- a/virtualbox-60-vboxdrv.rules +++ b/virtualbox-60-vboxdrv.rules @@ -1,4 +1,5 @@ KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="root", MODE="0600" -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" +#these two lines give access to usb for vboxusers (enable usb support), but 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" diff --git a/virtualbox.changes b/virtualbox.changes index 5fc2d35..2b75a29 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,8 +1,7 @@ ------------------------------------------------------------------- -Thu Jan 13 14:34:52 UTC 2011 - mseben@gmail.com +Fri Jan 14 21:58:00 UTC 2011 - mseben@gmail.com -- added new rule to virtualbox-60-vboxdrv.rules to access usb device - from vboxusers group +- reworked vbox-disable-updates.diff for virtualbox 4.0.0 ------------------------------------------------------------------- Wed Jan 12 13:29:36 UTC 2011 - mseben@gmail.com diff --git a/virtualbox.spec b/virtualbox.spec index f1435df..11a2c08 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -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 @@ -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 From f132604a1c62103dffb5a8c71e037bda6003138610602541b7dff8f72d0c34a3 Mon Sep 17 00:00:00 2001 From: Michal Seben Date: Mon, 17 Jan 2011 12:39:27 +0000 Subject: [PATCH 3/4] reworked vbox-disable-updates.diff OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=21 --- vbox-disable-updates.diff | 59 ++++++++++++++++++++++++++++----------- 1 file changed, 42 insertions(+), 17 deletions(-) diff --git a/vbox-disable-updates.diff b/vbox-disable-updates.diff index 6f4f081..7cfd59c 100644 --- a/vbox-disable-updates.diff +++ b/vbox-disable-updates.diff @@ -25,21 +25,46 @@ Index: VirtualBox-4.0.0_OSE/src/VBox/Frontends/VirtualBox/src/VBoxHelpActions.cp #ifndef Q_WS_MAC aMenu->addSeparator(); -Index: VirtualBox-4.0.0_OSE/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.ui +Index: VirtualBox-4.0.0_OSE/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp =================================================================== ---- VirtualBox-4.0.0_OSE.orig/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.ui -+++ VirtualBox-4.0.0_OSE/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.ui -@@ -50,8 +50,11 @@ - - &Check for updates - -- -- true -+ -+ false -+ -+ -+ false - - - +--- 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, From 7e4d38e5dc82210b9e70c6b4e6dfa1c75cc0aa93a01add95a92b2bf6c823c397 Mon Sep 17 00:00:00 2001 From: Michal Seben Date: Tue, 18 Jan 2011 08:15:21 +0000 Subject: [PATCH 4/4] - just commented changes in virtualbox-60-vboxdrv.rules OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=22 --- virtualbox-60-vboxdrv.rules | 2 +- virtualbox.changes | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/virtualbox-60-vboxdrv.rules b/virtualbox-60-vboxdrv.rules index 14e91f6..b1019ac 100644 --- a/virtualbox-60-vboxdrv.rules +++ b/virtualbox-60-vboxdrv.rules @@ -1,5 +1,5 @@ KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="root", MODE="0600" -#these two lines give access to usb for vboxusers (enable usb support), but could be security risk !! bnc#664520 +#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" diff --git a/virtualbox.changes b/virtualbox.changes index 2b75a29..df9aa35 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -2,6 +2,10 @@ 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