From 4adad75f6e7fbd6cb2540713561cd9f72d249c35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 <emulatorman@lavabit.com>
Date: Fri, 12 Apr 2013 17:00:24 -0300
Subject: ice{cat,weasel-libre}: Rebuild with GCC 4.7.2 and PGO re-enabled for
 i686 => https://bugs.archlinux.org/task/34738

---
 libre/icecat/PKGBUILD          | 30 +++++++++++-------------------
 libre/iceweasel-libre/PKGBUILD | 30 +++++++++++-------------------
 2 files changed, 22 insertions(+), 38 deletions(-)

diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index b589cbae5..d32a96d52 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -97,12 +97,10 @@ prepare() {
   # WebRTC build tries to execute "python" and expects Python 2
   ln -s /usr/bin/python2 "$srcdir/path/python"
 
-  # Use gold, as Mozilla can use some of its features, such as safe ICF
-  ln -s /usr/bin/ld.gold "$srcdir/path/ld"
-
   # configure script misdetects the preprocessor without an optimization level
   # https://bugs.archlinux.org/task/34644
-  sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure
+  # TODO: re-enable when we're building with GCC >= 4.8 again
+  #sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure
 }
 
 build() {
@@ -115,21 +113,15 @@ build() {
   unset MAKEFLAGS
 
   if $_pgo; then
-    # Enable PGO for x86_64 and mips64el only. i686 currently has problems:
-    # Either segfaults since gcc 4.8, or the linker runs out of memory
-    # If you discover that PGO again works on i686, please file a bug
-    if [[ $CARCH != i686 ]]; then
-       export DISPLAY=:99
-       Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY &
-       _fail=0
-
-       make -f client.mk build MOZ_PGO=1 || _fail=1
-
-       kill $! || true
-       return $_fail
-    else
-       make -f client.mk build
-    fi
+    # Enable PGO
+    export DISPLAY=:99
+    Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY &
+    _fail=0
+
+    make -f client.mk build MOZ_PGO=1 || _fail=1
+
+    kill $! || true
+    return $_fail
   else
     make -f client.mk build
   fi
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 7a8d85ff0..03dd71fba 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -140,12 +140,10 @@ prepare() {
   # WebRTC build tries to execute "python" and expects Python 2
   ln -s /usr/bin/python2 "$srcdir/path/python"
 
-  # Use gold, as Mozilla can use some of its features, such as safe ICF
-  ln -s /usr/bin/ld.gold "$srcdir/path/ld"
-
   # configure script misdetects the preprocessor without an optimization level
   # https://bugs.archlinux.org/task/34644
-  sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure
+  # TODO: re-enable when we're building with GCC >= 4.8 again
+  #sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure
 }
 
 build() {
@@ -158,21 +156,15 @@ build() {
   unset MAKEFLAGS
 
   if $_pgo; then
-    # Enable PGO for x86_64 and mips64el only. i686 currently has problems:
-    # Either segfaults since gcc 4.8, or the linker runs out of memory
-    # If you discover that PGO again works on i686, please file a bug
-    if [[ $CARCH != i686 ]]; then
-       export DISPLAY=:99
-       Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY &
-       _fail=0
-
-       make -f client.mk build MOZ_PGO=1 || _fail=1
-
-       kill $! || true
-       return $_fail
-    else
-       make -f client.mk build
-    fi
+    # Enable PGO
+    export DISPLAY=:99
+    Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY &
+    _fail=0
+
+    make -f client.mk build MOZ_PGO=1 || _fail=1
+
+    kill $! || true
+    return $_fail
   else
     make -f client.mk build
   fi
-- 
cgit v1.2.3-2-g168b


From 79de81517da758d557ce8bb5d51202c0d93cd10d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 <emulatorman@lavabit.com>
Date: Fri, 12 Apr 2013 17:18:14 -0300
Subject: cups-filters-libre-1.0.34-2: updating version

---
 libre/cups-filters-libre/PKGBUILD | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/libre/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD
index 70118c9e2..789a3fdd9 100644
--- a/libre/cups-filters-libre/PKGBUILD
+++ b/libre/cups-filters-libre/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 182034 2013-04-05 19:01:42Z andyrtr $
+# $Id: PKGBUILD 182682 2013-04-12 14:56:52Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=cups-filters-libre
 _pkgname=cups-filters
-pkgver=1.0.33
-pkgrel=1
+pkgver=1.0.34
+pkgrel=2
 pkgdesc="OpenPrinting CUPS Filters, without foomatic-db-nonfree recommendation"
 arch=('i686' 'x86_64')
 url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting"
 license=('GPL')
-depends=('lcms2' 'poppler>=0.22.2' 'qpdf>=4.0.0')
+depends=('lcms2' 'poppler>=0.22.3' 'qpdf>=4.0.0')
 makedepends=('ghostscript' 'ttf-dejavu') # ttf-dejavu for make check
 optdepends=('ghostscript: for non-PostScript printers to print with CUPS to convert PostScript to raster images'
 	    'foomatic-db: drivers use Ghostscript to convert PostScript to a printable form directly'
@@ -19,7 +19,7 @@ backup=(etc/fonts/conf.d/99pdftoopvp.conf
 options=(!libtool)
 source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar.gz
         cups-browsed.service)
-md5sums=('e35e497cbdb61ee29d9e7ffa58317c23'
+md5sums=('fea9cad6bbb14ab0635243ed5d1d5c77'
          '4c9f97eae201798000483c4e7109e690')
 replaces=("${_pkgname}")
 conflicts=("${_pkgname}")
-- 
cgit v1.2.3-2-g168b


From 94a189fe87f79027d4572db3f933f49b7fb2042e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 <emulatorman@lavabit.com>
Date: Fri, 12 Apr 2013 17:22:50 -0300
Subject: hplip-libre-3.13.4-1: updating version

---
 libre/hplip-libre/PKGBUILD       | 21 +++++++++++++--------
 libre/hplip-libre/hp-mkuri.patch | 11 +++++++++++
 2 files changed, 24 insertions(+), 8 deletions(-)
 create mode 100644 libre/hplip-libre/hp-mkuri.patch

diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD
index 30a1b6f05..21ab61b28 100644
--- a/libre/hplip-libre/PKGBUILD
+++ b/libre/hplip-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 180013 2013-03-14 18:45:58Z andyrtr $
+# $Id: PKGBUILD 182674 2013-04-12 14:26:14Z andyrtr $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor : Rémy Oudompheng <remy@archlinux.org>
 # Contributor: Morgan LEFIEUX <comete@archlinuxfr.org>
@@ -6,9 +6,9 @@
 
 _pkgname=hplip
 pkgname=hplip-libre
-pkgver=3.13.3
-pkgrel=2
-pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet (without hplip-plugin binary blobs recommendation)"
+pkgver=3.13.4
+pkgrel=1
+pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet, without hplip-plugin binary blobs recommendation"
 arch=('i686' 'x86_64')
 url="http://hplipopensource.com"
 license=('GPL')
@@ -30,10 +30,12 @@ provides=$_pkgname=$pkgver
 options=('!libtool')
 install=hplip.install
 source=(http://downloads.sourceforge.net/${_pkgname}/$_pkgname-$pkgver.tar.gz{,.asc}
-        cups-1.6-buildfix.diff)
-md5sums=('4a378cc08f7a4f131968c0966c1ceb8c'
-         'f37ad6d95a36d7547a2c60374fc4d1ec'
-         'ef64578c6cb3ce252dbdcb0f1c2f4a47')
+        cups-1.6-buildfix.diff
+        hp-mkuri.patch)
+md5sums=('e5c247161e2fd7685e0520e968393d19'
+         'SKIP'
+         'ef64578c6cb3ce252dbdcb0f1c2f4a47'
+         '0bd7779fdbc4d7a9386df04dce2cb8d4')
 
 build() {
  cd "$srcdir/$_pkgname-$pkgver"
@@ -41,6 +43,9 @@ build() {
  # fix build with cups 1.6 - FC hplip-ipp-accessors.patch
  patch -p1 -i "${srcdir}/cups-1.6-buildfix.diff"
  
+ # fix linking libnotify, FS#34283
+ patch -Np0 -i ${srcdir}/hp-mkuri.patch
+ 
  export PYTHON=python2
  
  find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} +
diff --git a/libre/hplip-libre/hp-mkuri.patch b/libre/hplip-libre/hp-mkuri.patch
new file mode 100644
index 000000000..518e7608f
--- /dev/null
+++ b/libre/hplip-libre/hp-mkuri.patch
@@ -0,0 +1,11 @@
+--- io/hpmud/hp-mkuri.c.orig	2013-03-17 09:15:15.360624061 -0400
++++ io/hpmud/hp-mkuri.c	2013-03-17 09:15:30.924316847 -0400
+@@ -266,7 +266,7 @@
+ 
+     /* Bypass glib build dependencies by loading libnotify manually. */  
+ 
+-    if ((handle = load_library("libnotify.so.1")) == NULL)
++    if ((handle = load_library("libnotify.so.4")) == NULL)
+     {
+        BUG("failed to open libnotify: %m\n");
+        goto bugout;
-- 
cgit v1.2.3-2-g168b


From 1979a033a577a1d264dd45a435d5f52688b27b17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 <emulatorman@lavabit.com>
Date: Sat, 13 Apr 2013 01:39:42 -0300
Subject: virtualbox-libre-4.2.12-1: updating version

---
 libre/virtualbox-libre/003-gcc-48.patch      |  39 +++++
 libre/virtualbox-libre/004-system-xorg.patch | 245 +++++++++++++++++++++++++++
 libre/virtualbox-libre/18-system-xorg.patch  | 245 ---------------------------
 libre/virtualbox-libre/PKGBUILD              |  27 +--
 libre/virtualbox-libre/free-distros.patch    |  91 +++++-----
 5 files changed, 352 insertions(+), 295 deletions(-)
 create mode 100644 libre/virtualbox-libre/003-gcc-48.patch
 create mode 100644 libre/virtualbox-libre/004-system-xorg.patch
 delete mode 100644 libre/virtualbox-libre/18-system-xorg.patch

diff --git a/libre/virtualbox-libre/003-gcc-48.patch b/libre/virtualbox-libre/003-gcc-48.patch
new file mode 100644
index 000000000..3039ea2c6
--- /dev/null
+++ b/libre/virtualbox-libre/003-gcc-48.patch
@@ -0,0 +1,39 @@
+Index: configure
+===================================================================
+--- a/configure	(revision 45449)
++++ a/configure	(revision 45450)
+@@ -416,7 +416,7 @@
+       elif [ $cc_maj -lt 3 \
+              -o \( $cc_maj -eq 3 -a $cc_min -lt 2 \) \
+              -o \( $cc_maj -eq 4 -a $cc_min -lt 1 -a "$OS" != "darwin" \) \
+-             -o \( $cc_maj -eq 4 -a $cc_min -gt 7 \) \
++             -o \( $cc_maj -eq 4 -a $cc_min -gt 8 \) \
+              -o $cc_maj -gt 4 ]; then
+         log_failure "gcc version $cc_ver found, expected gcc 3.x with x>1 or gcc 4.x with 0<x<8"
+         fail really
+Index: Config.kmk
+===================================================================
+--- a/Config.kmk	(revision 45449)
++++ a/Config.kmk	(revision 45450)
+@@ -1503,7 +1503,7 @@
+ #
+ # Compiler optimization flags.
+ #
+-VBOX_GCC_WARN     ?= -Wall $(VBOX_GCC_Wextra) $(VBOX_GCC_Wno-missing-field-initializers) -Wno-unused -Wno-trigraphs $(VBOX_GCC_fdiagnostics-show-option)
++VBOX_GCC_WARN     ?= -Wall $(VBOX_GCC_Wextra) $(VBOX_GCC_Wno-missing-field-initializers) -Wno-unused -Wno-trigraphs $(VBOX_GCC_fdiagnostics-show-option) $(VBOX_GCC_no-unused-parameter)
+ VBOX_GCC_WARN_PEDANTIC = -Wshadow $(VBOX_GCC_WARN) -Wno-long-long
+ ifdef VBOX_WITH_MASOCHISTIC_WARNINGS
+  VBOX_GCC_WARN_PEDANTIC += -Wunused-variable -Wunused-function -Wunused-label -Wunused-parameter
+@@ -2285,6 +2285,12 @@
+ 	$(QUIET)$(APPEND) '$@' ' endif'
+ 	$(QUIET)$(APPEND) '$@' 'endif'
+ endif
++# Prevent warnings about unused parameters as of gcc-4.8 as this warning is now very verbose
++	$(QUIET)$(APPEND) '$@' 'ifneq ($$(VBOX_GCC_VERSION_CXX),)'
++	$(QUIET)$(APPEND) '$@' ' ifneq ($$(int-ge $$(VBOX_GCC_VERSION_CXX),40800),)'
++	$(QUIET)$(APPEND) '$@' '  VBOX_GCC_no-unused-parameter ?= -Wno-unused-parameter'
++	$(QUIET)$(APPEND) '$@' ' endif'
++	$(QUIET)$(APPEND) '$@' 'endif'
+ ifeq ($(KBUILD_TARGET),solaris)
+ 	$(QUIET)$(APPEND) '$@' 'VBOX_GCC_msave-args            ?= $(call VBOX_GCC_CHECK_CXX,-msave-args,)'
+ # Detect the solaris assembler. It is used by the the 4.x gcc compilers,
diff --git a/libre/virtualbox-libre/004-system-xorg.patch b/libre/virtualbox-libre/004-system-xorg.patch
new file mode 100644
index 000000000..c527f7f20
--- /dev/null
+++ b/libre/virtualbox-libre/004-system-xorg.patch
@@ -0,0 +1,245 @@
+diff -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/common/crOpenGL/Makefile.kmk VirtualBox-4.2.10/src/VBox/Additions/common/crOpenGL/Makefile.kmk
+--- VirtualBox-4.2.10.orig/src/VBox/Additions/common/crOpenGL/Makefile.kmk	2013-03-19 18:55:28.774951223 +0000
++++ VirtualBox-4.2.10/src/VBox/Additions/common/crOpenGL/Makefile.kmk	2013-03-19 18:58:06.337193736 +0000
+@@ -63,18 +63,12 @@
+ VBoxOGL_INCS           = .
+ if1of ($(KBUILD_TARGET), linux solaris freebsd)
+  VBoxOGL_INCS     += \
+-	$(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \
+-	$(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \
+-	$(VBOX_PATH_X11_ROOT)/libXext-1.3.1 \
+-	$(VBOX_PATH_X11_ROOT)/libXfixes-4.0.3 \
+-	$(VBOX_PATH_X11_ROOT)/damageproto-1.1.0 \
+-	$(VBOX_PATH_X11_ROOT)/compositeproto-0.4 \
+-	$(VBOX_PATH_X11_ROOT)/fixesproto-4.0 \
+-	$(VBOX_PATH_X11_ROOT)/libx11-1.1.5-other \
+-	$(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
+-	$(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \
++	/usr/include/x11 \
++	/usr/include/xorg \
++	/usr/include/pixman-1 \
+ 	$(VBOX_MESA_INCS) \
+-	$(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.13
++	/usr/include/drm \
++	/usr/include/libdrm
+  VBoxOGL_DEFS     += VBOX_NO_NATIVEGL
+ endif
+ 
+diff -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk VirtualBox-4.2.10/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
+--- VirtualBox-4.2.10.orig/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk	2013-03-19 18:55:28.778284533 +0000
++++ VirtualBox-4.2.10/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk	2013-03-19 18:56:00.468064457 +0000
+@@ -40,8 +40,8 @@
+ 	VBoxGuestR3LibShared
+ ifndef VBOX_ONLY_TESTSUITE
+  if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd)
+-  LIBRARIES += \
+-  	VBoxGuestR3LibXFree86
++#  LIBRARIES += \
++#  	VBoxGuestR3LibXFree86
+  endif
+ endif
+ LIBRARIES.win.amd64 += VBoxGuestR3Lib-x86 VBoxGuestR3LibShared-x86
+diff -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/x11/Makefile.kmk VirtualBox-4.2.10/src/VBox/Additions/x11/Makefile.kmk
+--- VirtualBox-4.2.10.orig/src/VBox/Additions/x11/Makefile.kmk	2013-03-19 18:55:28.974949837 +0000
++++ VirtualBox-4.2.10/src/VBox/Additions/x11/Makefile.kmk	2013-03-19 18:56:00.468064457 +0000
+@@ -17,6 +17,10 @@
+ SUB_DEPTH = ../../../..
+ include $(KBUILD_PATH)/subheader.kmk
+ 
++ifn1of ($(XSERVER_VERSION), 13 14 15 16 17 18 19 110 111)
++ XSERVER_VERSION := 17
++endif
++
+ # Include sub-makefiles.
+ if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
+  include $(PATH_SUB_CURRENT)/VBoxClient/Makefile.kmk
+diff -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/x11/vboxmouse/Makefile.kmk VirtualBox-4.2.10/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
+--- VirtualBox-4.2.10.orig/src/VBox/Additions/x11/vboxmouse/Makefile.kmk	2013-03-19 18:55:28.818284256 +0000
++++ VirtualBox-4.2.10/src/VBox/Additions/x11/vboxmouse/Makefile.kmk	2013-03-19 18:56:00.468064457 +0000
+@@ -29,7 +29,6 @@
+ # vboxmouse_drv
+ #
+ if1of ($(KBUILD_TARGET), linux)
+- SYSMODS += vboxmouse_drv
+  vboxmouse_drv_TEMPLATE = VBOXGUESTR3XF86MOD
+  vboxmouse_drv_DEFS.linux = linux
+  vboxmouse_drv_DEFS.x86 += __i386__
+@@ -69,7 +68,6 @@
+ #
+ # vboxmouse_drv_70
+ #
+-DLLS += vboxmouse_drv_70
+ vboxmouse_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxmouse_drv_70_DEFS = \
+ 	XFree86Server IN_MODULE XFree86Module XFree86LOADER XINPUT XORG_7X IN_XF86_MODULE DONT_DEFINE_WRAPPERS NO_ANSIC
+@@ -85,7 +83,6 @@
+ #
+ # vboxmouse_drv_71
+ #
+-DLLS += vboxmouse_drv_71
+ vboxmouse_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxmouse_drv_71_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
+ vboxmouse_drv_71_INCS := \
+@@ -100,7 +97,6 @@
+ #
+ # vboxmouse_drv_13
+ #
+-DLLS += vboxmouse_drv_13
+ vboxmouse_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxmouse_drv_13_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
+ vboxmouse_drv_13_INCS := \
+@@ -114,7 +110,6 @@
+ #
+ # vboxmouse_drv_14
+ #
+-DLLS += vboxmouse_drv_14
+ vboxmouse_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxmouse_drv_14_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
+ vboxmouse_drv_14_INCS := \
+@@ -128,7 +123,6 @@
+ #
+ # vboxmouse_drv_15
+ #
+-DLLS += vboxmouse_drv_15
+ vboxmouse_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxmouse_drv_15_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
+ vboxmouse_drv_15_INCS := \
+@@ -142,7 +136,6 @@
+ #
+ # vboxmouse_drv_16
+ #
+-DLLS += vboxmouse_drv_16
+ vboxmouse_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxmouse_drv_16_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
+ vboxmouse_drv_16_INCS := \
+diff -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk VirtualBox-4.2.10/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
+--- VirtualBox-4.2.10.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk	2013-03-19 18:55:28.974949837 +0000
++++ VirtualBox-4.2.10/src/VBox/Additions/x11/vboxvideo/Makefile.kmk	2013-03-19 18:56:00.468064457 +0000
+@@ -53,7 +53,6 @@
+ # vboxvideo_drv
+ #
+ if1of ($(KBUILD_TARGET), linux)
+- SYSMODS += vboxvideo_drv
+ endif   # target linux
+ vboxvideo_drv_TEMPLATE = VBOXGUESTR3XF86MOD
+ vboxvideo_drv_DEFS.linux = linux
+@@ -128,7 +127,6 @@
+ #         base keywords instead of using .solaris or .linux.
+ #         Also it is *important* to use := and not = when deriving a property.
+ #
+-DLLS += vboxvideo_drv_70
+ vboxvideo_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
+ if1of ($(KBUILD_TARGET), linux)
+  vboxvideo_drv_70_CFLAGS += \
+@@ -149,7 +147,6 @@
+ #
+ # vboxvideo_drv_71
+ #
+-DLLS += vboxvideo_drv_71
+ vboxvideo_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxvideo_drv_71_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
+ vboxvideo_drv_71_DEFS := $(vboxvideo_70_DEFS) XORG_VERSION_CURRENT=700100000
+@@ -164,7 +161,6 @@
+ #
+ # vboxvideo_drv_13
+ #
+-DLLS += vboxvideo_drv_13
+ vboxvideo_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxvideo_drv_13_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
+ vboxvideo_drv_13_DEFS := $(vboxvideo_13_DEFS) XORG_VERSION_CURRENT=100300000
+@@ -178,7 +174,6 @@
+ #
+ # vboxvideo_drv_14
+ #
+-DLLS += vboxvideo_drv_14
+ vboxvideo_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxvideo_drv_14_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
+ vboxvideo_drv_14_DEFS := $(vboxvideo_13_DEFS) XORG_VERSION_CURRENT=100400000
+@@ -192,7 +187,6 @@
+ #
+ # vboxvideo_drv_15
+ #
+-DLLS += vboxvideo_drv_15
+ vboxvideo_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxvideo_drv_15_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
+ vboxvideo_drv_15_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100503000
+@@ -213,7 +207,6 @@
+ #
+ # vboxvideo_drv_16
+ #
+-DLLS += vboxvideo_drv_16
+ vboxvideo_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxvideo_drv_16_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
+ vboxvideo_drv_16_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100600000
+@@ -227,7 +220,6 @@
+ #
+ # vboxvideo_drv_17
+ #
+-DLLS += vboxvideo_drv_17
+ vboxvideo_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxvideo_drv_17_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
+ vboxvideo_drv_17_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100699000
+@@ -241,7 +233,6 @@
+ #
+ # vboxvideo_drv_18
+ #
+-DLLS += vboxvideo_drv_18
+ vboxvideo_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxvideo_drv_18_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
+ vboxvideo_drv_18_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100800000
+@@ -255,7 +246,6 @@
+ #
+ # vboxvideo_drv_19
+ #
+-DLLS += vboxvideo_drv_19
+ vboxvideo_drv_19_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxvideo_drv_19_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
+ vboxvideo_drv_19_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100900000
+@@ -269,7 +259,6 @@
+ #
+ # vboxvideo_drv_110
+ #
+-DLLS += vboxvideo_drv_110
+ vboxvideo_drv_110_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxvideo_drv_110_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
+ vboxvideo_drv_110_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101000000
+@@ -283,7 +272,6 @@
+ #
+ # vboxvideo_drv_111
+ #
+-DLLS += vboxvideo_drv_111
+ vboxvideo_drv_111_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxvideo_drv_111_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
+ vboxvideo_drv_111_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101100000
+@@ -297,7 +285,6 @@
+ #
+ # vboxvideo_drv_112
+ #
+-DLLS += vboxvideo_drv_112
+ vboxvideo_drv_112_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxvideo_drv_112_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
+ vboxvideo_drv_112_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101200000
+@@ -341,6 +328,23 @@
+ endif
+ 
+ 
++vboxvideo_drv_$(XSERVER_VERSION)_NAME := vboxvideo_drv
++vboxvideo_drv_$(XSERVER_VERSION)_INCS := \
++	/usr/include/xorg \
++	/usr/include/x11 \
++	/usr/include/pixman-1 \
++	/usr/include/X11/dri \
++	/usr/include/drm \
++	/usr/include/libdrm
++vboxvideo_drv_$(XSERVER_VERSION)_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
++DLLS += vboxvideo_drv_$(XSERVER_VERSION)
++
++# required for lenny backports
++ifeq ($(XSERVER_VERSION),14)
++	vboxvideo_drv_$(XSERVER_VERSION)_INCS += $(VBOX_PATH_X11_XORG_1_4)/xorg
++endif
++
++
+ # Check the undefined symbols in the X.Org modules against lists of allowed
+ # symbols.  Not very elegant, but it will catch problems early.
+ 
diff --git a/libre/virtualbox-libre/18-system-xorg.patch b/libre/virtualbox-libre/18-system-xorg.patch
deleted file mode 100644
index c527f7f20..000000000
--- a/libre/virtualbox-libre/18-system-xorg.patch
+++ /dev/null
@@ -1,245 +0,0 @@
-diff -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/common/crOpenGL/Makefile.kmk VirtualBox-4.2.10/src/VBox/Additions/common/crOpenGL/Makefile.kmk
---- VirtualBox-4.2.10.orig/src/VBox/Additions/common/crOpenGL/Makefile.kmk	2013-03-19 18:55:28.774951223 +0000
-+++ VirtualBox-4.2.10/src/VBox/Additions/common/crOpenGL/Makefile.kmk	2013-03-19 18:58:06.337193736 +0000
-@@ -63,18 +63,12 @@
- VBoxOGL_INCS           = .
- if1of ($(KBUILD_TARGET), linux solaris freebsd)
-  VBoxOGL_INCS     += \
--	$(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \
--	$(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \
--	$(VBOX_PATH_X11_ROOT)/libXext-1.3.1 \
--	$(VBOX_PATH_X11_ROOT)/libXfixes-4.0.3 \
--	$(VBOX_PATH_X11_ROOT)/damageproto-1.1.0 \
--	$(VBOX_PATH_X11_ROOT)/compositeproto-0.4 \
--	$(VBOX_PATH_X11_ROOT)/fixesproto-4.0 \
--	$(VBOX_PATH_X11_ROOT)/libx11-1.1.5-other \
--	$(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
--	$(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \
-+	/usr/include/x11 \
-+	/usr/include/xorg \
-+	/usr/include/pixman-1 \
- 	$(VBOX_MESA_INCS) \
--	$(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.13
-+	/usr/include/drm \
-+	/usr/include/libdrm
-  VBoxOGL_DEFS     += VBOX_NO_NATIVEGL
- endif
- 
-diff -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk VirtualBox-4.2.10/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
---- VirtualBox-4.2.10.orig/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk	2013-03-19 18:55:28.778284533 +0000
-+++ VirtualBox-4.2.10/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk	2013-03-19 18:56:00.468064457 +0000
-@@ -40,8 +40,8 @@
- 	VBoxGuestR3LibShared
- ifndef VBOX_ONLY_TESTSUITE
-  if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd)
--  LIBRARIES += \
--  	VBoxGuestR3LibXFree86
-+#  LIBRARIES += \
-+#  	VBoxGuestR3LibXFree86
-  endif
- endif
- LIBRARIES.win.amd64 += VBoxGuestR3Lib-x86 VBoxGuestR3LibShared-x86
-diff -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/x11/Makefile.kmk VirtualBox-4.2.10/src/VBox/Additions/x11/Makefile.kmk
---- VirtualBox-4.2.10.orig/src/VBox/Additions/x11/Makefile.kmk	2013-03-19 18:55:28.974949837 +0000
-+++ VirtualBox-4.2.10/src/VBox/Additions/x11/Makefile.kmk	2013-03-19 18:56:00.468064457 +0000
-@@ -17,6 +17,10 @@
- SUB_DEPTH = ../../../..
- include $(KBUILD_PATH)/subheader.kmk
- 
-+ifn1of ($(XSERVER_VERSION), 13 14 15 16 17 18 19 110 111)
-+ XSERVER_VERSION := 17
-+endif
-+
- # Include sub-makefiles.
- if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
-  include $(PATH_SUB_CURRENT)/VBoxClient/Makefile.kmk
-diff -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/x11/vboxmouse/Makefile.kmk VirtualBox-4.2.10/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
---- VirtualBox-4.2.10.orig/src/VBox/Additions/x11/vboxmouse/Makefile.kmk	2013-03-19 18:55:28.818284256 +0000
-+++ VirtualBox-4.2.10/src/VBox/Additions/x11/vboxmouse/Makefile.kmk	2013-03-19 18:56:00.468064457 +0000
-@@ -29,7 +29,6 @@
- # vboxmouse_drv
- #
- if1of ($(KBUILD_TARGET), linux)
-- SYSMODS += vboxmouse_drv
-  vboxmouse_drv_TEMPLATE = VBOXGUESTR3XF86MOD
-  vboxmouse_drv_DEFS.linux = linux
-  vboxmouse_drv_DEFS.x86 += __i386__
-@@ -69,7 +68,6 @@
- #
- # vboxmouse_drv_70
- #
--DLLS += vboxmouse_drv_70
- vboxmouse_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxmouse_drv_70_DEFS = \
- 	XFree86Server IN_MODULE XFree86Module XFree86LOADER XINPUT XORG_7X IN_XF86_MODULE DONT_DEFINE_WRAPPERS NO_ANSIC
-@@ -85,7 +83,6 @@
- #
- # vboxmouse_drv_71
- #
--DLLS += vboxmouse_drv_71
- vboxmouse_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxmouse_drv_71_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
- vboxmouse_drv_71_INCS := \
-@@ -100,7 +97,6 @@
- #
- # vboxmouse_drv_13
- #
--DLLS += vboxmouse_drv_13
- vboxmouse_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxmouse_drv_13_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
- vboxmouse_drv_13_INCS := \
-@@ -114,7 +110,6 @@
- #
- # vboxmouse_drv_14
- #
--DLLS += vboxmouse_drv_14
- vboxmouse_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxmouse_drv_14_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
- vboxmouse_drv_14_INCS := \
-@@ -128,7 +123,6 @@
- #
- # vboxmouse_drv_15
- #
--DLLS += vboxmouse_drv_15
- vboxmouse_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxmouse_drv_15_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
- vboxmouse_drv_15_INCS := \
-@@ -142,7 +136,6 @@
- #
- # vboxmouse_drv_16
- #
--DLLS += vboxmouse_drv_16
- vboxmouse_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxmouse_drv_16_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
- vboxmouse_drv_16_INCS := \
-diff -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk VirtualBox-4.2.10/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
---- VirtualBox-4.2.10.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk	2013-03-19 18:55:28.974949837 +0000
-+++ VirtualBox-4.2.10/src/VBox/Additions/x11/vboxvideo/Makefile.kmk	2013-03-19 18:56:00.468064457 +0000
-@@ -53,7 +53,6 @@
- # vboxvideo_drv
- #
- if1of ($(KBUILD_TARGET), linux)
-- SYSMODS += vboxvideo_drv
- endif   # target linux
- vboxvideo_drv_TEMPLATE = VBOXGUESTR3XF86MOD
- vboxvideo_drv_DEFS.linux = linux
-@@ -128,7 +127,6 @@
- #         base keywords instead of using .solaris or .linux.
- #         Also it is *important* to use := and not = when deriving a property.
- #
--DLLS += vboxvideo_drv_70
- vboxvideo_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
- if1of ($(KBUILD_TARGET), linux)
-  vboxvideo_drv_70_CFLAGS += \
-@@ -149,7 +147,6 @@
- #
- # vboxvideo_drv_71
- #
--DLLS += vboxvideo_drv_71
- vboxvideo_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_71_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_71_DEFS := $(vboxvideo_70_DEFS) XORG_VERSION_CURRENT=700100000
-@@ -164,7 +161,6 @@
- #
- # vboxvideo_drv_13
- #
--DLLS += vboxvideo_drv_13
- vboxvideo_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_13_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_13_DEFS := $(vboxvideo_13_DEFS) XORG_VERSION_CURRENT=100300000
-@@ -178,7 +174,6 @@
- #
- # vboxvideo_drv_14
- #
--DLLS += vboxvideo_drv_14
- vboxvideo_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_14_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_14_DEFS := $(vboxvideo_13_DEFS) XORG_VERSION_CURRENT=100400000
-@@ -192,7 +187,6 @@
- #
- # vboxvideo_drv_15
- #
--DLLS += vboxvideo_drv_15
- vboxvideo_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_15_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_15_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100503000
-@@ -213,7 +207,6 @@
- #
- # vboxvideo_drv_16
- #
--DLLS += vboxvideo_drv_16
- vboxvideo_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_16_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_16_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100600000
-@@ -227,7 +220,6 @@
- #
- # vboxvideo_drv_17
- #
--DLLS += vboxvideo_drv_17
- vboxvideo_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_17_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_17_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100699000
-@@ -241,7 +233,6 @@
- #
- # vboxvideo_drv_18
- #
--DLLS += vboxvideo_drv_18
- vboxvideo_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_18_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_18_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100800000
-@@ -255,7 +246,6 @@
- #
- # vboxvideo_drv_19
- #
--DLLS += vboxvideo_drv_19
- vboxvideo_drv_19_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_19_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_19_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100900000
-@@ -269,7 +259,6 @@
- #
- # vboxvideo_drv_110
- #
--DLLS += vboxvideo_drv_110
- vboxvideo_drv_110_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_110_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_110_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101000000
-@@ -283,7 +272,6 @@
- #
- # vboxvideo_drv_111
- #
--DLLS += vboxvideo_drv_111
- vboxvideo_drv_111_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_111_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_111_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101100000
-@@ -297,7 +285,6 @@
- #
- # vboxvideo_drv_112
- #
--DLLS += vboxvideo_drv_112
- vboxvideo_drv_112_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_112_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_112_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101200000
-@@ -341,6 +328,23 @@
- endif
- 
- 
-+vboxvideo_drv_$(XSERVER_VERSION)_NAME := vboxvideo_drv
-+vboxvideo_drv_$(XSERVER_VERSION)_INCS := \
-+	/usr/include/xorg \
-+	/usr/include/x11 \
-+	/usr/include/pixman-1 \
-+	/usr/include/X11/dri \
-+	/usr/include/drm \
-+	/usr/include/libdrm
-+vboxvideo_drv_$(XSERVER_VERSION)_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
-+DLLS += vboxvideo_drv_$(XSERVER_VERSION)
-+
-+# required for lenny backports
-+ifeq ($(XSERVER_VERSION),14)
-+	vboxvideo_drv_$(XSERVER_VERSION)_INCS += $(VBOX_PATH_X11_XORG_1_4)/xorg
-+endif
-+
-+
- # Check the undefined symbols in the X.Org modules against lists of allowed
- # symbols.  Not very elegant, but it will catch problems early.
- 
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index 3619c0c1b..42a7f8b15 100644
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -12,8 +12,8 @@ pkgname=('virtualbox-libre'
          'virtualbox-libre-guest-dkms'
          'virtualbox-libre-sdk'
          'virtualbox-libre-guest-utils')
-pkgver=4.2.10
-pkgrel=2
+pkgver=4.2.12
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL' 'custom')
@@ -22,12 +22,15 @@ makedepends=('alsa-lib'
              'cdrkit'
              'curl'
              'dev86'
-             'gsoap=2.8.11-1'
+             'device-mapper'
+             'glu'
+             'gsoap'
              'iasl'
              'jdk7-openjdk'
              'libidl2'
              'libpulse'
              'libstdc++5'
+             'libxcomposite'
              'libxcursor'
              'libxinerama'
              'libxml2'
@@ -37,13 +40,14 @@ makedepends=('alsa-lib'
              'libxtst'
              'linux-libre-headers'
              'mesa'
-             'glu'
              'python2'
              'qt4'
              'sdl'
              'sdl_ttf'
              'vde2'
-             'xalan-c' 'xorg-server-devel' 'xf86driproto' 'libxcomposite')
+             'xalan-c'
+             'xf86driproto'
+             'xorg-server-devel')
 [[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc')
 source=("http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.tar.bz2"
         '10-vboxdrv.rules'
@@ -53,7 +57,8 @@ source=("http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.ta
         'vboxweb.service'
         '001-vboxdrv-reference.patch'
         '002-change_default_driver_dir.patch'
-        '18-system-xorg.patch'
+        '003-gcc-48.patch'
+        '004-system-xorg.patch'
         'os_blag_64.png'
         'os_blag.png'
         'os_dragora_64.png'
@@ -82,6 +87,7 @@ md5sums=('99349df34caacdecbb7cf3908631c3f3'
          'bc9efed88e0469cd7fc460d5a5cd7b4b'
          'f4e4c7895ede9c524109589bf16ae660'
          '97e193f050574dd272a38e5ee5ebe62b'
+         '7cf8611ae5850b86323b690e430eeed7'
          '4da461f8c90caa123b47c62479f426b4'
          '8538dba8686d7449cb481c9bae9d722a'
          '545c925b46f2ac95e5f8ae407fad101a'
@@ -102,11 +108,10 @@ md5sums=('99349df34caacdecbb7cf3908631c3f3'
          '4da8eeb2ece7e475fc7a0d1003da26c6'
          '5e4187af59726d71c5be48d0cd816c34'
          '05d166104a66ee479896c941ac27a3d0'
-         '78168f8699aa01a632603f0d5b1b8281')
+         '50387fba578646a9d29de3f917a199d2')
 
-build() {
+prepare() {
     cd "VirtualBox-$pkgver"
-
     # Apply patches
     for _p in "$srcdir"/*.patch; do
         [[ -e $_p ]] || continue
@@ -133,9 +138,11 @@ build() {
     for i in {dynebolic,venenux,{gnu,parabola,gnewsense,blag,dragora,ututo,musix,trisquel}{,_64}}; do
       cp -v "$srcdir/os_${i}.png" "./src/VBox/Frontends/VirtualBox/images"
     done
+}
 
+build() {
+    cd "VirtualBox-$pkgver"
     cp "$srcdir/LocalConfig.kmk" .
-
     # fake makeself binary to compile without nofatal
     ln -s /bin/echo makeself
     export PATH="$CWD:$PATH"
diff --git a/libre/virtualbox-libre/free-distros.patch b/libre/virtualbox-libre/free-distros.patch
index 91d15e380..913fe7039 100644
--- a/libre/virtualbox-libre/free-distros.patch
+++ b/libre/virtualbox-libre/free-distros.patch
@@ -1,8 +1,8 @@
 diff --git a/src/VBox/Main/src-all/Global.cpp b/src/VBox/Main/src-all/Global.cpp
-index 6ae0372..df65e60 100644
+index 8c6ab79..1e048d9 100644
 --- a/src/VBox/Main/src-all/Global.cpp
 +++ b/src/VBox/Main/src-all/Global.cpp
-@@ -33,289 +33,365 @@ const Global::OSType Global::sOSTypes[] =
+@@ -33,285 +33,361 @@ const Global::OSType Global::sOSTypes[] =
        VBOXOSTYPE_Unknown,         VBOXOSHINT_NONE,
          64,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
@@ -188,10 +188,6 @@ index 6ae0372..df65e60 100644
 +      VBOXOSTYPE_Dynebolic,         VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
 +       256,   4,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
 +        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Free Distros", "Free GNU/Linux Distros",       "Venenux",            "Venenux",
-+      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",
        VBOXOSTYPE_ArchLinux,       VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
         256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
@@ -304,6 +300,10 @@ index 6ae0372..df65e60 100644
 -    { "Linux",   "Linux",             "Linux",              "Other Linux",
 -      VBOXOSTYPE_Linux,           VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
 -       256,  12,  8 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++    { "Non-free Distros",   "Non-free GNU/Linux Distros",       "Venenux",            "Venenux",
++      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 OSs", "Non-free Operating Systems", "Windows31",          "Windows 3.1",
 +      VBOXOSTYPE_Win31,           VBOXOSHINT_FLOPPY,
 +        32,   4,  1 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
@@ -410,102 +410,106 @@ index 6ae0372..df65e60 100644
        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",               "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",               "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",               "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",               "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",               "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",               "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",          "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",          "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",          "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",          "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",          "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",          "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",          "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",             "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",             "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",             "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",
-       VBOXOSTYPE_QNX,             VBOXOSHINT_HWVIRTEX,
++    { "Non-free OSs", "Non-free Operating Systems",             "QNX",                "QNX",
+ #ifdef VBOX_WITH_RAW_RING1
+       VBOXOSTYPE_QNX,             VBOXOSHINT_NONE,
+ #else
+@@ -319,7 +395,7 @@ const Global::OSType Global::sOSTypes[] =
+ #endif
         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",             "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  },
 diff --git a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
-index c5a4cfe..7d2b363 100644
+index b335043..59ee885 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
+@@ -44,46 +44,32 @@ struct osTypePattern
  
  static const osTypePattern gs_OSTypePattern[] =
  {
@@ -573,22 +577,21 @@ index c5a4cfe..7d2b363 100644
 +    { QRegExp("Tri.*64", Qt::CaseInsensitive), "Trisquel_64" },
 +    { QRegExp("Tri", Qt::CaseInsensitive), "Trisquel" },
 +    { QRegExp("Dyn", Qt::CaseInsensitive), "Dynebolic" },
-+    { QRegExp("Ven", Qt::CaseInsensitive), "Venenux" },
 +
 +    /* Code names for non-free GNU/Linux distributions: */
-     { 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" },
-@@ -91,7 +78,7 @@ static const osTypePattern gs_OSTypePattern[] =
-     { 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" },
+     { QRegExp("((edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)|(quantal)).*64", Qt::CaseInsensitive), "Ubuntu_64" },
+     { QRegExp("(edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)|(quantal)", Qt::CaseInsensitive), "Ubuntu" },
+     { QRegExp("((sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(jessie)|(sid)).*64", Qt::CaseInsensitive), "Debian_64" },
+@@ -91,7 +77,7 @@ static const osTypePattern gs_OSTypePattern[] =
+     { QRegExp("((moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)|(beefy)|(spherical)).*64", Qt::CaseInsensitive), "Fedora_64" },
+     { QRegExp("(moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)|(beefy)|(spherical)", Qt::CaseInsensitive), "Fedora" },
  
 -    /* Regular names of Linux distributions: */
 +    /* Regular names of non-free GNU/Linux distributions: */
      { QRegExp("Arc.*64", Qt::CaseInsensitive), "ArchLinux_64" },
      { QRegExp("Arc", Qt::CaseInsensitive), "ArchLinux" },
      { QRegExp("Deb.*64", Qt::CaseInsensitive), "Debian_64" },
-@@ -116,15 +103,51 @@ static const osTypePattern gs_OSTypePattern[] =
+@@ -116,15 +102,52 @@ static const osTypePattern gs_OSTypePattern[] =
      { QRegExp("(Or)|(oel)", Qt::CaseInsensitive), "Oracle" },
      { QRegExp("Knoppix", Qt::CaseInsensitive), "Linux26" },
      { QRegExp("Dsl", Qt::CaseInsensitive), "Linux24" },
@@ -599,8 +602,10 @@ index c5a4cfe..7d2b363 100644
 -    { QRegExp("(((Li)|(lnx)).*2.?6)|(LFS)", Qt::CaseInsensitive), "Linux26" },
 -    { QRegExp("((Li)|(lnx)).*64", Qt::CaseInsensitive), "Linux26_64" },
 -    { QRegExp("(Li)|(lnx)", Qt::CaseInsensitive), "Linux26" },
- 
+-
 -    /* Other: */
++    { QRegExp("Ven", Qt::CaseInsensitive), "Venenux" },
++
 +    /* 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" },
@@ -836,10 +841,10 @@ index cbc0b73..31516cd 100644
  #define VBOXOSTYPE_x64_BIT       8
      /** The mask which indicates 64-bit. */
 diff --git a/src/VBox/Main/src-server/ApplianceImpl.cpp b/src/VBox/Main/src-server/ApplianceImpl.cpp
-index 05fc3b6..ce24d92 100644
+index 05fc3b6..dc06073 100644
 --- a/src/VBox/Main/src-server/ApplianceImpl.cpp
 +++ b/src/VBox/Main/src-server/ApplianceImpl.cpp
-@@ -84,7 +84,32 @@ g_osTypes[] =
+@@ -84,7 +84,31 @@ g_osTypes[] =
      { ovf::CIMOSType_CIMOS_MACOS,                                VBOXOSTYPE_MacOS },
      { ovf::CIMOSType_CIMOS_MACOS,                                VBOXOSTYPE_MacOS_x64 },            // there is no CIM 64-bit type for this
  
@@ -859,7 +864,6 @@ index 05fc3b6..ce24d92 100644
 +    { ovf::CIMOSType_CIMOS_Trisquel,                             VBOXOSTYPE_Trisquel },
 +    { ovf::CIMOSType_CIMOS_Trisquel_64,                          VBOXOSTYPE_Trisquel_x64 },
 +    { ovf::CIMOSType_CIMOS_Dynebolic,                            VBOXOSTYPE_Dynebolic },
-+    { ovf::CIMOSType_CIMOS_Venenux,                              VBOXOSTYPE_Venenux },
 +    
 +    // Free GNU/Linux distros that we have support for but CIM doesn't
 +    { ovf::CIMOSType_CIMOS_Linux_2_6_x,                          VBOXOSTYPE_Parabola },
@@ -873,7 +877,14 @@ index 05fc3b6..ce24d92 100644
      { ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux,                VBOXOSTYPE_RedHat },
      { ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux_64,             VBOXOSTYPE_RedHat_x64 },
      { ovf::CIMOSType_CIMOS_Solaris_64,                           VBOXOSTYPE_Solaris_x64 },
-@@ -110,7 +135,7 @@ g_osTypes[] =
+@@ -104,13 +128,14 @@ g_osTypes[] =
+     { ovf::CIMOSType_CIMOS_Ubuntu_64,                            VBOXOSTYPE_Ubuntu_x64 },
+     { ovf::CIMOSType_CIMOS_Debian,                               VBOXOSTYPE_Debian },
+     { ovf::CIMOSType_CIMOS_Debian_64,                            VBOXOSTYPE_Debian_x64 },
++    { ovf::CIMOSType_CIMOS_Venenux,                              VBOXOSTYPE_Venenux },
+     { ovf::CIMOSType_CIMOS_Linux_2_4_x,                          VBOXOSTYPE_Linux24 },
+     { ovf::CIMOSType_CIMOS_Linux_2_4_x_64,                       VBOXOSTYPE_Linux24_x64 },
+     { ovf::CIMOSType_CIMOS_Linux_2_6_x,                          VBOXOSTYPE_Linux26 },
      { ovf::CIMOSType_CIMOS_Linux_2_6_x_64,                       VBOXOSTYPE_Linux26_x64 },
      { ovf::CIMOSType_CIMOS_Linux_64,                             VBOXOSTYPE_Linux26_x64 },
  
-- 
cgit v1.2.3-2-g168b


From 5e29afb558a8abb929c9f879efe2be514eff8219 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 <emulatorman@lavabit.com>
Date: Sat, 13 Apr 2013 02:08:57 -0300
Subject: virtualbox-libre: fixing libre.patch

* Note: venenux was moved to non-free distros group due that was found freedom issues that don't respecting FSDG and was removed from free distros list recommended by FSF. This distro is under revision by FSF team.
---
 libre/virtualbox-libre/PKGBUILD    | 4 ++--
 libre/virtualbox-libre/libre.patch | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index 42a7f8b15..709edc49e 100644
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -79,7 +79,7 @@ source=("http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.ta
         'os_venenux.png'
         'libre.patch'
         'free-distros.patch')
-md5sums=('99349df34caacdecbb7cf3908631c3f3'
+md5sums=('654e45054ae6589452508d37403dc800'
          '5f85710e0b8606de967716ded7b2d351'
          'ed1341881437455d9735875ddf455fbe'
          '58d6e5bb4b4c1c6f3f0b3daa6aaeed03'
@@ -107,7 +107,7 @@ md5sums=('99349df34caacdecbb7cf3908631c3f3'
          'c7951fe6888d939f3a7d0dafe477e82b'
          '4da8eeb2ece7e475fc7a0d1003da26c6'
          '5e4187af59726d71c5be48d0cd816c34'
-         '05d166104a66ee479896c941ac27a3d0'
+         '919277147baae235810f1858200038c0'
          '50387fba578646a9d29de3f917a199d2')
 
 prepare() {
diff --git a/libre/virtualbox-libre/libre.patch b/libre/virtualbox-libre/libre.patch
index e93fe80e8..a696f9a0d 100644
--- a/libre/virtualbox-libre/libre.patch
+++ b/libre/virtualbox-libre/libre.patch
@@ -681,8 +681,8 @@
   ifdef VBOX_WITH_INSTALLER
    include $(PATH_SUB_CURRENT)/Installer/Makefile.kmk 		        # Keep this last.
   endif
---- VirtualBox-4.1.18.orig/src/libs/Makefile.kmk	2012-07-24 21:23:26.938013023 -0300
-+++ VirtualBox-4.1.18/src/libs/Makefile.kmk		2012-07-24 21:43:42.557911752 -0300
+--- VirtualBox-4.2.12.orig/src/libs/Makefile.kmk	2013-04-12 07:39:14.000000000 -0300
++++ VirtualBox-4.2.12/src/libs/Makefile.kmk		2013-04-13 02:00:29.294392443 -0300
 @@ -48,13 +48,6 @@
   include $(PATH_SUB_CURRENT)/kStuff/Makefile.kmk
  endif
@@ -691,7 +691,7 @@
 -if !defined(VBOX_ONLY_SDK) \
 - && (   "$(SDK_VBOX_OPENSSL_INCS)" == "$(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)" \
 -     || defined(VBOX_WITH_EXTPACK_PUEL_BUILD))
-- include $(PATH_SUB_CURRENT)/openssl-0.9.8t/Makefile.kmk
+- include $(PATH_SUB_CURRENT)/openssl-0.9.8y/Makefile.kmk
 -endif
 -
  # libjpeg for VRDP video redirection
-- 
cgit v1.2.3-2-g168b


From 6cc2e7ab361e1ac5cddc45b38532a691f4b31003 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 <emulatorman@lavabit.com>
Date: Sat, 13 Apr 2013 02:45:08 -0300
Subject: virtualbox-libre-modules{,-lts}-4.2.12-1: updating version

---
 libre/virtualbox-libre-modules-lts/PKGBUILD | 4 ++--
 libre/virtualbox-libre-modules/PKGBUILD     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libre/virtualbox-libre-modules-lts/PKGBUILD b/libre/virtualbox-libre-modules-lts/PKGBUILD
index 038191729..a9464f1fd 100644
--- a/libre/virtualbox-libre-modules-lts/PKGBUILD
+++ b/libre/virtualbox-libre-modules-lts/PKGBUILD
@@ -7,8 +7,8 @@
 
 pkgbase=virtualbox-libre-modules-lts
 pkgname=('virtualbox-libre-host-modules-lts' 'virtualbox-libre-guest-modules-lts')
-pkgver=4.2.10
-pkgrel=3
+pkgver=4.2.12
+pkgrel=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 c7c0c7707..d6d50f425 100644
--- a/libre/virtualbox-libre-modules/PKGBUILD
+++ b/libre/virtualbox-libre-modules/PKGBUILD
@@ -6,9 +6,9 @@
 
 pkgbase=virtualbox-libre-modules
 pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules')
-pkgver=4.2.10
+pkgver=4.2.12
 _extramodules=extramodules-3.8-LIBRE
-pkgrel=4
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
-- 
cgit v1.2.3-2-g168b


From 84d38756997a9a06334763fb2203b4b345ea799c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 <emulatorman@lavabit.com>
Date: Sat, 13 Apr 2013 12:13:06 -0300
Subject: debootstrap: take source from debian and put gNewSense and Trisquel
 files and symlinks

---
 pcr/debootstrap/PKGBUILD |  44 +++++++---
 pcr/debootstrap/metad    | 203 +++++++++++++++++++++++++++++++++++++++++++++++
 pcr/debootstrap/trisquel | 199 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 436 insertions(+), 10 deletions(-)
 create mode 100644 pcr/debootstrap/metad
 create mode 100644 pcr/debootstrap/trisquel

diff --git a/pcr/debootstrap/PKGBUILD b/pcr/debootstrap/PKGBUILD
index 9f03c48db..e46a7d0b1 100644
--- a/pcr/debootstrap/PKGBUILD
+++ b/pcr/debootstrap/PKGBUILD
@@ -2,19 +2,43 @@
 # Maintainer: André Silva <emulatorman@lavabit.com>
 
 pkgname=debootstrap
-pkgver=1.0.26
+pkgver=1.0.48
 pkgrel=1
-pkgdesc="A tool used to create a gNewSense base system from scratch, without requiring the availability of dpkg or apt"
+pkgdesc="A tool used to create a gNewSense or Trisquel base system from scratch, without requiring the availability of dpkg or apt"
 arch=('any')
 license=('GPL')
-url="http://www.gnewsense.org"
-depends=('bash' 'wget')
-source=("http://archive.gnewsense.org/gnewsense-three/gnewsense/pool/overlays/parkes/kgoetz/${pkgname}/${pkgname}_${pkgver}+squeeze1+gnewsense1_all.deb") 
+url="http://packages.debian.org/sid/debootstrap"
+depends=('wget')
+source=("http://ftp.debian.org/debian/pool/main/d/${pkgname}/${pkgname}_${pkgver}_all.deb"
+        'metad'
+        'trisquel')
 install="debootstrap.install"
-md5sums=('2049317eac54c0fac6c3201a90fadc18')
+md5sums=('f75ae43204ed273c7a95c12a5a2f715a'
+         '4425300ca68d60fb60a6d699e153a519'
+         'b020aa8426e70a6024c8e76312c17d78')
 
-build(){
-  tar -xzf "${srcdir}/data.tar.gz" -C "${pkgdir}/"
-  # doesn't work with gpg 2.x, patch to point to gpgv1
-  sed 's/gpgv/gpgv1/g;' -i "${pkgdir}/usr/sbin/debootstrap" "${pkgdir}/usr/share/debootstrap/functions"
+package(){
+  tar -xzf "$srcdir/data.tar.gz" -C "$pkgdir/"
+
+  # doesn't work with gpg 2.x, patch to point to gpg1v
+  sed 's/gpgv/gpg1v/g;' -i "$pkgdir/usr/sbin/debootstrap" "$pkgdir/usr/share/debootstrap/functions"
+
+  # add gNewSense script
+  install -m644  metad        "$pkgdir/usr/share/debootstrap/scripts"
+
+  # create gNewSense symlinks
+  ln -s metad "$pkgdir/usr/share/debootstrap/scripts/deltah"
+  ln -s metad "$pkgdir/usr/share/debootstrap/scripts/parkes"
+
+  # add Trisquel script
+  install -m644  trisquel        "$pkgdir/usr/share/debootstrap/scripts"
+
+  # create Trisquel symlinks
+  ln -s trisquel "$pkgdir/usr/share/debootstrap/scripts/awen"
+  ln -s trisquel "$pkgdir/usr/share/debootstrap/scripts/brigantia"
+  ln -s trisquel "$pkgdir/usr/share/debootstrap/scripts/dagda"
+  ln -s trisquel "$pkgdir/usr/share/debootstrap/scripts/dwyn"
+  ln -s trisquel "$pkgdir/usr/share/debootstrap/scripts/robur"
+  ln -s trisquel "$pkgdir/usr/share/debootstrap/scripts/slaine"
+  ln -s trisquel "$pkgdir/usr/share/debootstrap/scripts/taranis"
 }
diff --git a/pcr/debootstrap/metad b/pcr/debootstrap/metad
new file mode 100644
index 000000000..8d14c0ed9
--- /dev/null
+++ b/pcr/debootstrap/metad
@@ -0,0 +1,203 @@
+case $SUITE in
+    parkes|metad)
+        default_mirror http://archive.gnewsense.org/gnewsense-three/gnewsense/
+    ;;
+    deltah)
+        default_mirror http://archive.gnewsense.org/gnewsense
+    ;;
+esac
+
+
+mirror_style release
+download_style apt
+finddebs_style from-indices
+variants - buildd fakechroot minbase scratchbox
+
+if doing_variant fakechroot; then
+	test "$FAKECHROOT" = "true" || error 1 FAKECHROOTREQ "This variant requires fakechroot environment to be started"
+fi
+
+case $ARCH in
+	alpha|ia64) LIBC="libc6.1" ;;
+	kfreebsd-*) LIBC="libc0.1" ;;
+	hurd-*)     LIBC="libc0.3" ;;
+	*)          LIBC="libc6" ;;
+esac
+
+work_out_debs () {
+	required="$(get_debs Priority: required)"
+
+	if doing_variant - || doing_variant fakechroot; then
+		#required="$required $(get_debs Priority: important)"
+		#  ^^ should be getting debconf here somehow maybe
+		base="$(get_debs Priority: important)"
+	elif doing_variant buildd || doing_variant scratchbox; then
+		base="apt $(get_debs Build-Essential: yes)"
+	elif doing_variant minbase; then
+		base="apt"
+	fi
+
+	if doing_variant fakechroot; then
+		# ldd.fake needs binutils
+		required="$required binutils"
+	fi
+}
+
+first_stage_install () {
+	extract $required
+
+	mkdir -p "$TARGET/var/lib/dpkg"
+	: >"$TARGET/var/lib/dpkg/status"
+	: >"$TARGET/var/lib/dpkg/available"
+
+	setup_etc
+	if [ ! -e "$TARGET/etc/fstab" ]; then
+		echo '# UNCONFIGURED FSTAB FOR BASE SYSTEM' > "$TARGET/etc/fstab"
+		chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab"
+	fi
+
+	if doing_variant fakechroot; then
+		setup_devices_fakechroot
+	else
+		setup_devices
+	fi
+
+	x_feign_install () {
+		local pkg="$1"
+		local deb="$(debfor $pkg)"
+		local ver="$(extract_deb_field "$TARGET/$deb" Version)"
+
+		mkdir -p "$TARGET/var/lib/dpkg/info"
+
+		echo \
+"Package: $pkg
+Version: $ver
+Status: install ok installed" >> "$TARGET/var/lib/dpkg/status"
+
+		touch "$TARGET/var/lib/dpkg/info/${pkg}.list"
+	}
+
+	x_feign_install dpkg
+}
+
+second_stage_install () {
+	x_core_install () {
+		smallyes '' | in_target dpkg --force-depends --install $(debfor "$@")
+	}
+
+	p () {
+		baseprog="$(($baseprog + ${1:-1}))"
+	}
+
+	if doing_variant fakechroot; then
+		setup_proc_fakechroot
+	elif doing_variant scratchbox; then
+		true
+	else
+		setup_proc
+		in_target /sbin/ldconfig
+	fi
+
+	DEBIAN_FRONTEND=noninteractive
+	DEBCONF_NONINTERACTIVE_SEEN=true
+	export DEBIAN_FRONTEND DEBCONF_NONINTERACTIVE_SEEN
+
+	baseprog=0
+	bases=7
+
+	p; progress $baseprog $bases INSTCORE "Installing core packages" #1
+	info INSTCORE "Installing core packages..."
+
+	p; progress $baseprog $bases INSTCORE "Installing core packages" #2
+	ln -sf mawk "$TARGET/usr/bin/awk"
+	x_core_install base-files base-passwd
+	p; progress $baseprog $bases INSTCORE "Installing core packages" #3
+	x_core_install dpkg
+
+	if [ ! -e "$TARGET/etc/localtime" ]; then
+		ln -sf /usr/share/zoneinfo/UTC "$TARGET/etc/localtime"
+	fi
+
+	if doing_variant fakechroot; then
+		install_fakechroot_tools
+	fi
+
+	p; progress $baseprog $bases INSTCORE "Installing core packages" #4
+	x_core_install $LIBC
+
+	p; progress $baseprog $bases INSTCORE "Installing core packages" #5
+	x_core_install perl-base
+
+	p; progress $baseprog $bases INSTCORE "Installing core packages" #6
+	rm "$TARGET/usr/bin/awk"
+	x_core_install mawk
+
+	p; progress $baseprog $bases INSTCORE "Installing core packages" #7
+	if doing_variant -; then
+		x_core_install debconf
+	fi
+
+	baseprog=0
+	bases=$(set -- $required; echo $#)
+
+	info UNPACKREQ "Unpacking required packages..."
+
+	exec 7>&1
+
+	smallyes '' |
+		(repeatn 5 in_target_failmsg UNPACK_REQ_FAIL_FIVE "Failure while unpacking required packages.  This will be attempted up to five times." "" \
+		dpkg --status-fd 8 --force-depends --unpack $(debfor $required) 8>&1 1>&7 || echo EXITCODE $?) |
+		dpkg_progress $baseprog $bases UNPACKREQ "Unpacking required packages" UNPACKING
+
+	info CONFREQ "Configuring required packages..."
+
+	mv "$TARGET/sbin/start-stop-daemon" "$TARGET/sbin/start-stop-daemon.REAL"
+	echo \
+"#!/bin/sh
+echo
+echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/start-stop-daemon"
+	chmod 755 "$TARGET/sbin/start-stop-daemon"
+
+	setup_dselect_method apt
+
+	smallyes '' |
+		(in_target_failmsg CONF_REQ_FAIL "Failure while configuring required packages." "" \
+		dpkg --status-fd 8 --configure --pending --force-configure-any --force-depends 8>&1 1>&7 || echo EXITCODE $?) |
+		dpkg_progress $baseprog $bases CONFREQ "Configuring required packages" CONFIGURING
+
+	baseprog=0
+	bases="$(set -- $base; echo $#)"
+
+	info UNPACKBASE "Unpacking the base system..."
+
+	setup_available $required $base
+	done_predeps=
+	while predep=$(get_next_predep); do
+		# We have to resolve dependencies of pre-dependencies manually because
+		# dpkg --predep-package doesn't handle this.
+		predep=$(without "$(without "$(resolve_deps $predep)" "$required")" "$done_predeps")
+		# XXX: progress is tricky due to how dpkg_progress works
+		# -- cjwatson 2009-07-29
+		p; smallyes '' |
+		in_target dpkg --force-overwrite --force-confold --skip-same-version --install $(debfor $predep)
+		base=$(without "$base" "$predep")
+		done_predeps="$done_predeps $predep"
+	done
+
+	smallyes '' |
+		(repeatn 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages.  This will be re-attempted up to five times." "" \
+		dpkg --status-fd 8 --force-overwrite --force-confold --skip-same-version --unpack $(debfor $base) 8>&1 1>&7 || echo EXITCODE $?) |
+		dpkg_progress $baseprog $bases UNPACKBASE "Unpacking base system" UNPACKING
+
+	info CONFBASE "Configuring the base system..."
+
+	smallyes '' |
+		(repeatn 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages.  This will be re-attempted up to five times." "" \
+		dpkg --status-fd 8 --force-confold --skip-same-version --configure -a 8>&1 1>&7 || echo EXITCODE $?) |
+		dpkg_progress $baseprog $bases CONFBASE "Configuring base system" CONFIGURING
+
+	mv "$TARGET/sbin/start-stop-daemon.REAL" "$TARGET/sbin/start-stop-daemon"
+
+	progress $bases $bases CONFBASE "Configuring base system"
+	info BASESUCCESS "Base system installed successfully."
+}
diff --git a/pcr/debootstrap/trisquel b/pcr/debootstrap/trisquel
new file mode 100644
index 000000000..7efa062f9
--- /dev/null
+++ b/pcr/debootstrap/trisquel
@@ -0,0 +1,199 @@
+default_mirror http://archive.trisquel.info/trisquel
+mirror_style release
+download_style apt
+finddebs_style from-indices
+variants - buildd fakechroot minbase
+
+if doing_variant fakechroot; then
+    test "$FAKECHROOT" = "true" || error 1 FAKECHROOTREQ "This variant requires fakechroot environment to be started"
+fi
+
+case $ARCH in
+  alpha|ia64) LIBC="libc6.1" ;;
+  *)          LIBC="libc6" ;;
+esac
+
+work_out_debs () {
+    required="$(get_debs Priority: required)"
+
+    if doing_variant -; then
+      #required="$required $(get_debs Priority: important)"
+      #  ^^ should be getting debconf here somehow maybe
+      base="$(get_debs Priority: important)"
+    elif doing_variant buildd; then
+      base="$(get_debs Build-Essential: yes)"
+    elif doing_variant fakechroot || doing_variant minbase; then
+      base="apt"
+    fi
+}
+
+first_stage_install () {
+    extract $required
+
+    mkdir -p "$TARGET/var/lib/dpkg"
+    : >"$TARGET/var/lib/dpkg/status"
+    : >"$TARGET/var/lib/dpkg/available"
+
+    setup_etc
+    if [ ! -e "$TARGET/etc/fstab" ]; then
+        echo '# UNCONFIGURED FSTAB FOR BASE SYSTEM' > "$TARGET/etc/fstab"
+        chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab"
+    fi
+
+    if doing_variant fakechroot; then
+        setup_devices_fakechroot
+    else
+        setup_devices
+    fi
+
+    x_feign_install () {
+        local pkg="$1"
+        local deb="$(debfor $pkg)"
+        local ver="$(extract_deb_field "$TARGET/$deb" Version)"
+
+        mkdir -p "$TARGET/var/lib/dpkg/info"
+
+        echo \
+"Package: $pkg
+Version: $ver
+Status: install ok installed" >> "$TARGET/var/lib/dpkg/status"
+
+        touch "$TARGET/var/lib/dpkg/info/${pkg}.list"
+    }
+
+    x_feign_install dpkg
+}
+
+second_stage_install () {
+    x_core_install () {
+	smallyes '' | in_target dpkg --force-depends --install $(debfor "$@")
+    }
+
+    p () {
+	baseprog="$(($baseprog + ${1:-1}))"
+    }
+
+    if doing_variant fakechroot; then
+	setup_proc_fakechroot
+    else
+	setup_proc
+	in_target /sbin/ldconfig
+    fi
+
+    DEBIAN_FRONTEND=noninteractive
+    DEBCONF_NONINTERACTIVE_SEEN=true
+    export DEBIAN_FRONTEND DEBCONF_NONINTERACTIVE_SEEN
+
+    baseprog=0
+    bases=7
+
+    p; progress $baseprog $bases INSTCORE "Installing core packages" #1
+    info INSTCORE "Installing core packages..."
+
+    p; progress $baseprog $bases INSTCORE "Installing core packages" #2
+    ln -sf mawk "$TARGET/usr/bin/awk"
+    x_core_install base-files base-passwd
+    p; progress $baseprog $bases INSTCORE "Installing core packages" #3
+    x_core_install dpkg
+
+    if [ ! -e "$TARGET/etc/localtime" ]; then
+        ln -sf /usr/share/zoneinfo/Etc/UTC "$TARGET/etc/localtime"
+    fi
+
+    if doing_variant fakechroot; then
+	install_fakechroot_tools
+    fi
+
+    p; progress $baseprog $bases INSTCORE "Installing core packages" #4
+    x_core_install $LIBC
+
+    p; progress $baseprog $bases INSTCORE "Installing core packages" #5
+    x_core_install perl-base
+
+    p; progress $baseprog $bases INSTCORE "Installing core packages" #6
+    rm "$TARGET/usr/bin/awk"
+    x_core_install mawk
+
+    p; progress $baseprog $bases INSTCORE "Installing core packages" #7
+    if doing_variant -; then
+      x_core_install debconf
+    fi
+
+    baseprog=0
+    bases=$(set -- $required; echo $#)
+
+    info UNPACKREQ "Unpacking required packages..."
+
+    smallyes '' |
+      (repeatn 5 in_target_failmsg UNPACK_REQ_FAIL_FIVE "Failure while unpacking required packages.  This will be attempted up to five times." "" \
+      dpkg --status-fd 8 --force-depends --unpack $(debfor $required) 8>&1 1>&7 |
+      dpkg_progress $baseprog $bases UNPACKREQ "Unpacking required packages" UNPACKING) 7>&1
+
+    info CONFREQ "Configuring required packages..."
+
+    if doing_variant fakechroot; then
+	# fix initscripts postinst (no mounting possible, and wrong if condition)
+	sed -i '/dpkg.*--compare-versions/ s/\<lt\>/lt-nl/' "$TARGET/var/lib/dpkg/info/initscripts.postinst"
+    fi
+
+    mv "$TARGET/sbin/start-stop-daemon" "$TARGET/sbin/start-stop-daemon.REAL"
+    echo \
+"#!/bin/sh
+echo
+echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/start-stop-daemon"
+    chmod 755 "$TARGET/sbin/start-stop-daemon"
+
+    if [ -x "$TARGET/sbin/initctl" ]; then
+      mv "$TARGET/sbin/initctl" "$TARGET/sbin/initctl.REAL"
+      echo \
+"#!/bin/sh
+echo
+echo \"Warning: Fake initctl called, doing nothing\"" > "$TARGET/sbin/initctl"
+      chmod 755 "$TARGET/sbin/initctl"
+    fi
+
+    setup_dselect_method apt
+
+    smallyes '' |
+      (in_target_failmsg CONF_REQ_FAIL "Failure while configuring required packages." "" \
+      dpkg --status-fd 8 --configure --pending --force-configure-any --force-depends 8>&1 1>&7 |
+      dpkg_progress $baseprog $bases CONFREQ "Configuring required packages" CONFIGURING) 7>&1
+
+    baseprog=0
+    bases="$(set -- $base; echo $#)"
+
+    info UNPACKBASE "Unpacking the base system..."
+
+    setup_available $required $base
+    done_predeps=
+    while predep=$(get_next_predep); do
+      # We have to resolve dependencies of pre-dependencies manually because
+      # dpkg --predep-package doesn't handle this.
+      predep=$(without "$(without "$(resolve_deps $predep)" "$required")" "$done_predeps")
+      # XXX: progress is tricky due to how dpkg_progress works
+      # -- cjwatson 2009-07-29
+      p; smallyes '' | in_target dpkg --force-overwrite --force-confold --skip-same-version --install $(debfor $predep)
+      base=$(without "$base" "$predep")
+      done_predeps="$done_predeps $predep"
+    done
+
+    smallyes '' |
+      (repeatn 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages.  This will be re-attempted up to five times." "" \
+      dpkg --status-fd 8 --force-overwrite --force-confold --skip-same-version --unpack $(debfor $base) 8>&1 1>&7 |
+      dpkg_progress $baseprog $bases UNPACKBASE "Unpacking base system" UNPACKING) 7>&1
+
+    info CONFBASE "Configuring the base system..."
+
+    smallyes '' |
+      (repeatn 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages.  This will be attempted 5 times." "" \
+      dpkg --status-fd 8 --force-confold --skip-same-version --configure -a 8>&1 1>&7 |
+      dpkg_progress $baseprog $bases CONFBASE "Configuring base system" CONFIGURING) 7>&1
+
+    if [ -x "$TARGET/sbin/initctl.REAL" ]; then
+      mv "$TARGET/sbin/initctl.REAL" "$TARGET/sbin/initctl"
+    fi
+    mv "$TARGET/sbin/start-stop-daemon.REAL" "$TARGET/sbin/start-stop-daemon"
+
+    progress $bases $bases CONFBASE "Configuring base system"
+    info BASESUCCESS "Base system installed successfully."
+}
-- 
cgit v1.2.3-2-g168b


From 10deb9716c0ef9b6d37d678ee87191afc6608170 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 <emulatorman@lavabit.com>
Date: Sat, 13 Apr 2013 13:20:46 -0300
Subject: linux-libre: updating version

* Update to new package standards with prepare function
* Add required build-time dependencies [bc will be needed in 3.9] => https://bugs.archlinux.org/task/34600
* Update 3.8.7 version to i686 and x86_64
---
 libre/linux-libre/PKGBUILD            | 14 +++++++++-----
 libre/linux-libre/linux-libre.install |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index e340623ac..f0ca4a325 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 182057 2013-04-06 06:50:23Z tpowa $
+# $Id: PKGBUILD 182718 2013-04-13 10:58:55Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar>
@@ -10,14 +10,14 @@
 pkgbase=linux-libre         # Build stock -LIBRE kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.8
-_sublevel=6
+_sublevel=7
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
 _lxopkgver=${_basekernel}.6 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
-makedepends=('xmlto' 'docbook-xsl')
+makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc')
 options=('!strip')
 source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz"
         "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz"
@@ -31,7 +31,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'change-default-console-loglevel.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('84c2a77910932ffc7d958744ac9cf2f5'
-         '1b3cd03d2add3bfe74e98a953f28c8d0'
+         'f83582104813c022e6739e12664dbb0c'
          '9b425f069f920cdd6798b3adab79d3af'
          '9316ebdb21ea9948ae5c83795a3dcf61'
          'e49ac236dfeef709f91a3d993ea7b62c'
@@ -49,7 +49,7 @@ fi
 _kernelname=${pkgbase#linux-libre}
 _localversionname=-LIBRE
 
-build() {
+prepare() {
   cd "${srcdir}/linux-${_basekernel}"
 
   if [ "${_basekernel}" != "${pkgver}" ]; then
@@ -96,6 +96,10 @@ build() {
 
   # don't run depmod on 'make install'. We'll do this ourselves in packaging
   sed -i '2iexit 0' scripts/depmod.sh
+}
+
+build() {
+  cd "${srcdir}/linux-${_basekernel}"
 
   # get kernel version
   make prepare
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index a7672f35c..46f383749 100644
--- a/libre/linux-libre/linux-libre.install
+++ b/libre/linux-libre/linux-libre.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=
-KERNEL_VERSION=3.8.6-1-LIBRE
+KERNEL_VERSION=3.8.7-1-LIBRE
 
 # set a sane PATH to ensure that critical utils like depmod will be found
 export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
-- 
cgit v1.2.3-2-g168b


From 73bb75e51bc8ced3d659b59725ae805642f69f4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 <emulatorman@lavabit.com>
Date: Sat, 13 Apr 2013 13:32:15 -0300
Subject: linux-libre-{pae,xen}-3.8.7-1: updating version

* Update to new package standards with prepare function
* Add required build-time dependencies [bc will be needed in 3.9] => https://bugs.archlinux.org/task/34600
---
 kernels/linux-libre-pae/PKGBUILD                | 14 +++++++++-----
 kernels/linux-libre-pae/linux-libre-pae.install |  2 +-
 kernels/linux-libre-xen/PKGBUILD                | 14 +++++++++-----
 kernels/linux-libre-xen/linux-libre-xen.install |  2 +-
 4 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD
index f003a128a..296bea51a 100644
--- a/kernels/linux-libre-pae/PKGBUILD
+++ b/kernels/linux-libre-pae/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 182057 2013-04-06 06:50:23Z tpowa $
+# $Id: PKGBUILD 182718 2013-04-13 10:58:55Z tpowa $
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -6,12 +6,12 @@
 pkgbase=linux-libre-pae     # Build stock -LIBRE-PAE kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.8
-pkgver=${_basekernel}.6
+pkgver=${_basekernel}.7
 pkgrel=1
 arch=('i686')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
-makedepends=('xmlto' 'docbook-xsl')
+makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc')
 options=('!strip')
 source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz"
         "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz"
@@ -22,7 +22,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'boot-logo.patch'
         'change-default-console-loglevel.patch')
 md5sums=('84c2a77910932ffc7d958744ac9cf2f5'
-         '1b3cd03d2add3bfe74e98a953f28c8d0'
+         'f83582104813c022e6739e12664dbb0c'
          '6294513cfa9830d48ad1915ff7053a98'
          'f302c931bd85309da9d9792b4cc96467'
          '04b21c79df0a952c22d681dd4f4562df'
@@ -31,7 +31,7 @@ md5sums=('84c2a77910932ffc7d958744ac9cf2f5'
 _kernelname=${pkgbase#linux-libre}
 _localversionname=-LIBRE-PAE
 
-build() {
+prepare() {
   cd "${srcdir}/linux-${_basekernel}"
 
   if [ "${_basekernel}" != "${pkgver}" ]; then
@@ -58,6 +58,10 @@ build() {
 
   # don't run depmod on 'make install'. We'll do this ourselves in packaging
   sed -i '2iexit 0' scripts/depmod.sh
+}
+
+build() {
+  cd "${srcdir}/linux-${_basekernel}"
 
   # get kernel version
   make prepare
diff --git a/kernels/linux-libre-pae/linux-libre-pae.install b/kernels/linux-libre-pae/linux-libre-pae.install
index c8ba6a356..1e8ed6868 100644
--- a/kernels/linux-libre-pae/linux-libre-pae.install
+++ b/kernels/linux-libre-pae/linux-libre-pae.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-pae
-KERNEL_VERSION=3.8.6-1-LIBRE-PAE
+KERNEL_VERSION=3.8.7-1-LIBRE-PAE
 
 # set a sane PATH to ensure that critical utils like depmod will be found
 export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD
index 8d112b6ab..45759cd92 100644
--- a/kernels/linux-libre-xen/PKGBUILD
+++ b/kernels/linux-libre-xen/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 182057 2013-04-06 06:50:23Z tpowa $
+# $Id: PKGBUILD 182718 2013-04-13 10:58:55Z tpowa $
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -6,12 +6,12 @@
 pkgbase=linux-libre-xen     # Build stock -LIBRE-XEN kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.8
-pkgver=${_basekernel}.6
+pkgver=${_basekernel}.7
 pkgrel=1
 arch=('i686')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
-makedepends=('xmlto' 'docbook-xsl')
+makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc')
 options=('!strip')
 source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz"
         "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz"
@@ -22,7 +22,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'boot-logo.patch'
         'change-default-console-loglevel.patch')
 md5sums=('84c2a77910932ffc7d958744ac9cf2f5'
-         '1b3cd03d2add3bfe74e98a953f28c8d0'
+         'f83582104813c022e6739e12664dbb0c'
          '2708b6f03f827e2c94ecbd050df4286d'
          'b7c2805bb287a644c0a303bf7721e534'
          '04b21c79df0a952c22d681dd4f4562df'
@@ -31,7 +31,7 @@ md5sums=('84c2a77910932ffc7d958744ac9cf2f5'
 _kernelname=${pkgbase#linux-libre}
 _localversionname=-LIBRE-XEN
 
-build() {
+prepare() {
   cd "${srcdir}/linux-${_basekernel}"
 
   if [ "${_basekernel}" != "${pkgver}" ]; then
@@ -58,6 +58,10 @@ build() {
 
   # don't run depmod on 'make install'. We'll do this ourselves in packaging
   sed -i '2iexit 0' scripts/depmod.sh
+}
+
+build() {
+  cd "${srcdir}/linux-${_basekernel}"
 
   # get kernel version
   make prepare
diff --git a/kernels/linux-libre-xen/linux-libre-xen.install b/kernels/linux-libre-xen/linux-libre-xen.install
index 2b4029b64..f9430058d 100644
--- a/kernels/linux-libre-xen/linux-libre-xen.install
+++ b/kernels/linux-libre-xen/linux-libre-xen.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-xen
-KERNEL_VERSION=3.8.6-1-LIBRE-XEN
+KERNEL_VERSION=3.8.7-1-LIBRE-XEN
 
 # set a sane PATH to ensure that critical utils like depmod will be found
 export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
-- 
cgit v1.2.3-2-g168b


From af8fd7c746d688da496d420f50bced9663c2cd27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 <emulatorman@lavabit.com>
Date: Sat, 13 Apr 2013 13:43:48 -0300
Subject: linux-libre-lts: updating version

* Update to new package standards with prepare function
* Add required build-time dependencies [bc will be needed in 3.9] => https://bugs.archlinux.org/task/34600
* Update 3.0.73 version to i686 and x86_64
* Update 3.0.72 version to mips64el
---
 libre/linux-libre-lts/PKGBUILD                | 24 +++++++++++-------------
 libre/linux-libre-lts/linux-libre-lts.install |  2 +-
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index e0fb91bd4..df302a20d 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 182062 2013-04-06 09:14:10Z tpowa $
+# $Id: PKGBUILD 182731 2013-04-13 15:31:06Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -7,14 +7,14 @@
 pkgbase=linux-libre-lts     # Build stock -LIBRE-LTS kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.0
-_sublevel=72
+_sublevel=73
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
-_lxopkgver=${_basekernel}.71 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.72 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
-makedepends=('xmlto' 'docbook-xsl')
+makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils')
 options=('!strip')
 source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz"
         "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz"
@@ -30,10 +30,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'ext4-options.patch'
         'module-symbol-waiting-3.0.patch'
         'module-init-wait-3.0.patch'
-        'ext4-use-atomic64_t-for-the-per-flexbg-free_clusters-count.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('5f64180fe7df4e574dac5911b78f5067'
-         '337d8baa608067d3ef79a553af790416'
+         '846a503d4bacfaca417fbea67aceabc2'
          'fe0e9b4415b82f306fc1b63eb9a742a4'
          '69a689019ea0b6ed46b387907f14bc8a'
          'c072b17032e80debc6a8626299245d46'
@@ -45,8 +44,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067'
          'f36222e7ce20c8e4dc27376f9be60f6c'
          '670931649c60fcb3ef2e0119ed532bd4'
          '8a71abc4224f575008f974a099b5cf6f'
-         'ee587972bbd35841cc0efe82db9caa7c'
-         'fd5bb788a849895ebf1b8efe64646715')
+         '5d433e634f9744824a5a3122d734e6f6')
 if [ "$CARCH" != "mips64el" ]; then
     # Don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
@@ -56,7 +54,7 @@ fi
 _kernelname=${pkgbase#linux-libre}
 _localversionname=-LIBRE-LTS
 
-build() {
+prepare() {
   cd "${srcdir}/linux-${_basekernel}"
 
   if [ "${_basekernel}" != "${pkgver}" ]; then
@@ -66,10 +64,6 @@ build() {
   # Add freedo as boot logo
   patch -Np1 -i "${srcdir}/boot-logo.patch"
 
-  # revert i686 build breaker 3.0.72 kernel
-  if [ "${CARCH}" = "i686" ]; then  
-    patch -Rp1 -i "${srcdir}/ext4-use-atomic64_t-for-the-per-flexbg-free_clusters-count.patch"
-  fi
   # Some chips detect a ghost TV output
   # mailing list discussion: http://lists.freedesktop.org/archives/intel-gfx/2011-April/010371.html
   # Arch Linux bug report: FS#19234
@@ -125,6 +119,10 @@ build() {
 
   # don't run depmod on 'make install'. We'll do this ourselves in packaging
   sed -i '2iexit 0' scripts/depmod.sh
+}
+
+build() {
+  cd "${srcdir}/linux-${_basekernel}"
 
   # get kernel version
   make prepare
diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install
index 76b9b14f0..c3aff92ae 100644
--- a/libre/linux-libre-lts/linux-libre-lts.install
+++ b/libre/linux-libre-lts/linux-libre-lts.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-lts
-KERNEL_VERSION=3.0.72-1-LIBRE-LTS
+KERNEL_VERSION=3.0.73-1-LIBRE-LTS
 
 # set a sane PATH to ensure that critical utils like depmod will be found
 export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
-- 
cgit v1.2.3-2-g168b


From 4dcc24341a61d2f32a119dbccdbdea7ef479e019 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 <emulatorman@lavabit.com>
Date: Sat, 13 Apr 2013 13:49:05 -0300
Subject: linux-rt: make some changes on PKGBUILD

* Update to new package standards with prepare function
* Add required build-time dependencies [bc will be needed in 3.9] => https://bugs.archlinux.org/task/34600
---
 kernels/linux-libre-rt/PKGBUILD | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD
index a239bce41..fed3ad748 100644
--- a/kernels/linux-libre-rt/PKGBUILD
+++ b/kernels/linux-libre-rt/PKGBUILD
@@ -18,7 +18,7 @@ _lxopkgver=${_basekernel}.4 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
-makedepends=('xmlto' 'docbook-xsl')
+makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc')
 options=('!strip')
 source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz"
         "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}-gnu/patch-${_basekernel}-gnu-${_pkgver}-gnu.xz"
@@ -52,7 +52,7 @@ fi
 _kernelname=${pkgbase#linux-libre}
 _localversionname=-LIBRE-RT
 
-build() {
+prepare() {
   cd "${srcdir}/linux-${_basekernel}"
 
   if [ "${_basekernel}" != "${pkgver}" ]; then
@@ -102,6 +102,10 @@ build() {
 
   # don't run depmod on 'make install'. We'll do this ourselves in packaging
   sed -i '2iexit 0' scripts/depmod.sh
+}
+
+build() {
+  cd "${srcdir}/linux-${_basekernel}"
 
   # get kernel version
   make prepare
-- 
cgit v1.2.3-2-g168b


From 1800ba0eecf40fdfcd37ae78b162d9ab12b32ae7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 <emulatorman@lavabit.com>
Date: Sat, 13 Apr 2013 13:53:11 -0300
Subject: calibre-libre-0.9.27-1: updating version

---
 libre/calibre-libre/PKGBUILD | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD
index 9279a463f..1ef8b1d76 100644
--- a/libre/calibre-libre/PKGBUILD
+++ b/libre/calibre-libre/PKGBUILD
@@ -1,5 +1,7 @@
 # $Id$
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
+# Maintainer: jelle van der Waa <jelle@vdwaa.nl>
+# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
+# Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Petrov Roman <nwhisper@gmail.com>
 # Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com>
 # Contributor: Larry Hajali <larryhaja@gmail.com>
@@ -7,7 +9,7 @@
 
 _pkgname=calibre
 pkgname=calibre-libre
-pkgver=0.9.26
+pkgver=0.9.27
 pkgrel=1
 pkgdesc="Ebook management application, with unar support included and nonfree fonts removed"
 arch=('i686' 'x86_64' 'mips64el') 
@@ -28,7 +30,7 @@ install=calibre.install
 source=("http://calibre-ebook.googlecode.com/files/${_pkgname}-${pkgver}.tar.xz"
         'desktop_integration.patch'
         'calibre-mount-helper')
-md5sums=('14df8fbe5e0fa5e8cc14b480603920e2'
+md5sums=('1d5bbe102e3ec6ec71399aad5d074137'
          '8353d1878c5a498b3e49eddef473605f'
          '675cd87d41342119827ef706055491e7')
 
-- 
cgit v1.2.3-2-g168b


From fd04d9bbd17529b6acf413a14b805066c03c5d38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 <emulatorman@lavabit.com>
Date: Sat, 13 Apr 2013 16:30:24 -0300
Subject: linux-libre{,-lts}-kmod-alx: rebuild against kernel last version

---
 libre/linux-libre-kmod-alx/PKGBUILD     | 4 ++--
 libre/linux-libre-lts-kmod-alx/PKGBUILD | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD
index 524b24bae..d6dc1c328 100644
--- a/libre/linux-libre-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-kmod-alx/PKGBUILD
@@ -1,12 +1,12 @@
 # Maintainer: André Silva <emulatorman@lavabit.com>
 
-_kernver=3.8.6
+_kernver=3.8.7
 _kernrel=1
 pkgname=('linux-libre-kmod-alx')
 _version=v3.8-rc7
 _pkgver=3.8-rc7-1-u
 pkgver=3.8rc7.1
-pkgrel=12
+pkgrel=13
 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel'
 arch=('i686' 'x86_64')
 url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx'
diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD
index d2b2839ea..1963f2536 100644
--- a/libre/linux-libre-lts-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD
@@ -1,12 +1,12 @@
 # Maintainer: André Silva <emulatorman@lavabit.com>
 
-_kernver=3.0.72
+_kernver=3.0.73
 _kernrel=1
 pkgname=('linux-libre-lts-kmod-alx')
 _version=v3.8-rc7
 _pkgver=3.8-rc7-1-u
 pkgver=3.8rc7.1
-pkgrel=10
+pkgrel=11
 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel'
 arch=('i686' 'x86_64')
 url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx'
-- 
cgit v1.2.3-2-g168b


From 6ccf0c035c6183dbd64e7a71db340762a3789c7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 <emulatorman@lavabit.com>
Date: Mon, 15 Apr 2013 06:02:00 -0300
Subject: icedove-libre-17.0.5.1-1: updating version

---
 libre/icedove-libre/PKGBUILD         | 26 +++++++++++++++++++-------
 libre/icedove-libre/channel-prefs.js |  9 ---------
 libre/icedove-libre/replace-urls.txt | 25 +++++++++++++++++++++++++
 3 files changed, 44 insertions(+), 16 deletions(-)
 delete mode 100644 libre/icedove-libre/channel-prefs.js
 create mode 100644 libre/icedove-libre/replace-urls.txt

diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD
index a6825ea97..43212c413 100644
--- a/libre/icedove-libre/PKGBUILD
+++ b/libre/icedove-libre/PKGBUILD
@@ -3,7 +3,7 @@
 
 # We're getting this from Debian Experimental
 _debname=icedove
-_debver=17.0.4
+_debver=17.0.5
 _debrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -11,7 +11,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 _pkgname=${_debname}
 pkgname=${_debname}-libre
 pkgver=${_debver}.${_debrel}
-pkgrel=3
+pkgrel=1
 pkgdesc="A libre version of Debian Icedove, the standalone mail/news reader based on Mozilla Thunderbird."
 arch=('i686' 'x86_64' 'mips64el')
 license=('MPL' 'GPL' 'LGPL')
@@ -26,17 +26,17 @@ install=${_pkgname}.install
 source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
         "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz"
         mozconfig
-        channel-prefs.js
+        replace-urls.txt
         vendor.js
         makefile.patch
         branding.patch
         ${_pkgname}.desktop
         Icedove-branding.patch)
 options=(!emptydirs)
-md5sums=('26ce85189f3b55cc2c97c57e18c1e2de'
-         'fafa558c1940a48c3f29de61dc27d737'
+md5sums=('0c68298c17757257da79b6bb39e3fd10'
+         'eb2a5e1877d87a16e10388f533c081a6'
          '5cf95ea94f69cdd36604890cfbf7b954'
-         '476ec205162340fb0679f522c9d31c3b'
+         'a8fc4658d45b6bf9350023e5c3f34e56'
          '4eecc4fc5aafaf0da651a09eadc90bee'
          'c4ed43e85945e180a89cce03e45ec62c'
          '126b1446212396c33220936c01d9592d'
@@ -72,6 +72,17 @@ prepare() {
   patch -Np1 -i "${srcdir}/branding.patch" # fixing branding
   patch -Np1 -i "${srcdir}/Icedove-branding.patch" # debian patch fixed version
 
+  # Replace common URLs
+  sed '/^#/d' ../replace-urls.txt | while read -r moz_url gnu_url; do
+    if [[ -n $moz_url ]]; then
+      printf 'liberating: %s -> %s\n' "$moz_url" "$gnu_url"
+      grep -Erl "${moz_url}" \
+        --exclude='*.'{patch,orig,rej} \
+        --exclude-dir={.pc,test,tests,testing} \
+        | xargs -d '\n' --no-run-if-empty sed -ri "s<${moz_url}<${gnu_url}<g"
+    fi
+  done
+
   cp "${srcdir}/mozconfig" .mozconfig
 
   # configure script misdetects the preprocessor without an optimization level
@@ -82,7 +93,7 @@ prepare() {
 build() {
   cd "${srcdir}/${DEBIAN_BUILD}"
 
-  export LDFLAGS="${LDFLAGS} -Wl,--as-needed,-rpath,/usr/lib/${_pkgname}"
+  export LDFLAGS="${LDFLAGS} -Wl,-rpath,/usr/lib/${_pkgname}"
   export PYTHON="/usr/bin/python2"
 
   make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}"
@@ -110,6 +121,7 @@ package() {
   ln -sf /usr/share/hunspell "${pkgdir}/usr/lib/${_pkgname}/dictionaries"
   ln -sf /usr/share/hyphen "${pkgdir}/usr/lib/${_pkgname}/hyphenation"
   ln -sf /usr/lib/mozilla/searchplugins "${pkgdir}/usr/lib/${_pkgname}/searchplugins"
+
   # We don't want the development stuff
   rm -r "${pkgdir}"/usr/{include,lib/$_pkgname-devel,share/idl}
 }
diff --git a/libre/icedove-libre/channel-prefs.js b/libre/icedove-libre/channel-prefs.js
deleted file mode 100644
index 13b1ba388..000000000
--- a/libre/icedove-libre/channel-prefs.js
+++ /dev/null
@@ -1,9 +0,0 @@
-//@line 2 "/build/src/comm-release/mail/app/profile/channel-prefs.js"
-pref("app.update.channel", "default");
-
-//Recommend free addons
-pref("extensions.getAddons.get.url", "http://www.gnu.org/software/gnuzilla/addons.html");
-pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html");
-pref("extensions.getAddons.search.url", "http://www.gnu.org/software/gnuzilla/addons.html");
-pref("extensions.getMoreThemesURL", "http://www.gnu.org/software/gnuzilla/addons.html");
-pref("extensions.webservice.discoverURL", "http://www.gnu.org/software/gnuzilla/addons.html");
diff --git a/libre/icedove-libre/replace-urls.txt b/libre/icedove-libre/replace-urls.txt
new file mode 100644
index 000000000..fc13e32fb
--- /dev/null
+++ b/libre/icedove-libre/replace-urls.txt
@@ -0,0 +1,25 @@
+# These are replaced in order, so if one is a subset of another, the smaller one should be last
+# These are whitespace-separated EREs, comments are lines starting with '#'
+
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/dictionaries/?(\?[^"']*)?   https://parabolagnulinux.org/packages/\?repo=Extra\&q=hunspell-
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/plugins/?(\?[^"']*)?        https://gnuzilla.gnu.org/plugins/
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/personas/?(\?[^"']*)?       https://www.gnu.org/software/gnuzilla/addons.html
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/recommended/?(\?[^"']*)?    https://www.gnu.org/software/gnuzilla/addons.html
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search-engines/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html#search%20engines
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search/?(\?[^"']*)?         https://www.gnu.org/software/gnuzilla/addons.html
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/themes/?(\?[^"']*)?         https://www.gnu.org/software/gnuzilla/addons.html#themes
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?"               https://www.gnu.org/software/gnuzilla/addons.html"
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?$               https://www.gnu.org/software/gnuzilla/addons.html
+
+https://addons.mozilla.org/firefox/collections/mozilla/webdeveloper/ https://www.gnu.org/software/gnuzilla/addons.html
+
+https?://services\.addons\.mozilla\.org/(%LOCALE%|@AB_CD@|en-US|ru)/([a-zA-Z%-]+)/  https://www.gnu.org/software/gnuzilla/addons.html#bogus-services.\2/
+
+https?://pfs\.mozilla\.org/plugins/PluginFinderService\.php             https://gnuzilla.gnu.org/plugins/PluginFinderService.php
+#https?://versioncheck\.addons\.mozilla\.org/update/VersionCheck\.php
+#https?://versioncheck-bg\.addons\.mozilla\.org/update/VersionCheck\.php
+
+"https?://addons\.mozilla\.org/" "https://www.gnu.org/software/gnuzilla/addons.html"
+
+# hack: these aren't URLs, per se
+(addonsBrowseAll\.description\s*=.*)addons\.mozilla\.org \1gnu.org/software/gnuzilla/addons.html
-- 
cgit v1.2.3-2-g168b


From d8ffaa75ea08b526f9f8140d52f8c4920ade5189 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 <emulatorman@lavabit.com>
Date: Mon, 15 Apr 2013 06:48:51 -0300
Subject: icedove-l10n-17.0.5.1-1: updating version

---
 libre/icedove-l10n/PKGBUILD | 116 ++++++++++++++++++++++----------------------
 1 file changed, 58 insertions(+), 58 deletions(-)

diff --git a/libre/icedove-l10n/PKGBUILD b/libre/icedove-l10n/PKGBUILD
index 5b102846c..f3135dc8b 100644
--- a/libre/icedove-l10n/PKGBUILD
+++ b/libre/icedove-l10n/PKGBUILD
@@ -2,8 +2,8 @@
 # Maintainer: André Silva <emulatorman@lavabit.com>
 
 pkgbase=icedove-l10n
-_pkgver=17.0.4
-pkgver=17.0.4.1
+_pkgver=17.0.5
+pkgver=17.0.5.1
 
 _langpacks=(ar ast be bg bn-BD br ca cs da de el en-GB en-US es-AR es-ES et eu fi fr fy-NL ga-IE gd gl he hr hu hy-AM id is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr uk vi zh-CN zh-TW)
 
@@ -11,7 +11,7 @@ pkgname=($(for lang in ${_langpacks[@]}
         do echo $pkgbase-$lang | tr A-Z a-z
         done))
 
-pkgrel=2
+pkgrel=1
 pkgdesc="Language packs for Debian Icedove."
 arch=('any')
 url="http://packages.debian.org/experimental/icedove"
@@ -64,58 +64,58 @@ done
 
 md5sums=('d5b2567a8cc8f64591f313a6efdaaffc'
          'f3719964e893c1002b7a923e8f95f923'
-         '206f1ef0917d6c072edef7e5d77a9ec6'
-         'dfcdea2b4ae57a3fa98a60fd1d90beff'
-         '25271fbc262c9379b7b9c04798d9a57e'
-         'cef8ef756ae9bd611d8c92435ce3d550'
-         'aee21b8e9835361d7fad9cabc26176ec'
-         '9cc55cfc826cfebdb52d471d4683e2ad'
-         'efb76f4fc5b66e6936a3a64ebb6a11b9'
-         '365ca3b65ec2ca0f6aba405172f909fc'
-         '02e296fa634c03dc1b8d71dd7c2e445f'
-         'e300d530881628b012e4071c5b1ac1e7'
-         '5bd79ebfb86e8939d480b49abd484370'
-         '09acd6af201f415d169b8019c0bb3929'
-         '9205fbc01cee7caf8578cd845596542a'
-         '7fd2672aa378a5c6b3d4d33eb71dff9d'
-         '8babeccaefc144d7798fb22446a72395'
-         '834b93522fb7875bc6fc3551d90a9b75'
-         'd690f9d0e0f3317ab500e711692c5684'
-         'bfe0b4a94a02e0ca8da411b58c17a5a1'
-         '4156b699bb0dbbf073893cbef96db478'
-         '1f8527f158f5bcacfde1e9b259769c14'
-         'c7fb6f52652ffeb7b7c09f27c73ee32b'
-         '6b57787b83b27a80c175b197d9a0fd8f'
-         '9a30b1017efa98e4c392a367341e7d5b'
-         '6e5d20da97211e9f72cc537327783f4d'
-         '0d0cd95f0e1765c1f56a39609533efa3'
-         '34773b8acd0e23d99918969a3a86159e'
-         'bc1b94e53e3f6d5e716ceb7d4979e278'
-         'bf577e83fc52e94164426d7a9dcc10b0'
-         '4328456c0a54334e020b643c37328eec'
-         '7232b4d0faf2f10f7fd6c7e05ef84d7a'
-         '11ada83816bcdea125dff74022acd715'
-         '0d6100971791dbac333cb24f8fa81c7b'
-         '685315fce2d77b64f58133d5d405200f'
-         'e5f15fc603190c6bb0a0cdfe6bf5e863'
-         'f2d4a099467f09b49f1bed06812d60d6'
-         '88b0177d8342a6aae79c1cba74e6c041'
-         'e19d3f90b9d41f9e7749875a1e2c037b'
-         '8e956438b49d548431728758206a101e'
-         '6597b2bbf2c9bf8af88d4b707400df24'
-         '794a9831d1f3c43156ec3f85f155f1e2'
-         '9b8e8f1fcc2bf891c1273b9470f95af5'
-         '7b423d358869c35dde53015f800e0dbd'
-         'a8258e8427d4961a509dc980f9a56986'
-         'f7be2a19d5046c5ec537b3248d0107b0'
-         '2d892a7f25a10d4607b76e2ce65743e5'
-         '6f2391fdfc198177f65c407ac3d10ce2'
-         '7e53185c09b5672f08573e3e96150ad1'
-         'fa4528be1f856b9f612af643ff2d1675'
-         '983b51b70b7e57a8bf3b956adc309f88'
-         'efc16a35ab9cff05473ff3e5f2cbf7ee'
-         'f9456837c567d422ac2e69fd72598089'
-         '9dcbf6fc85bfc768d784cb3bd764c103'
-         '302d409e53f598e830d8b180f108586e'
-         '5e21d7621b87a639c41c5fc6245203df'
-         '317e9a8bc1ca22a1f89d6898cca19500')
+         'ef463b3772f804beb4108e15917485fd'
+         '6125a2e91119afe4cd4fb78909bc2168'
+         '990067ee981db3bf9873e4bd9b2b1eba'
+         'e32d496230cba49a435775359d4485ce'
+         'd212d8bc244184e816cf36a9b654e7e6'
+         '4a83b506d1b81dfffa0b33bc0f12b24f'
+         '6349985a77b2db81a43cb22291bfd972'
+         'dd4a259bfa4ce6816c55e9d7ff7f1172'
+         'dc3ec06ccb5e98cfa332fca40af77470'
+         'e81e63d8fac6c61cbbe72b1c8b0ce05c'
+         'f0850f83f396c33a4e69abd00bda0e55'
+         'ffc5de6b5409cf7cdd411ae853e0ba05'
+         '169780df5d160a04221dd80c92dd131a'
+         '8d1eacb770748156dbe02e493c41a5a6'
+         'a3a0d856da6af722a6444567b684eb14'
+         '798415f06ce916eb6c84ea4cf97e1253'
+         'c8eefe6a65295d354beb59e8f1b3116e'
+         '3ec1490226e064bc1145072ecdf031b4'
+         'a3ff2959c9375084683b0741797103f9'
+         '99ea64506470bf7938e169bfe5f569b3'
+         '8170d58dcbb1b84820ef0ace6dc23965'
+         '24ba56f81446d551101d1848ed660682'
+         '53b9b22f7ad5916c8dfccd8b758828dc'
+         '0bdcd2f628dff58a4544e93a88344b76'
+         '87d516fbb68ae06d5ee7439a8a4d3d96'
+         'c3cfa07d55fec1eb558e11c63ebd2a97'
+         '9845802371f603cb70df77a63088c16d'
+         '552e297a315a1b6f308604da4b492c53'
+         'dc6755c33351b95f9e883c8e64fab7b6'
+         'f3a67c52f5c5ca8cd5484250617f1aff'
+         '48fc583c7e67e87113fb73243da46313'
+         '4450b7753336f279296260e444cb0ba2'
+         '3a639521e20e5fb936f6d1b7679becd9'
+         '241a29846743f4dbcd5704e470193f30'
+         '71d71192e076a889da26129efd5f2f3d'
+         'efc91beb8c199d459e1f24164066d75e'
+         'ed717c1b94618faa8304796f1ff0acd7'
+         '8fc0aea02c1373f0ac0b7fa7eac2fa0c'
+         '808c60d4af8ee7b6bbbd82a5079c293e'
+         '6f0e4c6fe66e6d0e98f2fc444b59d629'
+         'bc5e9972f5a092f4f28f577f7ade7ad7'
+         '2f852610ddc1550200965d4be6320879'
+         '6ad80cd433ef69c3577bfea9fd26cedc'
+         '0dd02b5317c9656c64543067956940bf'
+         '9e0d2f288130f048358135a89732ca85'
+         '936dbda4758d9a65f8c27603a2dee3bd'
+         '820d70ce31ca9731c162ab942b0daea1'
+         'd737350d9edb73c15096e867fbdd8f3c'
+         'b1896502d411dd6037f141d3561461d4'
+         '491a3a386c4963f162e050c370ffa140'
+         'aa9f4e83501e624e4054f3ff61b71db3'
+         '257ee623933cfda550a8643a1a0b1d1c'
+         'c3a8fa4fc511d914892e08fa17fab8a9'
+         '44be6381519c6c5ea785a4f5a5122a64'
+         '6693c752bf6272caed2e204556fc69b8')
-- 
cgit v1.2.3-2-g168b


From 4319352e70e610d431e6334b325dc9f1586ad47d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 <emulatorman@lavabit.com>
Date: Mon, 15 Apr 2013 07:45:50 -0300
Subject: icedove-libre-17.0.5.1-1: fixing PKGBUILD due that channel-prefs.js
 file was replaced by replace-urls.txt

---
 libre/icedove-libre/PKGBUILD | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD
index 43212c413..b16e32620 100644
--- a/libre/icedove-libre/PKGBUILD
+++ b/libre/icedove-libre/PKGBUILD
@@ -106,9 +106,6 @@ package() {
 
   install -Dm644 "${srcdir}/vendor.js" "${pkgdir}/usr/lib/${_pkgname}/defaults/preferences/vendor.js"
 
-  # Recommend free addons
-  install -m644 "${srcdir}/channel-prefs.js" "${pkgdir}/usr/lib/${_pkgname}/defaults/pref/channel-prefs.js"
-
   for i in 16x16 22x22 24x24 32x32 48x48 64x64 128x128 256x256; do
       install -Dm644 "debian/app-icons/${_pkgname}${i/x*/}.png" "${pkgdir}/usr/share/icons/hicolor/$i/apps/${_pkgname}.png"
   done
-- 
cgit v1.2.3-2-g168b


From e6ae96ab0320ff1ea91b78dd2c1d5ed337107a31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 <emulatorman@lavabit.com>
Date: Tue, 16 Apr 2013 09:01:02 -0300
Subject: pandoc: updating md5sums

---
 pcr/pandoc/PKGBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pcr/pandoc/PKGBUILD b/pcr/pandoc/PKGBUILD
index 5698ac14f..5226b9485 100644
--- a/pcr/pandoc/PKGBUILD
+++ b/pcr/pandoc/PKGBUILD
@@ -89,4 +89,4 @@ package() {
 }
 md5sums=('74acd042fcd85bee9edb093cc3fe5c2e'
          'SKIP'
-         '0d5b6d7adf6fdcea52dcbb7b62368b19')
+         'ee9d5924632ac07b5049be834a1ed054')
-- 
cgit v1.2.3-2-g168b