Hello community, here is the log from the commit of package virtualbox for openSUSE:Factory checked in at Tue Jan 18 11:52:47 CET 2011. -------- --- virtualbox/virtualbox.changes 2011-01-12 14:33:12.000000000 +0100 +++ virtualbox/virtualbox.changes 2011-01-18 09:15:20.000000000 +0100 @@ -1,0 +2,9 @@ +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) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virtualbox.spec ++++++ --- /var/tmp/diff_new_pack.izUOx2/_old 2011-01-18 11:52:27.000000000 +0100 +++ /var/tmp/diff_new_pack.izUOx2/_new 2011-01-18 11:52:27.000000000 +0100 @@ -43,7 +43,7 @@ # ExclusiveArch: %ix86 x86_64 Version: 4.0.0 -Release: 3 +Release: 4 Summary: VirtualBox is an Emulator License: GPLv2+ Group: System/Emulators/PC @@ -73,8 +73,6 @@ #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 @@ #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 @@ %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 ++++++ vbox-disable-updates.diff ++++++ --- /var/tmp/diff_new_pack.izUOx2/_old 2011-01-18 11:52:28.000000000 +0100 +++ /var/tmp/diff_new_pack.izUOx2/_new 2011-01-18 11:52:28.000000000 +0100 @@ -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 -=================================================================== ---- 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 + 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/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>&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, ++++++ virtualbox-60-vboxdrv.rules ++++++ --- /var/tmp/diff_new_pack.izUOx2/_old 2011-01-18 11:52:28.000000000 +0100 +++ /var/tmp/diff_new_pack.izUOx2/_new 2011-01-18 11:52:28.000000000 +0100 @@ -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" + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org