Sophie: virtualbox-4.2.16-1.mga3 src

virtualbox-4.2.16-1.mga3.src.rpm


 include/VBox/ostypes.h                                                      |    2 ++
 src/VBox/Additions/linux/installer/vboxadd-x11.sh                           |    6 ++++++
 src/VBox/Frontends/VirtualBox/VirtualBox2.qrc                               |    2 ++
 src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp                    |    2 ++
 src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp |    6 ++++--
 src/VBox/Installer/linux/VBoxSysInfo.sh                                     |    5 +++++
 src/VBox/Installer/linux/distributions_rpm                                  |    3 +++
 src/VBox/Installer/linux/routines.sh                                        |    2 +-
 src/VBox/Main/cbinding/VBoxCAPI_v2_2.h                                      |    4 +++-
 src/VBox/Main/cbinding/VBoxCAPI_v3_0.h                                      |    4 +++-
 src/VBox/Main/include/ovfreader.h                                           |    4 +++-
 src/VBox/Main/src-all/Global.cpp                                            |    8 ++++++++
 src/VBox/Main/src-server/ApplianceImpl.cpp                                  |    4 ++++
 src/VBox/Main/xml/Settings.cpp                                              |    1 +
 src/VBox/Main/xml/SettingsConverter.xsl                                     |    1 +
 15 files changed, 48 insertions(+), 6 deletions(-)

diff -Nurp VirtualBox-4.2.0/include/VBox/ostypes.h VirtualBox-4.2.0-mga/include/VBox/ostypes.h
--- VirtualBox-4.2.0/include/VBox/ostypes.h	2012-09-08 12:35:56.000000000 +0300
+++ VirtualBox-4.2.0-mga/include/VBox/ostypes.h	2012-09-14 03:21:20.476002813 +0300
@@ -99,6 +99,8 @@ typedef enum VBOXOSTYPE
     VBOXOSTYPE_Xandros_x64      = 0x5D100,
     VBOXOSTYPE_Oracle           = 0x5E000,
     VBOXOSTYPE_Oracle_x64       = 0x5E100,
+    VBOXOSTYPE_Mageia           = 0x5F000,
+    VBOXOSTYPE_Mageia_x64       = 0x5F100,
     VBOXOSTYPE_FreeBSD          = 0x60000,
     VBOXOSTYPE_FreeBSD_x64      = 0x60100,
     VBOXOSTYPE_OpenBSD          = 0x61000,
diff -Nurp VirtualBox-4.2.0/src/VBox/Additions/linux/installer/vboxadd-x11.sh VirtualBox-4.2.0-mga/src/VBox/Additions/linux/installer/vboxadd-x11.sh
--- VirtualBox-4.2.0/src/VBox/Additions/linux/installer/vboxadd-x11.sh	2012-04-03 10:56:29.000000000 +0300
+++ VirtualBox-4.2.0-mga/src/VBox/Additions/linux/installer/vboxadd-x11.sh	2012-09-14 03:21:20.476002813 +0300
@@ -214,8 +214,14 @@ install_x11_startup_app() {
     x11_autostart="/etc/xdg/autostart"
     kde_autostart="/usr/share/autostart"
     redhat_dir=/etc/X11/Xsession.d
+    mageia_dir=/etc/X11/xinit.d
     mandriva_dir=/etc/X11/xinit.d
     debian_dir=/etc/X11/xinit/xinitrc.d
+    if [ -d "$mageia_dir" -a -w "$mageia_dir" -a -x "$mageia_dir" ]
+    then
+        install -m 0644 $app_src "$mageia_dir/$app_dest"
+        found=1
+    fi
     if [ -d "$mandriva_dir" -a -w "$mandriva_dir" -a -x "$mandriva_dir" ]
     then
         install -m 0644 $app_src "$mandriva_dir/$app_dest"
diff -Nurp VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp VirtualBox-4.2.0-mga/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp
--- VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp	2012-09-04 15:48:45.000000000 +0300
+++ VirtualBox-4.2.0-mga/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp	2012-09-14 03:21:20.477002841 +0300
@@ -4325,6 +4325,8 @@ void VBoxGlobal::init()
         {"Fedora_64",       ":/os_fedora_64.png"},
         {"Gentoo",          ":/os_gentoo.png"},
         {"Gentoo_64",       ":/os_gentoo_64.png"},
+        {"Mageia",          ":/os_mageia.png"},
+        {"Mageia_64",       ":/os_mageia_64.png"},
         {"Mandriva",        ":/os_mandriva.png"},
         {"Mandriva_64",     ":/os_mandriva_64.png"},
         {"RedHat",          ":/os_redhat.png"},
diff -Nurp VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp VirtualBox-4.2.0-mga/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
--- VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp	2012-08-29 17:13:40.000000000 +0300
+++ VirtualBox-4.2.0-mga/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp	2012-09-14 03:52:44.368845625 +0300
@@ -101,8 +101,10 @@ static const osTypePattern gs_OSTypePatt
     { QRegExp("Fe", Qt::CaseInsensitive), "Fedora" },
     { QRegExp("((Gen)|(Sab)).*64", Qt::CaseInsensitive), "Gentoo_64" },
     { QRegExp("(Gen)|(Sab)", Qt::CaseInsensitive), "Gentoo" },
-    { QRegExp("((Man)|(Mag)).*64", Qt::CaseInsensitive), "Mandriva_64" },
-    { QRegExp("((Man)|(Mag))", Qt::CaseInsensitive), "Mandriva" },
+    { QRegExp("Mag.*64", Qt::CaseInsensitive), "Mageia_64" },
+    { QRegExp("Mag", Qt::CaseInsensitive), "Mageia" },
+    { QRegExp("Man.*64", Qt::CaseInsensitive), "Mandriva_64" },
+    { QRegExp("Man", Qt::CaseInsensitive), "Mandriva" },
     { QRegExp("((Red)|(rhel)|(cen)).*64", Qt::CaseInsensitive), "RedHat_64" },
     { QRegExp("(Red)|(rhel)|(cen)", Qt::CaseInsensitive), "RedHat" },
     { QRegExp("Tur.*64", Qt::CaseInsensitive), "Turbolinux_64" },
diff -Nurp VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc VirtualBox-4.2.0-mga/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc
--- VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc	2012-05-30 13:39:18.000000000 +0300
+++ VirtualBox-4.2.0-mga/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc	2012-09-14 03:36:14.346505338 +0300
@@ -19,6 +19,8 @@
         <file alias="os_linux24_64.png">images/os_linux24_64.png</file>
         <file alias="os_linux26.png">images/os_linux26.png</file>
         <file alias="os_linux26_64.png">images/os_linux26_64.png</file>
+        <file alias="os_mageia.png">images/os_mageia.png</file>
+        <file alias="os_mageia_64.png">images/os_mageia_64.png</file>
         <file alias="os_mandriva.png">images/os_mandriva.png</file>
         <file alias="os_mandriva_64.png">images/os_mandriva_64.png</file>
         <file alias="os_netbsd.png">images/os_netbsd.png</file>
diff -Nurp VirtualBox-4.2.0/src/VBox/Installer/linux/distributions_rpm VirtualBox-4.2.0-mga/src/VBox/Installer/linux/distributions_rpm
--- VirtualBox-4.2.0/src/VBox/Installer/linux/distributions_rpm	2012-07-18 11:57:59.000000000 +0300
+++ VirtualBox-4.2.0-mga/src/VBox/Installer/linux/distributions_rpm	2012-09-14 04:22:51.461014748 +0300
@@ -7,6 +7,9 @@ openSUSE103     = OPENSUSE_10_3
 openSUSE102     = OPENSUSE_10_2
 sles11.0        = SLES_11_0
 sles10.1        = SLES_10_1
+mga3		= MAGEIA_3
+mga2		= MAGEIA_2
+mga1		= MAGEIA_1
 mdv2011.0       = MANDRIVA_2011_0
 mdv2010.0       = MANDRIVA_2010_0
 mdv2009.1       = MANDRIVA_2009_1
diff -Nurp VirtualBox-4.2.0/src/VBox/Installer/linux/routines.sh VirtualBox-4.2.0-mga/src/VBox/Installer/linux/routines.sh
--- VirtualBox-4.2.0/src/VBox/Installer/linux/routines.sh	2011-10-13 16:19:11.000000000 +0300
+++ VirtualBox-4.2.0-mga/src/VBox/Installer/linux/routines.sh	2012-09-14 03:21:31.816097781 +0300
@@ -226,7 +226,7 @@ check_system_type() {
     return 0
 }
 
-# Hack to handle Mandriva's speedboot runlevel
+# Hack to handle Mageia & Mandriva's speedboot runlevel
 copy_install_script() {
     if [ "$ro_INIT_TYPE" = "sysv" -a -r /etc/sysconfig/speedboot ]; then
         cp "$1" "$2" 2>/dev/null
diff -Nurp VirtualBox-4.2.0/src/VBox/Installer/linux/VBoxSysInfo.sh VirtualBox-4.2.0-mga/src/VBox/Installer/linux/VBoxSysInfo.sh
--- VirtualBox-4.2.0/src/VBox/Installer/linux/VBoxSysInfo.sh	2011-11-10 17:56:32.000000000 +0200
+++ VirtualBox-4.2.0-mga/src/VBox/Installer/linux/VBoxSysInfo.sh	2012-09-14 03:21:31.816097781 +0300
@@ -43,6 +43,11 @@ get_linux_info () {
         # Debian-based system
         release=`cat /etc/debian_version`
         print_linux_info "Debian" $release
+    elif [ -r /etc/mageia-release ]
+    then
+        # Mageia-based system
+        release=`cat /etc/mageia-release | sed -e 's/[A-Za-z ]* release //'`
+        print_linux_info "Mageia" $release
     elif [ -r /etc/mandriva-release ]
     then
         # Mandriva-based system
diff -Nurp VirtualBox-4.2.0/src/VBox/Main/cbinding/VBoxCAPI_v2_2.h VirtualBox-4.2.0-mga/src/VBox/Main/cbinding/VBoxCAPI_v2_2.h
--- VirtualBox-4.2.0/src/VBox/Main/cbinding/VBoxCAPI_v2_2.h	2012-03-13 16:51:55.000000000 +0200
+++ VirtualBox-4.2.0-mga/src/VBox/Main/cbinding/VBoxCAPI_v2_2.h	2012-09-14 03:21:31.817097788 +0300
@@ -921,7 +921,9 @@ enum CIMOSType
     CIMOSType_CIMOS_Linux_2_6_x = 99,
     CIMOSType_CIMOS_Linux_2_6_x_64 = 100,
     CIMOSType_CIMOS_Linux_64 = 101,
-    CIMOSType_CIMOS_Other_64 = 102
+    CIMOSType_CIMOS_Other_64 = 102,
+    CIMOSType_CIMOS_Mageia = 111,
+    CIMOSType_CIMOS_Mageia_64 = 112
 };
 /* End of enum CIMOSType Declaration */
 
diff -Nurp VirtualBox-4.2.0/src/VBox/Main/cbinding/VBoxCAPI_v3_0.h VirtualBox-4.2.0-mga/src/VBox/Main/cbinding/VBoxCAPI_v3_0.h
--- VirtualBox-4.2.0/src/VBox/Main/cbinding/VBoxCAPI_v3_0.h	2012-03-13 16:51:55.000000000 +0200
+++ VirtualBox-4.2.0-mga/src/VBox/Main/cbinding/VBoxCAPI_v3_0.h	2012-09-14 03:21:31.818097800 +0300
@@ -1371,7 +1371,9 @@ enum CIMOSType
     CIMOSType_CIMOS_Linux_2_6_x = 99,
     CIMOSType_CIMOS_Linux_2_6_x_64 = 100,
     CIMOSType_CIMOS_Linux_64 = 101,
-    CIMOSType_CIMOS_Other_64 = 102
+    CIMOSType_CIMOS_Other_64 = 102,
+    CIMOSType_CIMOS_Mageia = 111,
+    CIMOSType_CIMOS_Mageia_64 = 112
 };
 /* End of enum CIMOSType Declaration */
 
diff -Nurp VirtualBox-4.2.0/src/VBox/Main/include/ovfreader.h VirtualBox-4.2.0-mga/src/VBox/Main/include/ovfreader.h
--- VirtualBox-4.2.0/src/VBox/Main/include/ovfreader.h	2011-04-28 11:00:56.000000000 +0300
+++ VirtualBox-4.2.0-mga/src/VBox/Main/include/ovfreader.h	2012-09-14 03:21:31.818097800 +0300
@@ -145,8 +145,10 @@ enum CIMOSType_T
     CIMOSType_CIMOS_CentOS_64 = 107,
     CIMOSType_CIMOS_OracleEnterpriseLinux = 108,
     CIMOSType_CIMOS_OracleEnterpriseLinux_64 = 109,
-    CIMOSType_CIMOS_eComStation = 110
+    CIMOSType_CIMOS_eComStation = 110,
     // no new types added with CIM 2.26.0
+    CIMOSType_CIMOS_Mageia = 111,
+    CIMOSType_CIMOS_Mageia_64 = 112
 };
 
 
diff -Nurp VirtualBox-4.2.0/src/VBox/Main/src-all/Global.cpp VirtualBox-4.2.0-mga/src/VBox/Main/src-all/Global.cpp
--- VirtualBox-4.2.0/src/VBox/Main/src-all/Global.cpp	2012-09-08 12:36:02.000000000 +0300
+++ VirtualBox-4.2.0-mga/src/VBox/Main/src-all/Global.cpp	2012-09-14 03:31:19.705016200 +0300
@@ -173,6 +173,14 @@ const Global::OSType Global::sOSTypes[]
       VBOXOSTYPE_Gentoo_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
        256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
+    { "Linux",   "Mageia",             "Mageia",           "Mageia",
+      VBOXOSTYPE_Mageia,        VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
+       512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
+    { "Linux",   "Linux",             "Mageia_64",        "Mageia (64 bit)",
+      VBOXOSTYPE_Mageia_x64,    VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
+       512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
     { "Linux",   "Linux",             "Mandriva",           "Mandriva",
       VBOXOSTYPE_Mandriva,        VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
        512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
diff -Nurp VirtualBox-4.2.0/src/VBox/Main/src-server/ApplianceImpl.cpp VirtualBox-4.2.0-mga/src/VBox/Main/src-server/ApplianceImpl.cpp
--- VirtualBox-4.2.0/src/VBox/Main/src-server/ApplianceImpl.cpp	2012-08-03 15:28:30.000000000 +0300
+++ VirtualBox-4.2.0-mga/src/VBox/Main/src-server/ApplianceImpl.cpp	2012-09-14 03:34:47.904773478 +0300
@@ -98,6 +98,8 @@ g_osTypes[] =
     { ovf::CIMOSType_CIMOS_SunJavaDesktopSystem,                 VBOXOSTYPE_Linux },
     { ovf::CIMOSType_CIMOS_TurboLinux,                           VBOXOSTYPE_Turbolinux },
     { ovf::CIMOSType_CIMOS_TurboLinux_64,                        VBOXOSTYPE_Turbolinux_x64 },
+    { ovf::CIMOSType_CIMOS_Mageia,                               VBOXOSTYPE_Mageia },
+    { ovf::CIMOSType_CIMOS_Mageia_64,                            VBOXOSTYPE_Mageia_x64 },
     { ovf::CIMOSType_CIMOS_Mandriva,                             VBOXOSTYPE_Mandriva },
     { ovf::CIMOSType_CIMOS_Mandriva_64,                          VBOXOSTYPE_Mandriva_x64 },
     { ovf::CIMOSType_CIMOS_Ubuntu,                               VBOXOSTYPE_Ubuntu },
@@ -160,6 +162,7 @@ static const osTypePattern g_osTypesPatt
     {"SUSE",          VBOXOSTYPE_OpenSUSE},
     {"Novell",        VBOXOSTYPE_OpenSUSE},
     {"Red Hat",       VBOXOSTYPE_RedHat},
+    {"Mageia",        VBOXOSTYPE_Mageia},
     {"Mandriva",      VBOXOSTYPE_Mandriva},
     {"Ubuntu",        VBOXOSTYPE_Ubuntu},
     {"Debian",        VBOXOSTYPE_Debian},
@@ -189,6 +192,7 @@ static const osTypePattern g_osTypesPatt
     {"SUSE",          VBOXOSTYPE_OpenSUSE_x64},
     {"Novell",        VBOXOSTYPE_OpenSUSE_x64},
     {"Red Hat",       VBOXOSTYPE_RedHat_x64},
+    {"Mageia",        VBOXOSTYPE_Mageia_x64},
     {"Mandriva",      VBOXOSTYPE_Mandriva_x64},
     {"Ubuntu",        VBOXOSTYPE_Ubuntu_x64},
     {"Debian",        VBOXOSTYPE_Debian_x64},
diff -Nurp VirtualBox-4.2.0/src/VBox/Main/xml/SettingsConverter.xsl VirtualBox-4.2.0-mga/src/VBox/Main/xml/SettingsConverter.xsl
--- VirtualBox-4.2.0/src/VBox/Main/xml/SettingsConverter.xsl	2012-09-04 15:48:43.000000000 +0300
+++ VirtualBox-4.2.0-mga/src/VBox/Main/xml/SettingsConverter.xsl	2012-09-14 03:21:31.819097811 +0300
@@ -752,6 +752,7 @@ Value '<xsl:value-of select="@type"/>' o
         <xsl:when test="@OSType='opensuse'">OpenSUSE</xsl:when>
         <xsl:when test="@OSType='fedoracore'">Fedora</xsl:when>
         <xsl:when test="@OSType='gentoo'">Gentoo</xsl:when>
+        <xsl:when test="@OSType='mageia'">Mageia</xsl:when>
         <xsl:when test="@OSType='mandriva'">Mandriva</xsl:when>
         <xsl:when test="@OSType='redhat'">RedHat</xsl:when>
         <xsl:when test="@OSType='ubuntu'">Ubuntu</xsl:when>
diff -Nurp VirtualBox-4.2.0/src/VBox/Main/xml/Settings.cpp VirtualBox-4.2.0-mga/src/VBox/Main/xml/Settings.cpp
--- VirtualBox-4.2.0/src/VBox/Main/xml/Settings.cpp	2012-08-29 17:13:34.000000000 +0300
+++ VirtualBox-4.2.0-mga/src/VBox/Main/xml/Settings.cpp	2012-09-14 03:21:31.820097820 +0300
@@ -3395,6 +3395,7 @@ const struct {
     { "opensuse", "OpenSUSE" },
     { "fedoracore", "Fedora" },
     { "gentoo", "Gentoo" },
+    { "mageia", "Mageia" },
     { "mandriva", "Mandriva" },
     { "redhat", "RedHat" },
     { "ubuntu", "Ubuntu" },