Merge branch 'master' of ssh://gparabola/abslibre

16 files changed, 533 insertions, 113 deletions

diff --git a/libre/abuse-libre/PKGBUILD b/libre/abuse-libre/PKGBUILD
index d8e5d8e4f..829871791 100644
--- a/libre/abuse-libre/PKGBUILD
+++ b/libre/abuse-libre/PKGBUILD
@@ -1,50 +1,40 @@
-# $Id: PKGBUILD 46622 2011-05-10 10:00:25Z lfleischer $
+# $Id$
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: jlvsimoes <jlvsimoes@oninet.pt>
 # Contributor: kevin <kevin@archlinux.org>
+# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
 
+_pkgname=abuse
 pkgname=abuse-libre
 pkgver=0.8
-pkgrel=1
+pkgrel=2
 pkgdesc='A side-scroller action game that pits you against ruthless alien killers. Without unfree "Claudio"'
 arch=('i686' 'x86_64')
 url='http://abuse.zoy.org/'
-license=('GPL' 'custom:PublicDomain')
+license=('GPL' 'custom')
 depends=('gcc-libs' 'libgl' 'sdl' 'sdl_mixer')
 install='abuse.install'
-source=("http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz")
-
-# Remove the unfree 'claudio' addon
-# $ source PKGBUILD
-# $ mksource
-mksource() {
-    pushd /tmp >/dev/null
-
-    wget http://abuse.zoy.org/raw-attachment/wiki/download/${pkgname%-libre}-${pkgver}.tar.gz \
-         -O - | tar xzf -
-
-    rm -rvf ./abuse-$pkgver/data/addon/claudio
-    tar czvf ${pkgname}-${pkgver}.tar.gz ./abuse-$pkgver
-
-    popd >/dev/null
-
-    mv -v /tmp/${pkgname}-${pkgver}.tar.gz .
-}
+source=("http://abuse.zoy.org/raw-attachment/wiki/download/${_pkgname}-${pkgver}.tar.gz"
+        non-claudio.patch)
+md5sums=('ec678b8dc8d00e0382d8c805c6438489'
+         '4808c8be42f551bb3c611629a7833f09')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+
+# Remove the unfree 'claudio' addon
+  rm -rvf ./data/addon/claudio
+  patch -Np1 -i "$srcdir/non-claudio.patch"
 
   ./configure --prefix=/usr --with-assetdir=/usr/share/abuse/orig --with-x
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/${_pkgname}-${pkgver}"
 
   make DESTDIR="${pkgdir}" install
 
   install -d "${pkgdir}/usr/share/licenses/abuse"
   sed -n '1,/^$/p' src/view.cpp > "${pkgdir}/usr/share/licenses/abuse/orig.code.license"
 }
-
-md5sums=('10cac59308bff0dadb8437eff8b4d87e')
diff --git a/libre/abuse-libre/abuse.install b/libre/abuse-libre/abuse.install
index ca888f196..4d28ebacd 100644
--- a/libre/abuse-libre/abuse.install
+++ b/libre/abuse-libre/abuse.install
@@ -11,4 +11,3 @@ post_upgrade() {
 	post_install
 }
 
-
diff --git a/libre/abuse-libre/non-claudio.patch b/libre/abuse-libre/non-claudio.patch
new file mode 100644
index 000000000..2a29e53f0
--- /dev/null
+++ b/libre/abuse-libre/non-claudio.patch
@@ -0,0 +1,122 @@
+--- abuse-0.8/data/Makefile.in	2011-05-09 08:06:35.000000000 -0300
++++ abuse-0.8/data/Makefile.in	2012-04-11 15:03:02.854839102 -0300
+@@ -184,7 +184,6 @@
+ 	addon/aliens/objects.lsp addon/aliens/powerold.lsp \
+ 	addon/aliens/powerups.lsp addon/aliens/sfx.lsp \
+ 	addon/aliens/tiles.lsp addon/bong/bong.lsp \
+-	addon/claudio/claudio.lsp addon/claudio/oldclaud.lsp \
+ 	addon/deathmat/cur_lev.lsp addon/deathmat/deathmat.lsp \
+ 	addon/deathmat/dstartup.lsp addon/deathmat/gamename.lsp \
+ 	addon/deathmat/large.lsp addon/deathmat/levelset.lsp \
+@@ -245,23 +244,6 @@
+ 	art/tints/guns/orange.spe art/tints/guns/redish.spe \
+ 	addon/aliens/aliens.spe addon/aliens/bactiles.spe \
+ 	addon/aliens/fortiles.spe addon/bong/bong.spe \
+-	addon/claudio/antship.spe addon/claudio/bigexp.spe \
+-	addon/claudio/deepw1.spe addon/claudio/deepw2.spe \
+-	addon/claudio/droid.spe addon/claudio/extiles.spe \
+-	addon/claudio/fire.spe addon/claudio/lamp.spe \
+-	addon/claudio/lava2.spe addon/claudio/mypanels.spe \
+-	addon/claudio/nplatfor.spe addon/claudio/pal21.spe \
+-	addon/claudio/pal2.spe addon/claudio/pal5.spe \
+-	addon/claudio/pal81f.spe addon/claudio/pal81.spe \
+-	addon/claudio/pal82f.spe addon/claudio/pal82.spe \
+-	addon/claudio/pal90.spe addon/claudio/rob2.spe \
+-	addon/claudio/skull.spe addon/claudio/spaced.spe \
+-	addon/claudio/spaceh.spe addon/claudio/spacymed.spe \
+-	addon/claudio/spacytdm.spe addon/claudio/sswitch.spe \
+-	addon/claudio/t_lamp.spe addon/claudio/trex1.spe \
+-	addon/claudio/t_skull.spe addon/claudio/t_space.spe \
+-	addon/claudio/t_trex.spe addon/claudio/t_water.spe \
+-	addon/claudio/umbrel3.spe addon/claudio/watem.spe \
+ 	addon/example/example.spe addon/leon/gray.spe \
+ 	addon/leon/level00.spe addon/leon/level01.spe \
+ 	addon/leon/level02.spe addon/leon/lmisc.spe \
+@@ -333,7 +315,6 @@
+ doc = \
+     addon/aliens/aliens.txt \
+     addon/aliens/readme.txt \
+-    addon/claudio/palettes.txt \
+     addon/leon/leon.txt \
+     addon/newart/tiledoc.txt \
+     addon/pong/pong.txt \
+@@ -414,17 +395,6 @@
+ @HAVE_NONFREE_TRUE@	addon/aliens/aslash01.wav \
+ @HAVE_NONFREE_TRUE@	addon/aliens/egghatch.wav \
+ @HAVE_NONFREE_TRUE@	addon/aliens/jarbreak.wav \
+-@HAVE_NONFREE_TRUE@	addon/claudio/aship.wav \
+-@HAVE_NONFREE_TRUE@	addon/claudio/drill.wav \
+-@HAVE_NONFREE_TRUE@	addon/claudio/fire.wav \
+-@HAVE_NONFREE_TRUE@	addon/claudio/glass1.wav \
+-@HAVE_NONFREE_TRUE@	addon/claudio/sewers.wav \
+-@HAVE_NONFREE_TRUE@	addon/claudio/skull.wav \
+-@HAVE_NONFREE_TRUE@	addon/claudio/spaceo.wav \
+-@HAVE_NONFREE_TRUE@	addon/claudio/trex1.wav \
+-@HAVE_NONFREE_TRUE@	addon/claudio/trex2.wav \
+-@HAVE_NONFREE_TRUE@	addon/claudio/unhealth.wav \
+-@HAVE_NONFREE_TRUE@	addon/claudio/wfall.wav \
+ @HAVE_NONFREE_TRUE@	addon/leon/sfx/ambship1.wav \
+ @HAVE_NONFREE_TRUE@	addon/leon/sfx/ambship2.wav \
+ @HAVE_NONFREE_TRUE@	addon/leon/sfx/gren5.wav \
+--- abuse-0.8/data/Makefile.am	2011-05-09 04:58:04.000000000 -0300
++++ abuse-0.8/data/Makefile.am	2012-04-11 15:03:50.282407491 -0300
+@@ -35,7 +35,6 @@
+     \
+     addon/bong/bong.lsp \
+     \
+-    addon/claudio/claudio.lsp addon/claudio/oldclaud.lsp \
+     addon/deathmat/cur_lev.lsp addon/deathmat/deathmat.lsp \
+     addon/deathmat/dstartup.lsp addon/deathmat/gamename.lsp \
+     addon/deathmat/large.lsp addon/deathmat/levelset.lsp \
+@@ -113,21 +112,6 @@
+     \
+     addon/bong/bong.spe \
+     \
+-    addon/claudio/antship.spe addon/claudio/bigexp.spe \
+-    addon/claudio/deepw1.spe addon/claudio/deepw2.spe addon/claudio/droid.spe \
+-    addon/claudio/extiles.spe addon/claudio/fire.spe addon/claudio/lamp.spe \
+-    addon/claudio/lava2.spe addon/claudio/mypanels.spe \
+-    addon/claudio/nplatfor.spe addon/claudio/pal21.spe addon/claudio/pal2.spe \
+-    addon/claudio/pal5.spe addon/claudio/pal81f.spe addon/claudio/pal81.spe \
+-    addon/claudio/pal82f.spe addon/claudio/pal82.spe addon/claudio/pal90.spe \
+-    addon/claudio/rob2.spe addon/claudio/skull.spe addon/claudio/spaced.spe \
+-    addon/claudio/spaceh.spe addon/claudio/spacymed.spe \
+-    addon/claudio/spacytdm.spe addon/claudio/sswitch.spe \
+-    addon/claudio/t_lamp.spe addon/claudio/trex1.spe \
+-    addon/claudio/t_skull.spe addon/claudio/t_space.spe \
+-    addon/claudio/t_trex.spe addon/claudio/t_water.spe \
+-    addon/claudio/umbrel3.spe addon/claudio/watem.spe \
+-    \
+     addon/example/example.spe \
+     \
+     addon/leon/gray.spe addon/leon/level00.spe addon/leon/level01.spe \
+@@ -214,7 +198,6 @@
+ doc = \
+     addon/aliens/aliens.txt \
+     addon/aliens/readme.txt \
+-    addon/claudio/palettes.txt \
+     addon/leon/leon.txt \
+     addon/newart/tiledoc.txt \
+     addon/pong/pong.txt \
+@@ -267,11 +250,6 @@
+     addon/aliens/altaunt.wav addon/aliens/aslash01.wav \
+     addon/aliens/egghatch.wav addon/aliens/jarbreak.wav \
+     \
+-    addon/claudio/aship.wav addon/claudio/drill.wav addon/claudio/fire.wav \
+-    addon/claudio/glass1.wav addon/claudio/sewers.wav addon/claudio/skull.wav \
+-    addon/claudio/spaceo.wav addon/claudio/trex1.wav addon/claudio/trex2.wav \
+-    addon/claudio/unhealth.wav addon/claudio/wfall.wav \
+-    \
+     addon/leon/sfx/ambship1.wav addon/leon/sfx/ambship2.wav \
+     addon/leon/sfx/gren5.wav addon/leon/sfx/gren6.wav \
+     addon/leon/sfx/rain2.wav addon/leon/sfx/rain3.wav \
+--- abuse-0.8/data/abuse.lsp	2011-05-09 04:58:04.000000000 -0300
++++ abuse-0.8/data/abuse.lsp	2012-04-11 15:04:15.637788215 -0300
+@@ -42,7 +42,6 @@
+ (load "addon/twist/f2chars.lsp")
+ (load "addon/twist/f2ai.lsp")
+ (load "addon/aliens/astartup.lsp")
+-(load "addon/claudio/claudio.lsp")
+ (load "addon/twist/lisp/dray.lsp")
+ (load "addon/twist/lisp/mario.lsp")
+ (load "addon/leon/4frabs.lsp")
diff --git a/libre/audacity-libre/.directory b/libre/audacity-libre/.directory
new file mode 100644
index 000000000..a65007814
--- /dev/null
+++ b/libre/audacity-libre/.directory
@@ -0,0 +1,2 @@
+[Dolphin]
+Timestamp=2012,4,10,15,23,50
diff --git a/libre/audacity-libre/PKGBUILD b/libre/audacity-libre/PKGBUILD
index a0c1b154d..6d6f287b3 100644
--- a/libre/audacity-libre/PKGBUILD
+++ b/libre/audacity-libre/PKGBUILD
@@ -1,47 +1,42 @@
-# $Id$
-# Maintainer: Joseph Yaworski <jy@dervormund.info>
+# $Id: PKGBUILD 153455 2012-03-14 17:15:15Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
+# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
 
+_pkgname=audacity
 pkgname=audacity-libre
-pkgver=1.3.13
+pkgver=2.0.0
 pkgrel=1
 pkgdesc="A program that lets you manipulate digital audio waveforms, libre"
 arch=('i686' 'x86_64')
 url="http://audacity.sourceforge.net/"
 license=('GPL')
-depends=('libvorbis' 'libmad' 'libid3tag' 'wxgtk' 'libsamplerate' 'lame' 'hicolor-icon-theme'
-	'shared-mime-info' 'desktop-file-utils' 'redland' 'jack' 'soundtouch')
-makedepends=('zip')
+depends=('libmad' 'libid3tag' 'wxgtk' 'lame-libre' 'hicolor-icon-theme'
+	 'desktop-file-utils' 'jack' 'soundtouch' 'ffmpeg')
 options=('!makeflags')
 install=audacity-libre.install
-source=(http://repo.parabolagnulinux.org/other/${pkgname}-minsrc-${pkgver}-beta.tar.bz2
+source=(http://audacity.googlecode.com/files/${_pkgname}-minsrc-${pkgver}.tar.bz2
 	remove-unfree-nyquist.patch
 	audacity-libre.install)
+sha1sums=('0175474e63c51aaa97df9b45574f7f307f1d3bc8'
+          'cda4587458aecf15c41102f86c3b466f80acd0f3'
+          '59e511af919f62b07dd62bab251c56bef6344d70')
 provides=("audacity=$pkgver")
 replaces=('audacity')
 conflicts=('audacity')
 
-# source PKGBUILD; mksource
-mksource() {
-	wget http://audacity.googlecode.com/files/audacity-minsrc-${pkgver}-beta.tar.bz2 -O - | \
-        tar -jxvf -
+build() {
+  cd "${srcdir}/${_pkgname}-src-${pkgver}"
 
-    pushd audacity-src-${pkgver}-beta/
+# Removing nyquist
         rm -rfv {,lib-src/lib}nyquist
         find -iname '*nyquist*' -print0 | xargs -0 \
             rm -rfv 
         patch -Np0 -i ../remove-unfree-nyquist.patch || return 1
-    popd
-
-	mv audacity-src-${pkgver}-beta/ ${pkgname}-src-${pkgver}-beta/
-	tar -cjf ${pkgname}-minsrc-${pkgver}-beta.tar.bz2 ${pkgname}-src-${pkgver}-beta/
-}
 
-build() {
-  cd "${srcdir}/${pkgname}-src-${pkgver}-beta"
   WX_CONFIG=/usr/bin/wx-config ./configure --prefix=/usr \
     --with-portaudio --with-libsamplerate \
     --without-libresample --with-libmad \
-    --with-id3tag --with-libflac \
+    --with-ffmpeg --with-id3tag --with-libflac \
     --with-vorbis --with-libexpat \
     --with-libsndfile --with-soundtouch \
     --enable-unicode --without-taglib \
@@ -50,9 +45,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-src-${pkgver}-beta"
+  cd "${srcdir}/${_pkgname}-src-${pkgver}"
   make DESTDIR="${pkgdir}" install
 }
-md5sums=('0dca3e9b337ff1357b0580bd6de4e3b1'
-         '7c49dbe048d1f0f1706fd84bbea2fee4'
-         'd1942ad63ff1ef27cae2531ee914d5c8')
diff --git a/libre/libui-sh/PKGBUILD b/libre/libui-sh/PKGBUILD
index 5792f88de..075d8c0a6 100644
--- a/libre/libui-sh/PKGBUILD
+++ b/libre/libui-sh/PKGBUILD
@@ -2,16 +2,16 @@
 # Maintainer: Dieter Plaetinck <dieter@plaetinck.be>
 
 pkgname=libui-sh
-pkgver=2011.08.31
-pkgrel=1
+pkgver=2011.10.09
+pkgrel=2
 pkgdesc="a shell library providing useful UI functions"
 arch=('any')
-url="https://projects.parabolagnulinux.org/libui-sh.git"
+url="http://github.com/Dieterbe/libui-sh/"
 license=('GPL3')
 depends=('bash')
 optdepends=('dialog: for ncurses support')
-source=($url/snapshot/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('79daf01e4cd5b7fb186d1127d3334092')
+source=(ftp://ftp.archlinux.org/other/libui-sh/libui-sh-$pkgver.tar.gz)
+md5sums=('6f855b407d791ab66b78f839835ed915')
 
 build() {
 
@@ -22,3 +22,4 @@ build() {
 }
 
 # vim:set ts=2 sw=2 et:
+
diff --git a/libre/seamonkey-libre/PKGBUILD b/libre/seamonkey-libre/PKGBUILD
index 41cd99b4c..8acde2590 100644
--- a/libre/seamonkey-libre/PKGBUILD
+++ b/libre/seamonkey-libre/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 149871 2012-02-11 11:12:41Z ibiru $
+# $Id: PKGBUILD 153522 2012-03-15 14:43:42Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 _pkgname=seamonkey
 pkgname=seamonkey-libre
-pkgver=2.7.1
+pkgver=2.8
 pkgrel=1
 pkgdesc="SeaMonkey internet suite, with GNUZilla addons"
 arch=('i686' 'x86_64')
@@ -20,12 +20,12 @@ source=(ftp://releases.mozilla.org/pub/mozilla.org/$_pkgname/releases/$pkgver/so
         seamonkey-2.0-lang.patch
         libvpx.patch
         gnuzilla-addons.patch)
-md5sums=('a16764e55ef8e59c469dc44b63459ad6'
+md5sums=('a7128f6bcd16bebed4a7c3487b69c38f'
          'd02b5f002a7cdf8d15dccd2548d09256'
          '6119a2254716752c9d08e366f8d4c048'
          '25b6fe16ac24cd5c852213e5c1adb272'
          '5b2aaff7dfe7f1f94ad965905b20e782'
-         '4347c7be7e48a9987765552f4f6362bc')
+         'f7beeb1f94390957259212dd1dbc171f')
 
 build() {
   cd "$srcdir/comm-release"
diff --git a/libre/seamonkey-libre/gnuzilla-addons.patch b/libre/seamonkey-libre/gnuzilla-addons.patch
index ae95052c5..32a28b3e4 100644
--- a/libre/seamonkey-libre/gnuzilla-addons.patch
+++ b/libre/seamonkey-libre/gnuzilla-addons.patch
@@ -1,11 +1,12 @@
-diff -ru comm-release.orig/suite/browser/browser-prefs.js comm-release/suite/browser/browser-prefs.js
---- comm-release.orig/suite/browser/browser-prefs.js	2012-02-12 21:59:22.006597211 +0100
-+++ comm-release/suite/browser/browser-prefs.js	2012-02-12 22:03:37.727232650 +0100
-@@ -587,10 +587,10 @@
+diff -Naur comm-release.orig/suite/browser/browser-prefs.js comm-release/suite/browser/browser-prefs.js
+--- comm-release.orig/suite/browser/browser-prefs.js	2012-03-13 02:23:17.000000000 -0300
++++ comm-release/suite/browser/browser-prefs.js		2012-04-11 01:57:44.005731215 -0300
+@@ -587,11 +587,10 @@
  // Preferences for AMO integration
  pref("extensions.getAddons.cache.enabled", true);  // also toggles personalized recommendations
  pref("extensions.getAddons.maxResults", 15);
--pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/guid:%IDS%?src=seamonkey&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
+-pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/guid:%IDS%?src=seamonkey&appOS=%OS%&appVersion=%VERSION%");
+-pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/guid:%IDS%?src=seamonkey&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
 -pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/%APP%/search?q=%TERMS%");
 -pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=seamonkey");
 -pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/%APP%/discovery/pane/%VERSION%/%OS%");
@@ -16,7 +17,7 @@ diff -ru comm-release.orig/suite/browser/browser-prefs.js comm-release/suite/bro
  
  // getMoreThemes is used by our UI under our switch theme menu
  pref("extensions.getMoreThemesURL", "chrome://branding/locale/brand.properties");
-@@ -715,7 +715,7 @@
+@@ -716,7 +715,7 @@
  #endif
  
  // plugin finder service url
@@ -25,4 +26,3 @@ diff -ru comm-release.orig/suite/browser/browser-prefs.js comm-release/suite/bro
  pref("plugins.update.url", "http://www.mozilla.com/%LOCALE%/plugincheck/");
  pref("plugins.update.notifyUser", false);
  pref("plugins.hide_infobar_for_outdated_plugin", false);
-Tylko w comm-release/suite/browser: browser-prefs.js~
diff --git a/libre/thunderbird-libre/PKGBUILD b/libre/thunderbird-libre/PKGBUILD
index 21e0f4cec..c27851dcd 100644
--- a/libre/thunderbird-libre/PKGBUILD
+++ b/libre/thunderbird-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 153450 2012-03-14 16:21:51Z ibiru $
+# $Id: PKGBUILD 155759 2012-04-06 07:48:34Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 # Contributor: Dale Blount <dale@archlinux.org>
@@ -7,7 +7,7 @@
 
 pkgname=thunderbird-libre
 pkgver=11.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Standalone Mail/News reader"
 arch=('i686' 'x86_64')
 license=('MPL' 'GPL')
@@ -25,19 +25,25 @@ source=(ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/sourc
         thunderbird-install-dir.patch
         channel-prefs.js
         vendor.js
-        libvpx.patch)
+        libvpx.patch
+        gcc47.patch
+        clrf.patch)
 md5sums=('b500560a006cb10194281263c78841f2'
-         'ca98c2bf1017b33e19dae22fdcef2e73'
+         '41511a6bcdd04cf56706218e4670e631'
          'af3e5b344d2edf1c7d61bb0a5a96de9a'
          'aea906acf72c43dd82ead2fabcc1c6db'
          '476ec205162340fb0679f522c9d31c3b'
          '5a53179d14ae9631b7afe5e4d0fc0b25'
-         '5b2aaff7dfe7f1f94ad965905b20e782')
+         '5b2aaff7dfe7f1f94ad965905b20e782'
+         '07b255039a2ffbcab5b5be7986245e36'
+         '5c8d79a9f1ecadffa818205ce1c23f2f')
 
 build() {
   cd "$srcdir/comm-release"
   patch -Np1 -i "$srcdir/thunderbird-install-dir.patch"
   patch -Np1 -i "$srcdir/libvpx.patch"
+  patch -Np1 -i "$srcdir/gcc47.patch"
+  patch -Np2 -i "$srcdir/clrf.patch"
 
   cp "$srcdir/mozconfig" .mozconfig
 
diff --git a/libre/thunderbird-libre/clrf.patch b/libre/thunderbird-libre/clrf.patch
new file mode 100644
index 000000000..9b6fcb8fb
--- /dev/null
+++ b/libre/thunderbird-libre/clrf.patch
@@ -0,0 +1,265 @@
+diff -up thunderbird-11.0/comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp.733867 thunderbird-11.0/comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp
+--- thunderbird-11.0/comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp.733867	2012-03-13 03:37:12.000000000 +0100
++++ thunderbird-11.0/comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp	2012-03-16 07:20:29.299342799 +0100
+@@ -688,7 +688,7 @@ nsresult nsMsgSearchAdapter::EncodeImapV
+     PL_strcat(encoding, "{");
+     lengthStr.AppendInt((PRInt32) strlen(value));
+     PL_strcat(encoding, lengthStr.get());
+-    PL_strcat(encoding, "}"CRLF);
++    PL_strcat(encoding, "}" CRLF);
+     PL_strcat(encoding, value);
+     return NS_OK;
+   }
+diff -up thunderbird-11.0/comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp.733867 thunderbird-11.0/comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp
+--- thunderbird-11.0/comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp.733867	2012-03-13 03:37:13.000000000 +0100
++++ thunderbird-11.0/comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp	2012-03-16 07:20:29.300342735 +0100
+@@ -753,7 +753,7 @@ nsFolderCompactState::OnDataAvailable(ns
+           }
+         }
+       }
+-#define EXTRA_KEYWORD_HDR "                                                                                 "MSG_LINEBREAK
++#define EXTRA_KEYWORD_HDR "                                                                                 " MSG_LINEBREAK
+ 
+        // if status offset isn't in the first block, this code won't work. There's no good reason
+       // for the status offset not to be at the beginning of the message anyway.
+@@ -1203,7 +1203,7 @@ nsOfflineStoreCompactState::OnDataAvaila
+         // check if there's an envelope header; if not, write one.
+         if (strncmp(m_dataBuffer, "From ", 5))
+         {
+-          m_fileStream->Write("From "CRLF, 7, &bytesWritten);
++          m_fileStream->Write("From " CRLF, 7, &bytesWritten);
+           m_offlineMsgSize += bytesWritten;
+         }
+       }
+diff -up thunderbird-11.0/comm-release/mailnews/compose/src/nsSmtpProtocol.cpp.733867 thunderbird-11.0/comm-release/mailnews/compose/src/nsSmtpProtocol.cpp
+--- thunderbird-11.0/comm-release/mailnews/compose/src/nsSmtpProtocol.cpp.733867	2012-03-13 03:37:13.000000000 +0100
++++ thunderbird-11.0/comm-release/mailnews/compose/src/nsSmtpProtocol.cpp	2012-03-16 07:23:01.225877457 +0100
+@@ -1722,7 +1722,7 @@ PRInt32 nsSmtpProtocol::SendQuit()
+ {
+   m_sendDone = PR_TRUE;
+   nsCOMPtr<nsIURI> url = do_QueryInterface(m_runningURL);
+-  SendData(url, "QUIT"CRLF); // send a quit command to close the connection with the server.
++  SendData(url, "QUIT" CRLF); // send a quit command to close the connection with the server.
+   m_nextState = SMTP_RESPONSE;
+   m_nextStateAfterResponse = SMTP_DONE;
+   return(0);
+@@ -1969,7 +1969,7 @@ nsresult nsSmtpProtocol::LoadUrl(nsIURI 
+     {
+       nsCOMPtr<nsIURI> url = do_QueryInterface(m_runningURL);
+       // send a quit command to close the connection with the server.
+-      if (SendData(url, "QUIT"CRLF) == NS_OK)
++      if (SendData(url, "QUIT" CRLF) == NS_OK)
+       {
+         m_nextState = SMTP_RESPONSE;
+         m_nextStateAfterResponse = SMTP_ERROR_DONE;
+@@ -2118,4 +2118,3 @@ nsSmtpProtocol::GetUsernamePassword(nsAC
+     NS_ENSURE_SUCCESS(rv,rv);
+     return rv;
+ }
+-
+diff -up thunderbird-11.0/comm-release/mailnews/imap/src/nsImapMailFolder.cpp.733867 thunderbird-11.0/comm-release/mailnews/imap/src/nsImapMailFolder.cpp
+--- thunderbird-11.0/comm-release/mailnews/imap/src/nsImapMailFolder.cpp.733867	2012-03-13 03:37:13.000000000 +0100
++++ thunderbird-11.0/comm-release/mailnews/imap/src/nsImapMailFolder.cpp	2012-03-16 07:20:29.309342162 +0100
+@@ -8298,7 +8298,7 @@ nsImapMailFolder::CopyFileToOfflineStore
+           bool needMoreData = false;
+           char * newLine = nsnull;
+           PRUint32 numBytesInLine = 0;
+-          const char *envelope = "From "CRLF;
++          const char *envelope = "From " CRLF;
+           offlineStore->Write(envelope, strlen(envelope), &bytesWritten);
+           fileSize += bytesWritten;
+           do
+diff -up thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp.733867 thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp
+--- thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp.733867	2012-03-13 03:37:13.000000000 +0100
++++ thunderbird-11.0/comm-release/mailnews/imap/src/nsImapProtocol.cpp	2012-03-16 07:20:29.314341844 +0100
+@@ -1410,7 +1410,7 @@ void nsImapProtocol::HandleIdleResponses
+ {
+   // PRInt32 oldRecent = GetServerStateParser().NumberOfRecentMessages();
+   nsCAutoString commandBuffer(GetServerCommandTag());
+-  commandBuffer.Append(" IDLE"CRLF);
++  commandBuffer.Append(" IDLE" CRLF);
+ 
+   do
+   {
+@@ -3290,7 +3290,7 @@ void nsImapProtocol::FetchMsgAttribute(c
+     commandString.Append(messageIds);
+     commandString.Append(" (");
+     commandString.Append(attribute);
+-    commandString.Append(")"CRLF);
++    commandString.Append(")" CRLF);
+     nsresult rv = SendData(commandString.get());
+ 
+     if (NS_SUCCEEDED(rv))
+@@ -5283,7 +5283,7 @@ nsImapProtocol::Expunge()
+ 
+   IncrementCommandTagNumber();
+   nsCAutoString command(GetServerCommandTag());
+-  command.Append(" expunge"CRLF);
++  command.Append(" expunge" CRLF);
+ 
+   nsresult rv = SendData(command.get());
+   if (NS_SUCCEEDED(rv))
+@@ -5359,7 +5359,7 @@ void nsImapProtocol::ID()
+   command.Append(gAppName);
+   command.Append("\" \"version\" \"");
+   command.Append(gAppVersion);
+-  command.Append("\")"CRLF);
++  command.Append("\")" CRLF);
+ 
+   nsresult rv = SendData(command.get());
+   if (NS_SUCCEEDED(rv))
+@@ -5816,7 +5816,7 @@ nsresult nsImapProtocol::AuthLogin(const
+     nsCAutoString correctedPassword;
+     EscapeUserNamePasswordString(password.get(), &correctedPassword);
+     command.Append(correctedPassword);
+-    command.Append("\""CRLF);
++    command.Append("\"" CRLF);
+     rv = SendData(command.get(), PR_TRUE /* suppress logging */);
+     NS_ENSURE_SUCCESS(rv, rv);
+     ParseIMAPandCheckForNewMail();
+@@ -7446,7 +7446,7 @@ void nsImapProtocol::CreateMailbox(const
+   nsCString command(GetServerCommandTag());
+   command += " create \"";
+   command += escapedName;
+-  command += "\""CRLF;
++  command += "\"" CRLF;
+ 
+   nsresult rv = SendData(command.get());
+   if(NS_SUCCEEDED(rv))
+@@ -7549,7 +7549,7 @@ void nsImapProtocol::Lsub(const char *ma
+   nsCString command (GetServerCommandTag());
+   command += " lsub \"\" \"";
+   command += escapedPattern;
+-  command += "\""CRLF;
++  command += "\"" CRLF;
+ 
+   PR_Free(boxnameWithOnlineDirectory);
+ 
+@@ -7578,7 +7578,7 @@ void nsImapProtocol::List(const char *ma
+   command += useXLIST ?
+     " xlist \"\" \"" : " list \"\" \"";
+   command += escapedPattern;
+-  command += "\""CRLF;
++  command += "\"" CRLF;
+ 
+   PR_Free(boxnameWithOnlineDirectory);
+ 
+@@ -7599,7 +7599,7 @@ void nsImapProtocol::Subscribe(const cha
+   nsCString command (GetServerCommandTag());
+   command += " subscribe \"";
+   command += escapedName;
+-  command += "\""CRLF;
++  command += "\"" CRLF;
+ 
+   nsresult rv = SendData(command.get());
+   if (NS_SUCCEEDED(rv))
+@@ -7617,7 +7617,7 @@ void nsImapProtocol::Unsubscribe(const c
+   nsCString command (GetServerCommandTag());
+   command += " unsubscribe \"";
+   command += escapedName;
+-  command += "\""CRLF;
++  command += "\"" CRLF;
+ 
+   nsresult rv = SendData(command.get());
+   if (NS_SUCCEEDED(rv))
+@@ -7631,7 +7631,7 @@ void nsImapProtocol::Idle()
+   if (m_urlInProgress)
+     return;
+   nsCAutoString command (GetServerCommandTag());
+-  command += " IDLE"CRLF;
++  command += " IDLE" CRLF;
+   nsresult rv = SendData(command.get());
+   if (NS_SUCCEEDED(rv))
+   {
+@@ -7658,7 +7658,7 @@ void nsImapProtocol::EndIdle(bool waitFo
+   nsCOMPtr <nsIAsyncInputStream> asyncInputStream = do_QueryInterface(m_inputStream);
+   if (asyncInputStream)
+     asyncInputStream->AsyncWait(nsnull, 0, 0, nsnull);
+-  nsresult rv = SendData("DONE"CRLF);
++  nsresult rv = SendData("DONE" CRLF);
+   // set a short timeout if we don't want to wait for a response
+   if (m_transport && !waitForResponse)
+     m_transport->SetTimeout(nsISocketTransport::TIMEOUT_READ_WRITE, 5);
+@@ -7727,8 +7727,8 @@ void nsImapProtocol::Copy(const char * m
+   PRUint32 msgsHandled = 0;
+   const char *formatString;
+   formatString = (idsAreUid)
+-      ? "%s uid store %s %s"CRLF
+-      : "%s store %s %s"CRLF;
++      ? "%s uid store %s %s" CRLF
++      : "%s store %s %s" CRLF;
+ 
+   do
+   {
+diff -up thunderbird-11.0/comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp.733867 thunderbird-11.0/comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp
+--- thunderbird-11.0/comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp.733867	2012-03-13 03:37:13.000000000 +0100
++++ thunderbird-11.0/comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp	2012-03-16 07:20:29.316341717 +0100
+@@ -185,7 +185,7 @@ void nsImapServerResponseParser::ParseIM
+   
+   NS_ASSERTION(aCurrentCommand && *aCurrentCommand != '\r' && 
+     *aCurrentCommand != '\n' && *aCurrentCommand != ' ', "Invailid command string");
+-  bool sendingIdleDone = !strcmp(aCurrentCommand, "DONE"CRLF);
++  bool sendingIdleDone = !strcmp(aCurrentCommand, "DONE" CRLF);
+   if (sendingIdleDone)
+     fWaitingForMoreClientInput = PR_FALSE;
+ 
+diff -up thunderbird-11.0/comm-release/mailnews/local/src/nsPop3Protocol.cpp.733867 thunderbird-11.0/comm-release/mailnews/local/src/nsPop3Protocol.cpp
+--- thunderbird-11.0/comm-release/mailnews/local/src/nsPop3Protocol.cpp.733867	2012-03-13 03:37:13.000000000 +0100
++++ thunderbird-11.0/comm-release/mailnews/local/src/nsPop3Protocol.cpp	2012-03-16 07:23:38.980300990 +0100
+@@ -2483,7 +2483,7 @@ PRInt32 nsPop3Protocol::SendList()
+         return(MK_OUT_OF_MEMORY);
+     m_pop3ConData->next_state_after_response = POP3_GET_LIST;
+     m_listpos = 0;
+-    return SendData(m_url, "LIST"CRLF);
++    return SendData(m_url, "LIST" CRLF);
+ }
+ 
+ 
+diff -up thunderbird-11.0/comm-release/mailnews/mime/src/mimedrft.cpp.733867 thunderbird-11.0/comm-release/mailnews/mime/src/mimedrft.cpp
+--- thunderbird-11.0/comm-release/mailnews/mime/src/mimedrft.cpp.733867	2012-03-13 03:37:13.000000000 +0100
++++ thunderbird-11.0/comm-release/mailnews/mime/src/mimedrft.cpp	2012-03-16 07:20:29.320341461 +0100
+@@ -1473,7 +1473,7 @@ mime_parse_stream_complete (nsMIMESessio
+                 *newbody = 0;
+                 PL_strcatn(newbody, newbodylen, "<PRE>");
+                 PL_strcatn(newbody, newbodylen, body);
+-                PL_strcatn(newbody, newbodylen, "</PRE>"CRLF);
++                PL_strcatn(newbody, newbodylen, "</PRE>" CRLF);
+                 PR_Free(body);
+                 body = newbody;
+               }
+diff -up thunderbird-11.0/comm-release/mailnews/mime/src/mimemult.cpp.733867 thunderbird-11.0/comm-release/mailnews/mime/src/mimemult.cpp
+--- thunderbird-11.0/comm-release/mailnews/mime/src/mimemult.cpp.733867	2012-03-13 03:37:13.000000000 +0100
++++ thunderbird-11.0/comm-release/mailnews/mime/src/mimemult.cpp	2012-03-16 07:20:29.321341397 +0100
+@@ -280,7 +280,7 @@ MimeMultipart_parse_line (const char *li
+             MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK));
+             MimeWriteAString(obj, NS_LITERAL_CSTRING("Content-Disposition: attachment; filename=\""));
+             MimeWriteAString(obj, fileName);
+-            MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK));
++            MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK));
+             MimeWriteAString(obj, NS_LITERAL_CSTRING("X-Mozilla-External-Attachment-URL: "));
+             MimeWriteAString(obj, obj->options->state->detachedFilePath);
+             MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK));
+@@ -293,10 +293,10 @@ MimeMultipart_parse_line (const char *li
+             status = MimeWriteAString(obj, header);
+             if (status < 0) 
+               return status;
+-            status = MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK"Content-Transfer-Encoding: 8bit"MSG_LINEBREAK));
++            status = MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK "Content-Transfer-Encoding: 8bit" MSG_LINEBREAK));
+             MimeWriteAString(obj, NS_LITERAL_CSTRING("Content-Disposition: inline; filename=\"Deleted: "));
+             MimeWriteAString(obj, fileName);
+-            MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK"X-Mozilla-Altered: AttachmentDeleted; date=\""));
++            MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK "X-Mozilla-Altered: AttachmentDeleted; date=\""));
+           }
+           nsCString result;
+           char timeBuffer[128];
+@@ -306,8 +306,8 @@ MimeMultipart_parse_line (const char *li
+                                  "%a %b %d %H:%M:%S %Y",
+                                  &now);
+           MimeWriteAString(obj, nsDependentCString(timeBuffer));
+-          MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK));
+-          MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK"You deleted an attachment from this message. The original MIME headers for the attachment were:"MSG_LINEBREAK));
++          MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK));
++          MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK "You deleted an attachment from this message. The original MIME headers for the attachment were:" MSG_LINEBREAK));
+           MimeHeaders_write_raw_headers(mult->hdrs, obj->options, PR_FALSE);
+         }
+         PRInt32 old_nchildren = container->nchildren;
diff --git a/libre/thunderbird-libre/gcc47.patch b/libre/thunderbird-libre/gcc47.patch
new file mode 100644
index 000000000..3e1e9b98a
--- /dev/null
+++ b/libre/thunderbird-libre/gcc47.patch
@@ -0,0 +1,63 @@
+diff -Nur comm-release.orig/mozilla/ipc/chromium/src/base/file_util.cc comm-release/mozilla/ipc/chromium/src/base/file_util.cc
+--- comm-release.orig/mozilla/ipc/chromium/src/base/file_util.cc	2012-04-03 18:38:11.474783536 +0000
++++ comm-release/mozilla/ipc/chromium/src/base/file_util.cc	2012-04-03 18:43:29.218995578 +0000
+@@ -8,7 +8,7 @@
+ #include <io.h>
+ #endif
+ #include <stdio.h>
+-#if defined(ANDROID)
++#if defined(ANDROID) || defined(OS_POSIX)
+ #include <unistd.h>
+ #endif
+ 
+diff -Nur comm-release.orig/mozilla/ipc/chromium/src/base/file_util_linux.cc comm-release/mozilla/ipc/chromium/src/base/file_util_linux.cc
+--- comm-release.orig/mozilla/ipc/chromium/src/base/file_util_linux.cc	2012-04-03 18:38:11.381450924 +0000
++++ comm-release/mozilla/ipc/chromium/src/base/file_util_linux.cc	2012-04-03 18:43:29.218995578 +0000
+@@ -5,6 +5,9 @@
+ #include "base/file_util.h"
+ 
+ #include <fcntl.h>
++#if defined(ANDROID) || defined(OS_POSIX)
++#include <unistd.h>
++#endif
+ 
+ #include <string>
+ #include <vector>
+diff -Nur comm-release.orig/mozilla/ipc/chromium/src/base/message_pump_libevent.cc comm-release/mozilla/ipc/chromium/src/base/message_pump_libevent.cc
+--- comm-release.orig/mozilla/ipc/chromium/src/base/message_pump_libevent.cc	2012-04-03 18:38:11.438117153 +0000
++++ comm-release/mozilla/ipc/chromium/src/base/message_pump_libevent.cc	2012-04-03 18:43:29.218995578 +0000
+@@ -6,6 +6,9 @@
+ 
+ #include <errno.h>
+ #include <fcntl.h>
++#if defined(ANDROID) || defined(OS_POSIX)
++#include <unistd.h>
++#endif
+ 
+ #include "eintr_wrapper.h"
+ #include "base/logging.h"
+diff -Nur comm-release.orig/mozilla/ipc/chromium/src/base/time_posix.cc comm-release/mozilla/ipc/chromium/src/base/time_posix.cc
+--- comm-release.orig/mozilla/ipc/chromium/src/base/time_posix.cc	2012-04-03 18:38:11.418117308 +0000
++++ comm-release/mozilla/ipc/chromium/src/base/time_posix.cc	2012-04-03 18:43:29.218995578 +0000
+@@ -14,6 +14,8 @@
+ #include <time.h>
+ #endif
+ 
++#include <unistd.h>
++
+ #include <limits>
+ 
+ #include "base/basictypes.h"
+diff -Nur comm-release.orig/mozilla/toolkit/crashreporter/client/Makefile.in comm-release/mozilla/toolkit/crashreporter/client/Makefile.in
+--- comm-release.orig/mozilla/toolkit/crashreporter/client/Makefile.in	2012-04-03 18:38:56.101105510 +0000
++++ comm-release/mozilla/toolkit/crashreporter/client/Makefile.in	2012-04-03 18:43:29.218995578 +0000
+@@ -69,6 +69,9 @@
+   $(STDCXX_COMPAT) \
+   $(NULL)
+ 
++# Needed for moz_free
++LIBS += -L$(LIBXUL_DIST)/lib -lmozalloc
++
+ ifeq ($(OS_ARCH),WINNT)
+ CPPSRCS += crashreporter_win.cpp
+ LIBS += \
diff --git a/libre/thunderbird-libre/mozconfig b/libre/thunderbird-libre/mozconfig
index 85ed8a648..8950db703 100644
--- a/libre/thunderbird-libre/mozconfig
+++ b/libre/thunderbird-libre/mozconfig
@@ -16,7 +16,7 @@ ac_add_options --with-system-libvpx
 ac_add_options --enable-system-hunspell
 ac_add_options --enable-system-sqlite
 ac_add_options --enable-system-ffi
-ac_add_options --enable-system-cairo
+#ac_add_options --enable-system-cairo
 ac_add_options --enable-system-pixman
 ac_add_options --with-pthreads
 
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index 9384e9c1e..82bf28b8b 100644
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 63763 2012-02-05 12:13:00Z ibiru $
+# $Id$
 # Maintainer (Parabola): Nicolas Reynolds <fauno@kiwwwi.com.ar>
 # Maintainer (Parabola): Jorge López <jorginho@adinet.com.uy>
 # Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
@@ -11,8 +11,8 @@
 #Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgbase=virtualbox-libre
 pkgname=('virtualbox-libre' 'virtualbox-parabola-additions' 'virtualbox-sdk' 'virtualbox-source')
-pkgver=4.1.10
-pkgrel=1.1
+pkgver=4.1.12
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL' 'custom')
@@ -21,22 +21,10 @@ makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libxcursor
 #'xorg-server-devel' 'xf86driproto' 'libxcomposite')
 [[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc')
 source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2
-        10-vboxdrv.rules  vboxdrv-reference.patch gsoap.patch LocalConfig.kmk vboxbuild
+        10-vboxdrv.rules  vboxdrv-reference.patch LocalConfig.kmk vboxbuild
         change_default_driver_dir.patch vbox-service.conf vbox-service.rc
         vboxweb.conf vboxweb.rc)
 
-md5sums=('263e495ef3a7ab75943af28d446ee702'
-         '5f85710e0b8606de967716ded7b2d351'
-         '755ab0dd9bcacf2c00d2275b1ca69547'
-         'b9f4da759d23b60b69b12005213c3aa7'
-         'a1ff1d1b4423556887e48a32978226a6'
-         '3c96faa76894c182c1bb56bb30d9a17e'
-         '97e193f050574dd272a38e5ee5ebe62b'
-         '3c08ad30b89add47d3f45121200a5360'
-         '208cf5f842eb2e3a5b6dcfc59080d26c'
-         '3ac185709bfe688bb753c46e170d0546'
-         'c159d683ba1947290fc2ad2c64194150')
-
 _extramodules=extramodules-3.3-LIBRE
 _kernver="$(cat /lib/modules/${_extramodules}/version)"
 
@@ -45,7 +33,6 @@ build() {
 
     patch -Np1 -i "$srcdir/vboxdrv-reference.patch"
     patch -Np1 -i "$srcdir/change_default_driver_dir.patch"
-    patch -Np0 -i "$srcdir//gsoap.patch"
 
     cp "$srcdir/LocalConfig.kmk" .
 
@@ -66,7 +53,8 @@ package_virtualbox-libre() {
     optdepends=('qt: for VirtualBox GUI'
                 'vde2: Virtual Distributed Ethernet support'
                 'virtualbox-sdk: developer kit'
-                'virtualbox-source: host kernel source modules for non-stock kernels')
+                'virtualbox-source: host kernel source modules for non-stock kernels'
+                'net-tools: for host-only or bridged networking')
 
     backup=('etc/vbox/vbox.cfg')
     replaces=('virtualbox' 'virtualbox-ose')
@@ -206,4 +194,13 @@ package_virtualbox-parabola-additions(){
     # install sample config
     install -D -m644 "$srcdir/vbox-service.conf" "$pkgdir/etc/conf.d/vbox-service"
 }
-
+md5sums=('4e385d2333e1a4832e5618b982fddee5'
+         '5f85710e0b8606de967716ded7b2d351'
+         '755ab0dd9bcacf2c00d2275b1ca69547'
+         'a1ff1d1b4423556887e48a32978226a6'
+         '3c96faa76894c182c1bb56bb30d9a17e'
+         '97e193f050574dd272a38e5ee5ebe62b'
+         '3c08ad30b89add47d3f45121200a5360'
+         '208cf5f842eb2e3a5b6dcfc59080d26c'
+         '3ac185709bfe688bb753c46e170d0546'
+         'c159d683ba1947290fc2ad2c64194150')
diff --git a/libre/virtualbox-libre/virtualbox.install b/libre/virtualbox-libre/virtualbox.install
index 6c9baa21e..29646e973 100644
--- a/libre/virtualbox-libre/virtualbox.install
+++ b/libre/virtualbox-libre/virtualbox.install
@@ -20,7 +20,7 @@ post_install() {
 post_upgrade() {
     getent group vboxusers >> /dev/null || usr/sbin/groupadd -g 108 vboxusers
     utils
-    if [ "$(vercmp $2 4.1.10-1)" -lt 0 ]; then
+    if [ "$(vercmp $2 4.1.6-1)" -lt 0 ]; then
 /bin/cat << EOF
 ===> Starting with virtualbox version 4.1.6-1, kernel modules handling is done by virtualbox-modules.
 ===> Use virtualbox-source package if you don't use our stock linux-libre package.
diff --git a/libre/virtualbox-modules/PKGBUILD b/libre/virtualbox-modules/PKGBUILD
index cd27b74a8..60a903615 100644
--- a/libre/virtualbox-modules/PKGBUILD
+++ b/libre/virtualbox-modules/PKGBUILD
@@ -5,19 +5,19 @@
 
 pkgbase=virtualbox-modules
 pkgname=('virtualbox-modules' 'virtualbox-parabola-modules')
-pkgver=4.1.10
-pkgrel=2.1
+pkgver=4.1.12
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
+makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libpng' 'libidl2' 'xalan-c' 'sdl' 'linux-libre-headers')
 replaces=('virtualbox-modules')
 conflicts=('virtualbox-modules')
 provides=("virtualbox-modules=$pkgver")
-makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libpng' 'libidl2' 'xalan-c' 'sdl' 'linux-libre-headers')
 [[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc')
 source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2
          LocalConfig.kmk 60-vboxguest.rules)
-md5sums=('263e495ef3a7ab75943af28d446ee702'
+md5sums=('4e385d2333e1a4832e5618b982fddee5'
          '4c88bd122677a35f68abd76eb01b378b'
          'ed1341881437455d9735875ddf455fbe')
 
diff --git a/libre/virtualbox-modules/virtualbox-libre-modules.install b/libre/virtualbox-modules/virtualbox-libre-modules.install
deleted file mode 100644
index b542db1ca..000000000
--- a/libre/virtualbox-modules/virtualbox-libre-modules.install
+++ /dev/null
@@ -1,17 +0,0 @@
-post_install() {
-cat << EOF
-===> You may want to load vboxguest, vboxsf and vboxvideo
-EOF
-    EXTRAMODULES='extramodules-3.2-LIBRE'
-    depmod $(cat /lib/modules/$EXTRAMODULES/version)
-}
-
-post_upgrade() {
-    EXTRAMODULES='extramodules-3.2-LIBRE'
-    depmod $(cat /lib/modules/$EXTRAMODULES/version)
-}
-
-post_remove() {
-    EXTRAMODULES='extramodules-3.2-LIBRE'
-    depmod $(cat /lib/modules/$EXTRAMODULES/version)
-}