Wed Oct 17 01:14:52 PDT 2012

4 files changed, 86 insertions, 86 deletions

diff --git a/libre/virtualbox-libre-modules-lts/PKGBUILD b/libre/virtualbox-libre-modules-lts/PKGBUILD
index e5112c8a9..dff627829 100644
--- a/libre/virtualbox-libre-modules-lts/PKGBUILD
+++ b/libre/virtualbox-libre-modules-lts/PKGBUILD
@@ -8,7 +8,7 @@
 pkgbase=virtualbox-libre-modules-lts
 pkgname=('virtualbox-libre-host-modules-lts' 'virtualbox-libre-guest-modules-lts')
 pkgver=4.2.0
-pkgrel=3
+pkgrel=3.1
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD
index 3bd4616eb..10182a0e9 100644
--- a/libre/virtualbox-libre-modules/PKGBUILD
+++ b/libre/virtualbox-libre-modules/PKGBUILD
@@ -7,7 +7,7 @@
 pkgbase=virtualbox-libre-modules
 pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules')
 pkgver=4.2.0
-pkgrel=6
+pkgrel=6.1
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index 81ba99ec8..5ae72a76f 100644
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -13,7 +13,7 @@ pkgname=('virtualbox-libre'
          'virtualbox-libre-guest-utils'
          'virtualbox-libre-guest-source')
 pkgver=4.2.0
-pkgrel=4
+pkgrel=4.1
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL' 'custom')
@@ -109,7 +109,7 @@ md5sums=('691b4134983ce7d89b9fb683305cb647'
          '4da8eeb2ece7e475fc7a0d1003da26c6'
          '5e4187af59726d71c5be48d0cd816c34'
          '67cc4c8611890038eb3e4114ae899525'
-         '1ede8951f4bebac3b50a8e0b999aa348')
+         'c7b29fbf4c24a00e8646ca6dd73f38a1')
 
 #_extramodules=extramodules-3.5-LIBRE
 #_kernver="$(cat /usr/lib/modules/${_extramodules}/version)" || true
diff --git a/libre/virtualbox-libre/free-distros.patch b/libre/virtualbox-libre/free-distros.patch
index 223aeeb16..fcdb3c631 100644
--- a/libre/virtualbox-libre/free-distros.patch
+++ b/libre/virtualbox-libre/free-distros.patch
@@ -1,5 +1,5 @@
 --- VirtualBox-4.2.0.orig/src/VBox/Main/src-all/Global.cpp	2012-09-08 06:36:02.000000000 -0300
-+++ VirtualBox-4.2.0/src/VBox/Main/src-all/Global.cpp	2012-10-03 15:38:41.975881316 -0300
++++ VirtualBox-4.2.0/src/VBox/Main/src-all/Global.cpp	2012-10-16 23:00:19.998701465 -0200
 @@ -33,289 +33,365 @@
        VBOXOSTYPE_Unknown,         VBOXOSHINT_NONE,
          64,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
@@ -190,318 +190,318 @@
 +      VBOXOSTYPE_Venenux,          VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
 +       384,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
 +        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "ArchLinux",          "Arch Linux",
++    { "Non-free Distros",   "Non-free GNU/Linux Distros (Using it is surrendering your freedom)",             "ArchLinux",          "Arch Linux",
        VBOXOSTYPE_ArchLinux,       VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
         256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "ArchLinux_64",       "Arch Linux (64 bit)",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "ArchLinux_64",       "Arch Linux (64 bit)",
++    { "Non-free Distros",   "Non-free GNU/Linux Distros (Using it is surrendering your freedom)",             "ArchLinux_64",       "Arch Linux (64 bit)",
        VBOXOSTYPE_ArchLinux_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",   "Linux",             "Debian",             "Debian",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Debian",             "Debian",
++    { "Non-free Distros",   "Non-free GNU/Linux Distros (Using it is surrendering your freedom)",             "Debian",             "Debian",
        VBOXOSTYPE_Debian,          VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
         384,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "Debian_64",          "Debian (64 bit)",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Debian_64",          "Debian (64 bit)",
++    { "Non-free Distros",   "Non-free GNU/Linux Distros (Using it is surrendering your freedom)",             "Debian_64",          "Debian (64 bit)",
        VBOXOSTYPE_Debian_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
         384,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97},
 -    { "Linux",   "Linux",             "OpenSUSE",           "openSUSE",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "OpenSUSE",           "openSUSE",
++    { "Non-free Distros",   "Non-free GNU/Linux Distros (Using it is surrendering your freedom)",             "OpenSUSE",           "openSUSE",
        VBOXOSTYPE_OpenSUSE,        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",             "OpenSUSE_64",        "openSUSE (64 bit)",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "OpenSUSE_64",        "openSUSE (64 bit)",
++    { "Non-free Distros",   "Non-free GNU/Linux Distros (Using it is surrendering your freedom)",             "OpenSUSE_64",        "openSUSE (64 bit)",
        VBOXOSTYPE_OpenSUSE_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",             "Fedora",             "Fedora",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Fedora",             "Fedora",
++    { "Non-free Distros",   "Non-free GNU/Linux Distros (Using it is surrendering your freedom)",             "Fedora",             "Fedora",
        VBOXOSTYPE_FedoraCore,      VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
         768,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "Fedora_64",          "Fedora (64 bit)",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Fedora_64",          "Fedora (64 bit)",
++    { "Non-free Distros",   "Non-free GNU/Linux Distros (Using it is surrendering your freedom)",             "Fedora_64",          "Fedora (64 bit)",
        VBOXOSTYPE_FedoraCore_x64,  VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
         768,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "Gentoo",             "Gentoo",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Gentoo",             "Gentoo",
++    { "Non-free Distros",   "Non-free GNU/Linux Distros (Using it is surrendering your freedom)",             "Gentoo",             "Gentoo",
        VBOXOSTYPE_Gentoo,          VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
         256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "Gentoo_64",          "Gentoo (64 bit)",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Gentoo_64",          "Gentoo (64 bit)",
++    { "Non-free Distros",   "Non-free GNU/Linux Distros (Using it is surrendering your freedom)",             "Gentoo_64",          "Gentoo (64 bit)",
        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",   "Linux",             "Mandriva",           "Mandriva",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Mandriva",           "Mandriva",
++    { "Non-free Distros",   "Non-free GNU/Linux Distros (Using it is surrendering your freedom)",             "Mandriva",           "Mandriva",
        VBOXOSTYPE_Mandriva,        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_64",        "Mandriva (64 bit)",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Mandriva_64",        "Mandriva (64 bit)",
++    { "Non-free Distros",   "Non-free GNU/Linux Distros (Using it is surrendering your freedom)",             "Mandriva_64",        "Mandriva (64 bit)",
        VBOXOSTYPE_Mandriva_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",             "RedHat",             "Red Hat",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "RedHat",             "Red Hat",
++    { "Non-free Distros",   "Non-free GNU/Linux Distros (Using it is surrendering your freedom)",             "RedHat",             "Red Hat",
        VBOXOSTYPE_RedHat,          VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE,
         512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "RedHat_64",          "Red Hat (64 bit)",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "RedHat_64",          "Red Hat (64 bit)",
++    { "Non-free Distros",   "Non-free GNU/Linux Distros (Using it is surrendering your freedom)",             "RedHat_64",          "Red Hat (64 bit)",
        VBOXOSTYPE_RedHat_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_PAE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC,
         512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "Turbolinux",         "Turbolinux",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Turbolinux",         "Turbolinux",
++    { "Non-free Distros",   "Non-free GNU/Linux Distros (Using it is surrendering your freedom)",             "Turbolinux",         "Turbolinux",
        VBOXOSTYPE_Turbolinux,      VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
         384,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "Turbolinux_64",      "Turbolinux (64 bit)",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Turbolinux_64",      "Turbolinux (64 bit)",
++    { "Non-free Distros",   "Non-free GNU/Linux Distros (Using it is surrendering your freedom)",             "Turbolinux_64",      "Turbolinux (64 bit)",
        VBOXOSTYPE_Turbolinux_x64,  VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
         384,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "Ubuntu",             "Ubuntu",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Ubuntu",             "Ubuntu",
++    { "Non-free Distros",   "Non-free GNU/Linux Distros (Using it is surrendering your freedom)",             "Ubuntu",             "Ubuntu",
        VBOXOSTYPE_Ubuntu,          VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE | VBOXOSHINT_USBTABLET,
         512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "Ubuntu_64",          "Ubuntu (64 bit)",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Ubuntu_64",          "Ubuntu (64 bit)",
++    { "Non-free Distros",   "Non-free GNU/Linux Distros (Using it is surrendering your freedom)",             "Ubuntu_64",          "Ubuntu (64 bit)",
        VBOXOSTYPE_Ubuntu_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",             "Xandros",            "Xandros",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Xandros",            "Xandros",
++    { "Non-free Distros",   "Non-free GNU/Linux Distros (Using it is surrendering your freedom)",             "Xandros",            "Xandros",
        VBOXOSTYPE_Xandros,         VBOXOSHINT_RTCUTC,
         256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "Xandros_64",         "Xandros (64 bit)",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Xandros_64",         "Xandros (64 bit)",
++    { "Non-free Distros",   "Non-free GNU/Linux Distros (Using it is surrendering your freedom)",             "Xandros_64",         "Xandros (64 bit)",
        VBOXOSTYPE_Xandros_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC,
         256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "Oracle",             "Oracle",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Oracle",             "Oracle",
++    { "Non-free Distros",   "Non-free GNU/Linux Distros (Using it is surrendering your freedom)",             "Oracle",             "Oracle",
        VBOXOSTYPE_Oracle,          VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE,
         512,  12, 12 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "Oracle_64",          "Oracle (64 bit)",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Oracle_64",          "Oracle (64 bit)",
++    { "Non-free Distros",   "Non-free GNU/Linux Distros (Using it is surrendering your freedom)",             "Oracle_64",          "Oracle (64 bit)",
        VBOXOSTYPE_Oracle_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_PAE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC,
         512,  12, 12 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "Linux",              "Other Linux",
 -      VBOXOSTYPE_Linux,           VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
 -       256,  12,  8 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+    { "Non-free OSs", "Non-free Operating Systems", "Windows31",          "Windows 3.1",
++    { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows31",          "Windows 3.1",
 +      VBOXOSTYPE_Win31,           VBOXOSHINT_FLOPPY,
 +        32,   4,  1 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
 +        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
-+    { "Non-free OSs", "Non-free Operating Systems", "Windows95",          "Windows 95",
++    { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows95",          "Windows 95",
 +      VBOXOSTYPE_Win95,           VBOXOSHINT_FLOPPY,
 +        64,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
 +        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
-+    { "Non-free OSs", "Non-free Operating Systems", "Windows98",          "Windows 98",
++    { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows98",          "Windows 98",
 +      VBOXOSTYPE_Win98,           VBOXOSHINT_FLOPPY,
 +        64,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
 +        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
-+    { "Non-free OSs", "Non-free Operating Systems", "WindowsMe",          "Windows ME",
++    { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "WindowsMe",          "Windows ME",
 +      VBOXOSTYPE_WinMe,           VBOXOSHINT_FLOPPY | VBOXOSHINT_USBTABLET,
 +        128,  4,  4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
 +        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Non-free OSs", "Non-free Operating Systems", "WindowsNT4",         "Windows NT 4",
++    { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "WindowsNT4",         "Windows NT 4",
 +      VBOXOSTYPE_WinNT4,          VBOXOSHINT_NONE,
 +       128,  16,  2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
 +        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
-+    { "Non-free OSs", "Non-free Operating Systems", "Windows2000",        "Windows 2000",
++    { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows2000",        "Windows 2000",
 +      VBOXOSTYPE_Win2k,            VBOXOSHINT_USBTABLET,
 +       168,  16,  4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
 +        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Non-free OSs", "Non-free Operating Systems", "WindowsXP",          "Windows XP",
++    { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "WindowsXP",          "Windows XP",
 +      VBOXOSTYPE_WinXP,            VBOXOSHINT_USBTABLET,
 +       192,  16, 10 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
 +        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Non-free OSs", "Non-free Operating Systems", "WindowsXP_64",       "Windows XP (64 bit)",
++    { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "WindowsXP_64",       "Windows XP (64 bit)",
 +      VBOXOSTYPE_WinXP_x64,       VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
 +       192,  16, 10 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
 +        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Non-free OSs", "Non-free Operating Systems", "Windows2003",        "Windows 2003",
++    { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows2003",        "Windows 2003",
 +      VBOXOSTYPE_Win2k3,           VBOXOSHINT_USBTABLET,
 +       256,  16, 20 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
 +        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Non-free OSs", "Non-free Operating Systems", "Windows2003_64",     "Windows 2003 (64 bit)",
++    { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows2003_64",     "Windows 2003 (64 bit)",
 +      VBOXOSTYPE_Win2k3_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
 +       256,  16, 20 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
 +        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_HDA  },
-+    { "Non-free OSs", "Non-free Operating Systems", "WindowsVista",       "Windows Vista",
++    { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "WindowsVista",       "Windows Vista",
 +      VBOXOSTYPE_WinVista,         VBOXOSHINT_USBTABLET,
 +       512,  16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
 +        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
-+    { "Non-free OSs", "Non-free Operating Systems", "WindowsVista_64",    "Windows Vista (64 bit)",
++    { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "WindowsVista_64",    "Windows Vista (64 bit)",
 +      VBOXOSTYPE_WinVista_x64,    VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
 +       512,  16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
 +        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
-+    { "Non-free OSs", "Non-free Operating Systems", "Windows2008",        "Windows 2008",
++    { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows2008",        "Windows 2008",
 +      VBOXOSTYPE_Win2k8,           VBOXOSHINT_USBTABLET,
 +       512,  16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
 +        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
-+    { "Non-free OSs", "Non-free Operating Systems", "Windows2008_64",     "Windows 2008 (64 bit)",
++    { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows2008_64",     "Windows 2008 (64 bit)",
 +      VBOXOSTYPE_Win2k8_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
 +       512,  16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
 +        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
-+    { "Non-free OSs", "Non-free Operating Systems", "Windows7",           "Windows 7",
++    { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows7",           "Windows 7",
 +      VBOXOSTYPE_Win7,             VBOXOSHINT_USBTABLET,
 +       512,  16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
 +        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
-+    { "Non-free OSs", "Non-free Operating Systems", "Windows7_64",        "Windows 7 (64 bit)",
++    { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows7_64",        "Windows 7 (64 bit)",
 +      VBOXOSTYPE_Win7_x64,        VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
 +       512,  16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
 +        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
-+    { "Non-free OSs", "Non-free Operating Systems", "Windows8",           "Windows 8",
++    { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows8",           "Windows 8",
 +      VBOXOSTYPE_Win8,             VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET | VBOXOSHINT_PAE,
 +       1024,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
 +        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
-+    { "Non-free OSs", "Non-free Operating Systems", "Windows8_64",        "Windows 8 (64 bit)",
++    { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows8_64",        "Windows 8 (64 bit)",
 +      VBOXOSTYPE_Win8_x64,        VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
 +       2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
 +        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
-+    { "Non-free OSs", "Non-free Operating Systems", "Windows2012_64",     "Windows 2012 (64 bit)",
++    { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows2012_64",     "Windows 2012 (64 bit)",
 +      VBOXOSTYPE_Win2k12_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
 +       2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
 +        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
-+    { "Non-free OSs", "Non-free Operating Systems", "WindowsNT",          "Other Windows",
++    { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "WindowsNT",          "Other Windows",
 +      VBOXOSTYPE_WinNT,           VBOXOSHINT_NONE,
 +       512,  16, 20 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Solaris", "Solaris",           "Solaris",            "Oracle Solaris 10 5/09 and earlier",
-+    { "Non-free OSs", "Non-free Operating Systems",           "Solaris",            "Oracle Solaris 10 5/09 and earlier",
++    { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)",           "Solaris",            "Oracle Solaris 10 5/09 and earlier",
        VBOXOSTYPE_Solaris,         VBOXOSHINT_NONE,
         768,  12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Solaris", "Solaris",           "Solaris_64",         "Oracle Solaris 10 5/09 and earlier (64 bit)",
-+    { "Non-free OSs", "Non-free Operating Systems",           "Solaris_64",         "Oracle Solaris 10 5/09 and earlier (64 bit)",
++    { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)",           "Solaris_64",         "Oracle Solaris 10 5/09 and earlier (64 bit)",
        VBOXOSTYPE_Solaris_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC,
        1536,  12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Solaris", "Solaris",           "OpenSolaris",        "Oracle Solaris 10 10/09 and later",
-+    { "Non-free OSs", "Non-free Operating Systems",           "OpenSolaris",        "Oracle Solaris 10 10/09 and later",
++    { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)",           "OpenSolaris",        "Oracle Solaris 10 10/09 and later",
        VBOXOSTYPE_OpenSolaris,     VBOXOSHINT_USBTABLET,
         768,  12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Solaris", "Solaris",           "OpenSolaris_64",     "Oracle Solaris 10 10/09 and later (64 bit)",
-+    { "Non-free OSs", "Non-free Operating Systems",           "OpenSolaris_64",     "Oracle Solaris 10 10/09 and later (64 bit)",
++    { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)",           "OpenSolaris_64",     "Oracle Solaris 10 10/09 and later (64 bit)",
        VBOXOSTYPE_OpenSolaris_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
        1536,  12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Solaris", "Solaris",           "Solaris11_64",       "Oracle Solaris 11 (64 bit)",
-+    { "Non-free OSs", "Non-free Operating Systems",           "Solaris11_64",       "Oracle Solaris 11 (64 bit)",
++    { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)",           "Solaris11_64",       "Oracle Solaris 11 (64 bit)",
        VBOXOSTYPE_Solaris11_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
        1536,  12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "BSD",     "BSD",               "FreeBSD",            "FreeBSD",
-+    { "Non-free OSs",     "Non-free Operating Systems",               "FreeBSD",            "FreeBSD",
++    { "Non-free OSs",     "Non-free Operating Systems (Using it is surrendering your freedom)",               "FreeBSD",            "FreeBSD",
        VBOXOSTYPE_FreeBSD,         VBOXOSHINT_NONE,
         128,   4,  2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "BSD",     "BSD",               "FreeBSD_64",         "FreeBSD (64 bit)",
-+    { "Non-free OSs",     "Non-free Operating Systems",               "FreeBSD_64",         "FreeBSD (64 bit)",
++    { "Non-free OSs",     "Non-free Operating Systems (Using it is surrendering your freedom)",               "FreeBSD_64",         "FreeBSD (64 bit)",
        VBOXOSTYPE_FreeBSD_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC,
         128,   4,  2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "BSD",     "BSD",               "OpenBSD",            "OpenBSD",
-+    { "Non-free OSs",     "Non-free Operating Systems",               "OpenBSD",            "OpenBSD",
++    { "Non-free OSs",     "Non-free Operating Systems (Using it is surrendering your freedom)",               "OpenBSD",            "OpenBSD",
        VBOXOSTYPE_OpenBSD,         VBOXOSHINT_HWVIRTEX,
          64,   4,  2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "BSD",     "BSD",               "OpenBSD_64",         "OpenBSD (64 bit)",
-+    { "Non-free OSs",     "Non-free Operating Systems",               "OpenBSD_64",         "OpenBSD (64 bit)",
++    { "Non-free OSs",     "Non-free Operating Systems (Using it is surrendering your freedom)",               "OpenBSD_64",         "OpenBSD (64 bit)",
        VBOXOSTYPE_OpenBSD_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC,
          64,   4,  2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "BSD",     "BSD",               "NetBSD",             "NetBSD",
-+    { "Non-free OSs",     "Non-free Operating Systems",               "NetBSD",             "NetBSD",
++    { "Non-free OSs",     "Non-free Operating Systems (Using it is surrendering your freedom)",               "NetBSD",             "NetBSD",
        VBOXOSTYPE_NetBSD,          VBOXOSHINT_NONE,
          64,   4,  2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "BSD",     "BSD",               "NetBSD_64",          "NetBSD (64 bit)",
-+    { "Non-free OSs",     "Non-free Operating Systems",               "NetBSD_64",          "NetBSD (64 bit)",
++    { "Non-free OSs",     "Non-free Operating Systems (Using it is surrendering your freedom)",               "NetBSD_64",          "NetBSD (64 bit)",
        VBOXOSTYPE_NetBSD_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC,
          64,   4,  2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "OS2",     "IBM OS/2",          "OS2Warp3",           "OS/2 Warp 3",
-+    { "Non-free OSs",     "Non-free Operating Systems",          "OS2Warp3",           "OS/2 Warp 3",
++    { "Non-free OSs",     "Non-free Operating Systems (Using it is surrendering your freedom)",          "OS2Warp3",           "OS/2 Warp 3",
        VBOXOSTYPE_OS2Warp3,        VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY,
          48,   4,  1 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
 -    { "OS2",     "IBM OS/2",          "OS2Warp4",           "OS/2 Warp 4",
-+    { "Non-free OSs",     "Non-free Operating Systems",          "OS2Warp4",           "OS/2 Warp 4",
++    { "Non-free OSs",     "Non-free Operating Systems (Using it is surrendering your freedom)",          "OS2Warp4",           "OS/2 Warp 4",
        VBOXOSTYPE_OS2Warp4,        VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY,
          64,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
 -    { "OS2",     "IBM OS/2",          "OS2Warp45",          "OS/2 Warp 4.5",
-+    { "Non-free OSs",     "Non-free Operating Systems",          "OS2Warp45",          "OS/2 Warp 4.5",
++    { "Non-free OSs",     "Non-free Operating Systems (Using it is surrendering your freedom)",          "OS2Warp45",          "OS/2 Warp 4.5",
        VBOXOSTYPE_OS2Warp45,       VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY,
          128,  4,  2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
 -    { "OS2",     "IBM OS/2",          "OS2eCS",             "eComStation",
-+    { "Non-free OSs",     "Non-free Operating Systems",          "OS2eCS",             "eComStation",
++    { "Non-free OSs",     "Non-free Operating Systems (Using it is surrendering your freedom)",          "OS2eCS",             "eComStation",
        VBOXOSTYPE_ECS,             VBOXOSHINT_HWVIRTEX,
          256,  4,  2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "OS2",     "IBM OS/2",          "OS2",                "Other OS/2",
-+    { "Non-free OSs",     "Non-free Operating Systems",          "OS2",                "Other OS/2",
++    { "Non-free OSs",     "Non-free Operating Systems (Using it is surrendering your freedom)",          "OS2",                "Other OS/2",
        VBOXOSTYPE_OS2,             VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY | VBOXOSHINT_NOUSB,
          96,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
 -    { "MacOS",   "Mac OS X",          "MacOS",              "Mac OS X",
-+    { "Non-free OSs",   "Non-free Operating Systems",          "MacOS",              "Mac OS X",
++    { "Non-free OSs",   "Non-free Operating Systems (Using it is surrendering your freedom)",          "MacOS",              "Mac OS X",
        VBOXOSTYPE_MacOS,           VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE | VBOXOSHINT_USBHID | VBOXOSHINT_HPET | VBOXOSHINT_USBTABLET,
        2048,   4, 20 * _1G64, NetworkAdapterType_I82543GC, 0,
         StorageControllerType_ICH6, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA,
        ChipsetType_ICH9, AudioControllerType_HDA  },
 -    { "MacOS",   "Mac OS X",          "MacOS_64",           "Mac OS X (64 bit)",
-+    { "Non-free OSs",   "Non-free Operating Systems",          "MacOS_64",           "Mac OS X (64 bit)",
++    { "Non-free OSs",   "Non-free Operating Systems (Using it is surrendering your freedom)",          "MacOS_64",           "Mac OS X (64 bit)",
        VBOXOSTYPE_MacOS_x64,       VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE |  VBOXOSHINT_64BIT | VBOXOSHINT_USBHID | VBOXOSHINT_HPET | VBOXOSHINT_USBTABLET,
        2048,   4, 20 * _1G64, NetworkAdapterType_I82543GC, 0,
        StorageControllerType_ICH6, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA,
        ChipsetType_ICH9, AudioControllerType_HDA  },
 -    { "Other",   "Other",             "DOS",                "DOS",
-+    { "Non-free OSs",   "Non-free Operating Systems",             "DOS",                "DOS",
++    { "Non-free OSs",   "Non-free Operating Systems (Using it is surrendering your freedom)",             "DOS",                "DOS",
        VBOXOSTYPE_DOS,             VBOXOSHINT_FLOPPY | VBOXOSHINT_NOUSB,
          32,   4,  500 * _1M, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
 -    { "Other",   "Other",             "Netware",            "Netware",
-+    { "Non-free OSs",   "Non-free Operating Systems",             "Netware",            "Netware",
++    { "Non-free OSs",   "Non-free Operating Systems (Using it is surrendering your freedom)",             "Netware",            "Netware",
        VBOXOSTYPE_Netware,         VBOXOSHINT_HWVIRTEX,
         512,   4,  4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Other",   "Other",             "L4",                 "L4",
-+    { "Non-free OSs",   "Non-free Operating Systems",             "L4",                 "L4",
++    { "Non-free OSs",   "Non-free Operating Systems (Using it is surrendering your freedom)",             "L4",                 "L4",
        VBOXOSTYPE_L4,              VBOXOSHINT_NONE,
          64,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Other",   "Other",             "QNX",                "QNX",
-+    { "Non-free OSs",   "Non-free Operating Systems",             "QNX",                "QNX",
++    { "Non-free OSs",   "Non-free Operating Systems (Using it is surrendering your freedom)",             "QNX",                "QNX",
        VBOXOSTYPE_QNX,             VBOXOSHINT_HWVIRTEX,
         512,   4,  4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Other",   "Other",             "JRockitVE",          "JRockitVE",
-+    { "Non-free OSs",   "Non-free Operating Systems",             "JRockitVE",          "JRockitVE",
++    { "Non-free OSs",   "Non-free Operating Systems (Using it is surrendering your freedom)",             "JRockitVE",          "JRockitVE",
          VBOXOSTYPE_JRockitVE,     VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_PAE,
          1024, 4,  8 * _1G64, NetworkAdapterType_I82545EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_BusLogic, StorageBus_SCSI, ChipsetType_PIIX3, AudioControllerType_AC97  },
 --- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp	2012-08-29 11:13:40.000000000 -0300
-+++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp	2012-10-04 01:54:14.693582889 -0300
-@@ -44,45 +44,45 @@
++++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp	2012-10-16 22:44:37.177454655 -0200
+@@ -44,45 +44,33 @@
  
  static const osTypePattern gs_OSTypePattern[] =
  {
@@ -542,18 +542,6 @@
 -    { QRegExp("OS[/|!-]{,1}2.*W", Qt::CaseInsensitive), "OS2Warp3" },
 -    { QRegExp("(OS[/|!-]{,1}2.*e)|(eCS.*)", Qt::CaseInsensitive), "OS2eCS" },
 -    { QRegExp("OS[/|!-]{,1}2", Qt::CaseInsensitive), "OS2" },
-+    /* Regular names of generic GNU, GNU/Linux and GNU-Hurd Operating Systems */
-+    { QRegExp("((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?2", Qt::CaseInsensitive), "Linux22" },
-+    { QRegExp("((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?4.*64", Qt::CaseInsensitive), "Linux24_64" },
-+    { QRegExp("((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?4", Qt::CaseInsensitive), "Linux24" },
-+    { QRegExp("((((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?6)|(LFS)).*64", Qt::CaseInsensitive), "Linux26_64" },
-+    { QRegExp("(((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?6)|(LFS)", Qt::CaseInsensitive), "Linux26" },
-+    { QRegExp("((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*64", Qt::CaseInsensitive), "Linux26_64" },
-+    { QRegExp("(GNU[/|!-]{,1}Li)|(Li)|(lnx)", Qt::CaseInsensitive), "Linux26" },
-+    { QRegExp("(GNU-Hu)|(GNU[/|!-]{,1}Hu)|(Hu)", Qt::CaseInsensitive), "GNUHurd" },
-+    { QRegExp("GNU.*64", Qt::CaseInsensitive), "GNU_64" },
-+    { QRegExp("GNU", Qt::CaseInsensitive), "GNU" },
-+
 +    /* Code names for free GNU/Linux distributions */
 +    { QRegExp("((Taranis)|(Dagda)|(Brigantia)).*64", Qt::CaseInsensitive), "Trisquel_64" },
 +    { QRegExp("(Taranis)|(Dagda)|(Brigantia)", Qt::CaseInsensitive), "Trisquel" },
@@ -585,7 +573,7 @@
      { QRegExp("((edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)).*64", Qt::CaseInsensitive), "Ubuntu_64" },
      { QRegExp("(edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)", Qt::CaseInsensitive), "Ubuntu" },
      { QRegExp("((sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(sid)).*64", Qt::CaseInsensitive), "Debian_64" },
-@@ -90,7 +90,7 @@
+@@ -90,7 +78,7 @@
      { QRegExp("((moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)).*64", Qt::CaseInsensitive), "Fedora_64" },
      { QRegExp("(moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)", Qt::CaseInsensitive), "Fedora" },
  
@@ -594,7 +582,7 @@
      { QRegExp("Arc.*64", Qt::CaseInsensitive), "ArchLinux_64" },
      { QRegExp("Arc", Qt::CaseInsensitive), "ArchLinux" },
      { QRegExp("Deb.*64", Qt::CaseInsensitive), "Debian_64" },
-@@ -115,15 +115,38 @@
+@@ -115,15 +103,50 @@
      { QRegExp("(Or)|(oel)", Qt::CaseInsensitive), "Oracle" },
      { QRegExp("Knoppix", Qt::CaseInsensitive), "Linux26" },
      { QRegExp("Dsl", Qt::CaseInsensitive), "Linux24" },
@@ -607,6 +595,18 @@
 -    { QRegExp("(Li)|(lnx)", Qt::CaseInsensitive), "Linux26" },
  
 -    /* Other: */
++    /* Regular names of generic GNU, GNU/Linux and GNU-Hurd Operating Systems */
++    { QRegExp("((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?2", Qt::CaseInsensitive), "Linux22" },
++    { QRegExp("((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?4.*64", Qt::CaseInsensitive), "Linux24_64" },
++    { QRegExp("((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?4", Qt::CaseInsensitive), "Linux24" },
++    { QRegExp("((((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?6)|(LFS)).*64", Qt::CaseInsensitive), "Linux26_64" },
++    { QRegExp("(((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?6)|(LFS)", Qt::CaseInsensitive), "Linux26" },
++    { QRegExp("((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*64", Qt::CaseInsensitive), "Linux26_64" },
++    { QRegExp("(GNU[/|!-]{,1}Li)|(Li)|(lnx)", Qt::CaseInsensitive), "Linux26" },
++    { QRegExp("(GNU-Hu)|(GNU[/|!-]{,1}Hu)|(Hu)", Qt::CaseInsensitive), "GNUHurd" },
++    { QRegExp("GNU.*64", Qt::CaseInsensitive), "GNU_64" },
++    { QRegExp("GNU", Qt::CaseInsensitive), "GNU" },
++
 +    /* Regular names of non-free operating systems: */
 +    { QRegExp("DOS", Qt::CaseInsensitive), "DOS" },
 +    { QRegExp("Wi.*98", Qt::CaseInsensitive), "Windows98" },