Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	core/sed/PKGBUILD
	extra/tcl/PKGBUILD
	extra/transmission/PKGBUILD

6 files changed, 202 insertions, 74 deletions

diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD
index bc71be0c1..154da73f3 100644
--- a/libre/kdelibs-libre/PKGBUILD
+++ b/libre/kdelibs-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 172900 2012-12-06 14:03:01Z andrea $
+# $Id: PKGBUILD 173890 2012-12-27 10:10:17Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -6,7 +6,7 @@
 _pkgname=kdelibs
 pkgname=kdelibs-libre
 pkgver=4.9.4
-pkgrel=3
+pkgrel=4
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64' 'mips64el')
 url='https://projects.kde.org/projects/kde/kdelibs'
@@ -15,7 +15,7 @@ depends=('strigi' 'attica' 'libxss' 'soprano' 'krb5' 'grantlee'
         'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt'
         'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr'
         'docbook-xsl' 'upower' 'udisks' 'libxcursor' 'phonon' 'qtwebkit'
-        'media-player-info' 'libxtst')
+        'media-player-info' 'libxtst' 'libutempter')
 makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell' 'mesa')
 provides=("kdelibs=$pkgver")
 replaces=('kdelibs')
diff --git a/libre/virtualbox-libre-modules-lts/PKGBUILD b/libre/virtualbox-libre-modules-lts/PKGBUILD
index 0b43cbf0a..1833f020e 100644
--- a/libre/virtualbox-libre-modules-lts/PKGBUILD
+++ b/libre/virtualbox-libre-modules-lts/PKGBUILD
@@ -8,18 +8,19 @@
 pkgbase=virtualbox-libre-modules-lts
 pkgname=('virtualbox-libre-host-modules-lts' 'virtualbox-libre-guest-modules-lts')
 pkgver=4.2.6
-pkgrel=1
+pkgrel=4
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
 makedepends=('linux-libre-lts-headers'
              "virtualbox-libre-host-dkms>=$pkgver"
              "virtualbox-libre-guest-dkms>=$pkgver"
-             'expac')
+             'expac'
+             'bc')
 
 build() {
-  # current kernel libre version
   _kernver=$(expac -Q '%v' linux-libre-lts-headers)-LIBRE-LTS
+
   # dkms need modification to be run as user
   cp -r /var/lib/dkms .
   echo "dkms_tree='$srcdir/dkms'" > dkms.conf
@@ -32,16 +33,17 @@ build() {
 }
 
 package_virtualbox-libre-host-modules-lts(){
-  pkgdesc='Host kernel libre modules for VirtualBox'
+  _kernver=$(expac -Q '%v' linux-libre-lts-headers)-LIBRE-LTS
+  _extraver=extramodules-${_kernver%.*}-LIBRE-LTS
+
+  pkgdesc='Host kernel modules for VirtualBox (built for the linux-libre-lts kernel package)'
+#  depends=("linux-libre-lts>=${_kernver%.*}" "linux-libre-lts<$(echo "${_kernver%.*}+0.1"|bc)")
   depends=('linux-libre-lts>=3.0' 'linux-libre-lts<3.1')
   replaces=('virtualbox-host-modules-lts' 'virtualbox-modules-lts' 'virtualbox-libre-modules-lts')
   conflicts=('virtualbox-host-modules-lts' 'virtualbox-modules-lts' 'virtualbox-libre-modules-lts')
   provides=("virtualbox-host-modules-lts=$pkgver" "virtualbox-libre-host-modules=$pkgver")
   install=virtualbox-libre-host-modules-lts.install
 
-  _kernver=$(expac -Q '%v' linux-libre-lts-headers)-LIBRE-LTS
-  _extraver=extramodules-${_kernver%.*}-LIBRE-LTS
-
   install -dm755 "$pkgdir/usr/lib/modules/$_extraver"
   cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module"
   install -m644 * "$pkgdir/usr/lib/modules/$_extraver"
@@ -50,17 +52,18 @@ package_virtualbox-libre-host-modules-lts(){
 }
 
 package_virtualbox-libre-guest-modules-lts(){
-  pkgdesc='Guest kernel libre modules for VirtualBox'
+  _kernver=$(expac -Q '%v' linux-libre-lts-headers)-LIBRE-LTS
+  _extraver=extramodules-${_kernver%.*}-LIBRE-LTS
+
+  pkgdesc='Guest kernel modules for VirtualBox (built for the linux-libre-lts kernel package)'
   license=('GPL')
+#  depends=("linux-libre-lts>=${_kernver%.*}" "linux-libre-lts<$(echo "${_kernver%.*}+0.1"|bc)")
   depends=('linux-libre-lts>=3.0' 'linux-libre-lts<3.1')
   replaces=('virtualbox-guest-modules-lts' 'virtualbox-archlinux-modules-lts' 'virtualbox-libre-parabola-modules-lts')
   conflicts=('virtualbox-guest-modules-lts' 'virtualbox-archlinux-modules-lts' 'virtualbox-libre-parabola-modules-lts')
   provides=("virtualbox-guest-modules-lts=$pkgver" "virtualbox-libre-host-modules=$pkgver")
   install=virtualbox-libre-guest-modules-lts.install
 
-  _kernver=$(expac -Q '%v' linux-libre-lts-headers)-LIBRE-LTS
-  _extraver=extramodules-${_kernver%.*}-LIBRE-LTS
-
   install -dm755 "$pkgdir/usr/lib/modules/$_extraver"
   cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module"
   install -m644 * "$pkgdir/usr/lib/modules/$_extraver"
diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD
index 948465a99..067a95fdd 100644
--- a/libre/virtualbox-libre-modules/PKGBUILD
+++ b/libre/virtualbox-libre-modules/PKGBUILD
@@ -7,18 +7,19 @@
 pkgbase=virtualbox-libre-modules
 pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules')
 pkgver=4.2.6
-pkgrel=2
+pkgrel=4
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
 makedepends=('linux-libre-headers'
              "virtualbox-libre-host-dkms>=$pkgver"
              "virtualbox-libre-guest-dkms>=$pkgver"
-             'expac')
+             'expac'
+             'bc')
 
 build() {
-  # current kernel libre version
   _kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE
+
   # dkms need modification to be run as user
   cp -r /var/lib/dkms .
   echo "dkms_tree='$srcdir/dkms'" > dkms.conf
@@ -31,16 +32,17 @@ build() {
 }
 
 package_virtualbox-libre-host-modules(){
+  _kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE
+  _extraver=extramodules-${_kernver%.*}-LIBRE
+
   pkgdesc='Host kernel modules for VirtualBox (built for the linux-libre kernel package)'
+#  depends=("linux-libre>=${_kernver%.*}" "linux-libre<$(echo "${_kernver%.*}+0.1"|bc)")
   depends=('linux-libre>=3.7' 'linux-libre<3.8')
   provides=("virtualbox-host-modules=${pkgver}")
   replaces=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules')
   conflicts=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules')
   install=virtualbox-libre-host-modules.install
 
-  _kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE
-  _extraver=extramodules-${_kernver%.*}-LIBRE
-
   install -dm755 "$pkgdir/usr/lib/modules/$_extraver"
   cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module"
   install -m644 * "$pkgdir/usr/lib/modules/$_extraver"
@@ -49,17 +51,18 @@ package_virtualbox-libre-host-modules(){
 }
 
 package_virtualbox-libre-guest-modules(){
+  _kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE
+  _extraver=extramodules-${_kernver%.*}-LIBRE
+
   pkgdesc='Guest kernel modules for VirtualBox (built for the linux-libre kernel package)'
   license=('GPL')
+#  depends=("linux-libre>=${_kernver%.*}" "linux-libre<$(echo "${_kernver%.*}+0.1"|bc)")
   depends=('linux-libre>=3.7' 'linux-libre<3.8')
   provides=("virtualbox-guest-modules=${pkgver}")
   replaces=('virtualbox-guest-modules' 'virtualbox-archlinux-modules' 'virtualbox-parabola-modules')
   conflicts=('virtualbox-guest-modules' 'virtualbox-archlinux-modules' 'virtualbox-parabola-modules')
   install=virtualbox-libre-guest-modules.install
 
-  _kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE
-  _extraver=extramodules-${_kernver%.*}-LIBRE
-
   install -dm755 "$pkgdir/usr/lib/modules/$_extraver"
   cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module"
   install -m644 * "$pkgdir/usr/lib/modules/$_extraver"
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index a311a0f53..dc94a2a33 100644
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -11,10 +11,9 @@ pkgname=('virtualbox-libre'
          'virtualbox-libre-host-dkms'
          'virtualbox-libre-guest-dkms'
          'virtualbox-libre-sdk'
-         'virtualbox-libre-guest-utils'
-         'virtualbox-libre-ext-vnc')
+         'virtualbox-libre-guest-utils')
 pkgver=4.2.6
-pkgrel=1
+pkgrel=1.1
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL' 'custom')
@@ -29,7 +28,6 @@ makedepends=('alsa-lib'
              'libidl2'
              'libpulse'
              'libstdc++5'
-             'libvncserver'
              'libxcursor'
              'libxinerama'
              'libxml2'
@@ -109,8 +107,8 @@ md5sums=('d680aeb3b4379b8281527aeb012b2df5'
          'c7951fe6888d939f3a7d0dafe477e82b'
          '4da8eeb2ece7e475fc7a0d1003da26c6'
          '5e4187af59726d71c5be48d0cd816c34'
-         '85141ccd2621a8e004b8f55c9a1f83eb'
-         '6c93159ec2a8f2b132d87cde7202749e')
+         '05d166104a66ee479896c941ac27a3d0'
+         '78168f8699aa01a632603f0d5b1b8281')
 
 build() {
     cd "VirtualBox-$pkgver"
@@ -151,7 +149,6 @@ build() {
     ./configure --disable-docs \
         --enable-webservice \
         --enable-vde \
-        --enable-vnc \
         --disable-kmods
     source ./env.sh
     kmk all
@@ -166,11 +163,6 @@ build() {
     sed -i 's:/opt/VirtualBox:/usr/share/virtualbox:' Makefile.kmk
     kmk all
     popd
-
-    # build VNC pack
-    pushd src/VBox/ExtPacks/VNC
-    kmk packing
-    popd
 }
 
 package_virtualbox-libre() {
@@ -356,18 +348,4 @@ package_virtualbox-libre-guest-utils(){
         "$pkgdir/usr/lib/systemd/system/vboxservice.service"
 }
 
-package_virtualbox-libre-ext-vnc() {
-    pkgdesc='VirtualBox VNC extension pack'
-    depends=('virtualbox-libre' 'libvncserver')
-    optdepends=('tigervnc: vnc client')
-    replaces=('virtualbox-ext-vnc')
-    conflicts=('virtualbox-ext-vnc')
-    provides=("virtualbox-ext-vnc=$pkgver")
-    install=virtualbox-libre-ext-vnc.install
-
-    source "VirtualBox-$pkgver/env.sh"
-    cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/packages"
-    install -Dm644 VNC-*.vbox-extpack "$pkgdir/usr/share/virtualbox/extensions/VNC-${pkgver}.vbox-extpack"
-}
-
 # vim:set ts=4 sw=4 et:
diff --git a/libre/virtualbox-libre/free-distros.patch b/libre/virtualbox-libre/free-distros.patch
index 8004ee99a..91d15e380 100644
--- a/libre/virtualbox-libre/free-distros.patch
+++ b/libre/virtualbox-libre/free-distros.patch
@@ -502,7 +502,7 @@ index 6ae0372..df65e60 100644
          1024, 4,  8 * _1G64, NetworkAdapterType_I82545EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_BusLogic, StorageBus_SCSI, ChipsetType_PIIX3, AudioControllerType_AC97  },
 diff --git a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
-index c5a4cfe..b3e0247 100644
+index c5a4cfe..7d2b363 100644
 --- a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
 +++ b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
 @@ -44,46 +44,33 @@ struct osTypePattern
@@ -588,7 +588,7 @@ index c5a4cfe..b3e0247 100644
      { QRegExp("Arc.*64", Qt::CaseInsensitive), "ArchLinux_64" },
      { QRegExp("Arc", Qt::CaseInsensitive), "ArchLinux" },
      { QRegExp("Deb.*64", Qt::CaseInsensitive), "Debian_64" },
-@@ -116,15 +103,50 @@ static const osTypePattern gs_OSTypePattern[] =
+@@ -116,15 +103,51 @@ static const osTypePattern gs_OSTypePattern[] =
      { QRegExp("(Or)|(oel)", Qt::CaseInsensitive), "Oracle" },
      { QRegExp("Knoppix", Qt::CaseInsensitive), "Linux26" },
      { QRegExp("Dsl", Qt::CaseInsensitive), "Linux24" },
@@ -625,6 +625,7 @@ index c5a4cfe..b3e0247 100644
 +    { QRegExp("(Wi.*2003)|(W2K3)", Qt::CaseInsensitive), "Windows2003" },
 +    { QRegExp("((Wi.*V)|(Vista)).*64", Qt::CaseInsensitive), "WindowsVista_64" },
 +    { QRegExp("(Wi.*V)|(Vista)", Qt::CaseInsensitive), "WindowsVista" },
++    { QRegExp("(Wi.*2012)|(W2K12)", Qt::CaseInsensitive), "Windows2012_64" },
 +    { QRegExp("((Wi.*2008)|(W2K8)).*64", Qt::CaseInsensitive), "Windows2008_64" },
 +    { QRegExp("(Wi.*2008)|(W2K8)", Qt::CaseInsensitive), "Windows2008" },
 +    { QRegExp("(Wi.*2000)|(W2K)", Qt::CaseInsensitive), "Windows2000" },
@@ -647,7 +648,7 @@ index c5a4cfe..b3e0247 100644
      { QRegExp("L4", Qt::CaseInsensitive), "L4" },
      { QRegExp("((Fr.*B)|(fbsd)).*64", Qt::CaseInsensitive), "FreeBSD_64" },
      { QRegExp("(Fr.*B)|(fbsd)", Qt::CaseInsensitive), "FreeBSD" },
-@@ -137,6 +159,8 @@ static const osTypePattern gs_OSTypePattern[] =
+@@ -137,6 +160,8 @@ static const osTypePattern gs_OSTypePattern[] =
      { QRegExp("(Mac)|(Tig)|(Leop)|(osx)", Qt::CaseInsensitive), "MacOS" },
      { QRegExp("Net", Qt::CaseInsensitive), "Netware" },
      { QRegExp("Rocki", Qt::CaseInsensitive), "JRockitVE" },
@@ -656,7 +657,7 @@ index c5a4cfe..b3e0247 100644
      { QRegExp("Ot", Qt::CaseInsensitive), "Other" },
  };
  
-@@ -231,11 +255,13 @@ UIWizardNewVMPageBasic1::UIWizardNewVMPageBasic1(const QString &strGroup)
+@@ -231,11 +256,13 @@ UIWizardNewVMPageBasic1::UIWizardNewVMPageBasic1(const QString &strGroup)
      /* Create widgets: */
      QVBoxLayout *pMainLayout = new QVBoxLayout(this);
      {
@@ -720,10 +721,10 @@ index 9a31a4c..7db11ad 100644
      </xsl:attribute>
      <xsl:apply-templates select="@*[name()!='OSType']" mode="v1.5"/>
 diff --git a/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc b/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc
-index 075f097..3d311e1 100644
+index 4523dad..38ae21a 100644
 --- a/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc
 +++ b/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc
-@@ -70,6 +70,24 @@
+@@ -71,6 +71,24 @@
          <file alias="os_oracle_64.png">images/os_oracle_64.png</file>
          <file alias="os_macosx.png">images/os_macosx.png</file>
          <file alias="os_macosx_64.png">images/os_macosx_64.png</file>
@@ -749,10 +750,10 @@ index 075f097..3d311e1 100644
          <file alias="hd_disabled_16px.png">images/hd_disabled_16px.png</file>
          <file alias="hd_32px.png">images/hd_32px.png</file>
 diff --git a/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp b/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp
-index ec404df..c09e3b1 100644
+index 8af9597..39a8d39 100644
 --- a/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp
 +++ b/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp
-@@ -4334,11 +4334,11 @@ void VBoxGlobal::init()
+@@ -4336,11 +4336,11 @@ void VBoxGlobal::init()
          {"OS2Warp45",       ":/os_os2warp45.png"},
          {"OS2eCS",          ":/os_os2ecs.png"},
          {"OS2",             ":/os_os2_other.png"},
@@ -769,7 +770,7 @@ index ec404df..c09e3b1 100644
          {"ArchLinux",       ":/os_archlinux.png"},
          {"ArchLinux_64",    ":/os_archlinux_64.png"},
          {"Debian",          ":/os_debian.png"},
-@@ -4361,7 +4361,7 @@ void VBoxGlobal::init()
+@@ -4363,7 +4363,7 @@ void VBoxGlobal::init()
          {"Xandros_64",      ":/os_xandros_64.png"},
          {"Oracle",          ":/os_oracle.png"},
          {"Oracle_64",       ":/os_oracle_64.png"},
@@ -778,7 +779,7 @@ index ec404df..c09e3b1 100644
          {"FreeBSD",         ":/os_freebsd.png"},
          {"FreeBSD_64",      ":/os_freebsd_64.png"},
          {"OpenBSD",         ":/os_openbsd.png"},
-@@ -4377,6 +4377,25 @@ void VBoxGlobal::init()
+@@ -4379,6 +4379,25 @@ void VBoxGlobal::init()
          {"MacOS",           ":/os_macosx.png"},
          {"MacOS_64",        ":/os_macosx_64.png"},
          {"JRockitVE",       ":/os_jrockitve.png"},
@@ -1398,15 +1399,15 @@ index f902373..625da36 100644
 --- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts
 +++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts
 @@ -4850,6 +4850,10 @@
-       <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-       <translation>نوع سیستم عاملی که شما قصد دارید داخل ماشین مجازی را نصب کنید نشان میدهد،که بعنوان سیستم عامل مهمان شناخته میشود.</translation>
+         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
+         <translation>نوع سیستم عاملی که شما قصد دارید داخل ماشین مجازی را نصب کنید نشان میدهد،که بعنوان سیستم عامل مهمان شناخته میشود.</translation>
      </message>
 +    <message>
 +        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
 +        <translation type="unfinished"></translation>
 +    </message>
-   </context>
-   <context>
+ </context>
+ <context>
      <name>UINetworkManagerDialog</name>
 diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fi.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fi.ts
 index 3f31f8f..9248344 100644
diff --git a/libre/virtualbox-libre/libre.patch b/libre/virtualbox-libre/libre.patch
index 138bbd612..e93fe80e8 100644
--- a/libre/virtualbox-libre/libre.patch
+++ b/libre/virtualbox-libre/libre.patch
@@ -1,5 +1,5 @@
---- VirtualBox-4.2.0.orig/Config.kmk	2012-09-13 05:26:16.000000000 -0300
-+++ VirtualBox-4.2.0/Config.kmk		2012-09-18 21:35:33.118487052 -0300
+--- VirtualBox-4.2.6.orig/Config.kmk	2012-12-19 16:24:34.000000000 -0200
++++ VirtualBox-4.2.6/Config.kmk		2012-12-27 14:28:22.897125304 -0200
 @@ -56,9 +56,6 @@
  PROPS_SYSMODS_ACCUMULATE_L   += INTERMEDIATES
  PROPS_MISCBINS_ACCUMULATE_L  += INTERMEDIATES
@@ -55,7 +55,16 @@
  ifdef VBOX_WITH_PCI_PASSTHROUGH
   VBOX_WITH_PCI_PASSTHROUGH_IMPL = 1
  endif
-@@ -609,17 +596,6 @@
+@@ -580,8 +567,6 @@
+ if1of ($(KBUILD_TARGET), darwin freebsd linux solaris win)
+  VBOX_WITH_CROGL = 1
+ endif
+-# Enable the VNC server extension pack (GPL only).
+-#VBOX_WITH_EXTPACK_VNC = 1
+ # Enable S3 support (requires libcurl)
+ VBOX_WITH_S3 = 1
+ # Enable Host=>Guest Drag'n'Drop
+@@ -621,17 +606,6 @@
  endif
  ## @}
  
@@ -73,7 +82,7 @@
  ## @name Misc
  ## @{
  # Enable Seamless mode
-@@ -810,14 +786,6 @@
+@@ -822,14 +796,6 @@
  # Skip stuff.
  #
  
@@ -88,7 +97,7 @@
  # VBOX_QUICK can be used by core developers to speed to the build
  ifdef VBOX_QUICK
   # undefine variables by assigning blank.
-@@ -872,7 +840,6 @@
+@@ -884,7 +850,6 @@
   VBOX_WITH_TESTSUITE=
   VBOX_WITH_QTGUI=
   VBOX_WITH_USB=
@@ -96,7 +105,7 @@
   VBOX_WITH_DOCS=
   VBOX_WITH_PDM_ASYNC_COMPLETION=
   VBOX_WITH_KCHMVIEWER=
-@@ -894,7 +861,6 @@
+@@ -906,7 +871,6 @@
   VBOX_WITH_CROGL=
   VBOX_WITH_DEBUGGER=
   VBOX_WITH_DOCS=
@@ -104,7 +113,16 @@
   VBOX_WITH_HARDENING=
   VBOX_WITH_HEADLESS=
   VBOX_WITH_HGCM=
-@@ -985,9 +951,6 @@
+@@ -979,7 +943,7 @@
+ #
+ # Indicate VBOX_ONLY build if any of the VBOX_ONLY_* variables are set.
+ #
+-VBOX_ONLY_BUILD := $(strip $(foreach x, ADDITIONS DOCS EXTPACKS SDK TESTSUITE\
++VBOX_ONLY_BUILD := $(strip $(foreach x, ADDITIONS DOCS SDK TESTSUITE\
+ 	, $(if-expr defined(VBOX_ONLY_$(x)),VBOX_ONLY_$(x))))
+ if $(words $(VBOX_ONLY_BUILD)) > 1
+  $(error VBox: More than one VBOX_ONLY build enabled! $(VBOX_ONLY_BUILD))
+@@ -997,9 +961,6 @@
  #
  ifdef VBOX_OSE
   VBOX_WITH_VRDP=
@@ -114,7 +132,7 @@
   VBOX_WITH_PCI_PASSTHROUGH_IMPL=
   VBOX_WITH_OS2_ADDITIONS_BIN=
   VBOX_WITH_SECURELABEL=
-@@ -1118,10 +1081,6 @@
+@@ -1130,10 +1091,6 @@
   VBOX_WITH_KCHMVIEWER=
  endif
  
@@ -125,7 +143,7 @@
  #
  # Mark OSE builds clearly, helps figuring out limitations more easily.
  #
-@@ -1744,9 +1703,6 @@
+@@ -1738,9 +1695,6 @@
  # bin2c (convert binary files into C arrays)
  VBOX_BIN2C      ?= $(PATH_OBJ)/bin2c/bin2c$(HOSTSUFF_EXE)
  
@@ -135,7 +153,7 @@
  # VBoxCmp (simple /bin/cmp with more sensible output)
  VBOX_VBOXCMP    ?= $(PATH_OBJ)/VBoxCmp/VBoxCmp$(HOSTSUFF_EXE)
  
-@@ -2638,13 +2594,6 @@
+@@ -2632,13 +2586,6 @@
   SDK_VBOX_OPENSSL2_LIBS = $(NO_SUCH_VARIABLE)
  endif
  
@@ -149,7 +167,7 @@
  SDK_VBOX_BLD_OPENSSL      = .
  SDK_VBOX_BLD_OPENSSL_EXTENDS = VBOX_OPENSSL
  SDK_VBOX_BLD_OPENSSL_LIBS ?= \
-@@ -4100,99 +4049,6 @@
+@@ -4099,99 +4046,6 @@
  TEMPLATE_VBOXMAINCLIENTDLL_LDFLAGS.darwin = $(filter-out -bind_at_load,$(TEMPLATE_VBOXMAINCLIENTEXE_LDFLAGS.darwin))
  
  
@@ -249,6 +267,131 @@
  #
  # Qt 4
  # Qt 4
+--- VirtualBox-4.2.6.orig/configure	2012-12-19 16:24:34.000000000 -0200
++++ VirtualBox-4.2.6/configure		2012-12-27 14:26:25.743442978 -0200
+@@ -90,8 +90,6 @@
+ WITH_HARDENING=1
+ WITH_UDPTUNNEL=1
+ WITH_VDE=0
+-WITH_VNC=0
+-WITH_EXTPACK=1
+ WITH_DOCS=1
+ BUILD_LIBXML2=
+ BUILD_LIBCURL=
+@@ -124,8 +122,6 @@
+ MESA="-lGL"
+ INCZ=""
+ LIBZ="-lz"
+-INCVNCSERVER=""
+-LIBVNCSERVER="-lvncserver"
+ INCDEVMAPPER=""
+ LIBDEVMAPPER="-ldevmapper"
+ CXX_FLAGS=""
+@@ -930,47 +926,6 @@
+ }
+ 
+ #
+-# Check for libvncserver, needed for VNC in OSE
+-#
+-check_vncserver()
+-{
+-  test_header libvncserver
+-  cat > $ODIR.tmp_src.cc <<EOF
+-#include <cstdio>
+-#include <rfb/rfbconfig.h>
+-
+-extern "C" int main()
+-{
+-  const char* v=LIBVNCSERVER_VERSION;
+-  unsigned int major = 0, minor = 0, micro = 0;
+-
+-  for (; *v !='.' && *v != '\0'; v++) major = major*10 + *v-'0';
+-  if (*v == '.') v++;
+-  for (; *v !='.' && *v != '\0'; v++) minor = minor*10 + *v-'0';
+-  if (*v == '.') v++;
+-  for (; *v !='.' && *v != '\0'; v++) micro = micro*10 + *v-'0';
+-
+-  printf("found version %s", LIBVNCSERVER_PACKAGE_VERSION);
+-  if (major*10000 + minor*100 + micro >= 900)
+-  {
+-    printf(", OK.\n");
+-    return 0;
+-  }
+-  else
+-  {
+-    printf(", expected version 0.9 or higher\n");
+-    return 1;
+-  }
+-}
+-EOF
+-  if test_compile "$LIBVNCSERVER $INCVNCSERVER" libvncserver libvncserver; then
+-    if test_execute; then
+-      cnf_append "VBOX_WITH_EXTPACK_VNC" "1"
+-    fi
+-  fi
+-}
+-
+-#
+ # Check for libcurl, needed by S3
+ #
+ check_curl()
+@@ -2173,8 +2128,6 @@
+ [ $WITH_KMODS   -eq 1 ] && echo "  --disable-kmods          don't build Linux kernel modules (host and guest)"
+ [ $WITH_OPENGL  -eq 1 ] && echo "  --disable-opengl         disable OpenGL support (2D & 3D)"
+ [ $WITH_GSOAP   -eq 0 ] && echo "  --enable-webservice      enable the webservice stuff"
+-[ $OSE          -eq 1 ] && echo "  --enable-vnc             enable the VNC server"
+-[ $OSE          -eq 0 ] && echo "  --disable-extpack        don't build the extpack"
+ [ $WITH_DOCS    -eq 1 ] && echo "  --disable-docs           don't build the documentation"
+ [ "$OS" = "linux" -o "$OS" = "freebsd" ] && echo "  --enable-vde             enable VDE networking"
+ cat << EOF
+@@ -2346,15 +2299,9 @@
+     --enable-webservice)
+       [ $WITH_GSOAP -eq 0 ] && WITH_GSOAP=1
+       ;;
+-    --enable-vnc)
+-      WITH_VNC=1
+-      ;;
+     --disable-hardening)
+       WITH_HARDENING=0
+       ;;
+-    --disable-extpack)
+-      WITH_EXTPACK=0
+-      ;;
+     --disable-docs)
+       WITH_DOCS=0
+       ;;
+@@ -2512,15 +2459,6 @@
+   echo >> $CNF
+ fi
+ 
+-# extpack
+-if [ $OSE -eq 0 ]; then
+-  if [ $WITH_EXTPACK -eq 1 ]; then
+-    BUILD_LIBSSL=1
+-  else
+-    cnf_append "VBOX_WITH_EXTPACK_PUEL_BUILD" ""
+-  fi
+-fi
+-
+ # headless
+ if [ -n "$HEADLESS" ]; then
+   cnf_append "VBOX_HEADLESS" "1"
+@@ -2646,15 +2584,6 @@
+   cnf_append "VBOX_WITH_DOCS_PACKING" ""
+ fi
+ 
+-# VNC server support
+-if [ $OSE -ge 1 ]; then
+-  if [ $WITH_VNC = 1 ]; then
+-    check_vncserver
+-  else
+-    cnf_append "VBOX_WITH_EXTPACK_VNC" ""
+-  fi
+-fi
+-
+ # success!
+ echo
+ echo "Successfully generated '$CNF' and '$ENV'."
 --- VirtualBox-4.2.0.orig/Makefile.kmk	2012-08-29 11:13:46.000000000 -0300
 +++ VirtualBox-4.2.0/Makefile.kmk	2012-09-18 23:43:54.750454776 -0300
 @@ -378,7 +378,6 @@