Merge remote-tracking branch 'x/master'

* x/master:
  fakeroot: force absolute path for LD_PRELOAD.
  xbps-casper: remove unexistent/unused modules.

srcpkgs/fakeroot/patches/busybox_compat_force_abslibpath.patch

@@ -0,0 +1,23 @@
+- Always force absolute path for LD_PRELOAD.
+- Make getopt test work with busybox implementation.
+
+--- scripts/fakeroot.in.orig	2011-12-01 05:00:36.000000000 +0100
++++ scripts/fakeroot.in	2012-02-01 16:04:04.707499043 +0100
+@@ -33,7 +33,7 @@ fatal ()
+ FAKEROOT_PREFIX=@prefix@
+ FAKEROOT_BINDIR=@bindir@
+ 
+-USEABSLIBPATH=@LDPRELOADABS@
++USEABSLIBPATH=1
+ LIB=lib@fakeroot_transformed@@DLSUFFIX@
+ PATHS=@libdir@:${FAKEROOT_PREFIX}/lib64/libfakeroot:${FAKEROOT_PREFIX}/lib32/libfakeroot
+ FAKED=${FAKEROOT_BINDIR}/@faked_transformed@
+@@ -43,7 +43,7 @@ export FAKED_MODE
+ 
+ libfound=no
+ 
+-GETOPTEST=`getopt --version`
++GETOPTEST=`getopt --version 2>/dev/null`
+ case $GETOPTEST in
+ getopt*) # GNU getopt
+     FAKE_TEMP=`getopt -l lib: -l faked: -l unknown-is-real -l fd-base: -l version -l help -- +l:f:i:s:ub:vh "$@"`

srcpkgs/fakeroot/patches/busybox_getopt_compat.diff

@@ -1,11 +0,0 @@
---- scripts/fakeroot.in.orig	2010-01-15 20:06:08.160073189 +0100
-+++ scripts/fakeroot.in	2010-01-15 20:06:19.679197650 +0100
-@@ -43,7 +43,7 @@ export FAKED_MODE
- 
- libfound=no
- 
--GETOPTEST=`getopt --version`
-+GETOPTEST=`getopt --version 2>/dev/null`
- case $GETOPTEST in
- getopt*) # GNU getopt
-     FAKE_TEMP=`getopt -l lib: -l faked: -l unknown-is-real -l fd-base: -l version -l help -- +l:f:i:s:ub:vh "$@"`

srcpkgs/fakeroot/template

@@ -1,6 +1,7 @@
 # Template file for 'fakeroot'
 pkgname=fakeroot
 version=1.18.2
+revision=1
 distfiles="${DEBIAN_SITE}/main/f/fakeroot/${pkgname}_${version}.orig.tar.bz2"
 build_style=gnu-configure
 configure_args="--disable-static"

srcpkgs/xbps-casper/files/hooks/casper

@@ -19,7 +19,6 @@ esac
 . ${ROOTDIR}/usr/share/initramfs-tools/hook-functions
 
 manual_add_modules unionfs
-manual_add_modules aufs
 
 # We need losetup
 copy_exec ${ROOTDIR}/sbin/losetup /sbin
@@ -52,7 +51,6 @@ manual_add_modules nls_iso8859-1
 
 # cdrom modules
 manual_add_modules sr_mod
-manual_add_modules ide-cd
 manual_add_modules sbp2
 manual_add_modules ohci1394
 

srcpkgs/xbps-casper/template

@@ -1,10 +1,11 @@
 # Template file for 'xbps-casper'
 pkgname=xbps-casper
-_localver=0.23	# XBPS package version
+_localver=0.24	# XBPS package version
 _distver=1.236	# This should match the upstream (Ubuntu) version
 version=${_localver}.${_distver}
 short_desc="Run a live preinstalled system from read-only media"
 maintainer="Juan RP <xtraeme@gmail.com>"
+license="GPL-2"
 long_desc="
  $pkgname is a modified version of Ubuntu's casper, that is able
  to run a live pre-installed system from read-only media."