diff --git a/srcpkgs/fakeroot/patches/busybox_compat_force_abslibpath.patch b/srcpkgs/fakeroot/patches/busybox_compat_force_abslibpath.patch new file mode 100644 index 00000000000..3637978d503 --- /dev/null +++ b/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 "$@"` diff --git a/srcpkgs/fakeroot/patches/busybox_getopt_compat.diff b/srcpkgs/fakeroot/patches/busybox_getopt_compat.diff deleted file mode 100644 index e83dacd3025..00000000000 --- a/srcpkgs/fakeroot/patches/busybox_getopt_compat.diff +++ /dev/null @@ -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 "$@"` diff --git a/srcpkgs/fakeroot/template b/srcpkgs/fakeroot/template index f6af43afffc..70f8422e426 100644 --- a/srcpkgs/fakeroot/template +++ b/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"