sysutils/fakeroot/patches/patch-aa

   1 $NetBSD$
   2
   3 --- scripts/fakeroot.in.orig    2005-11-07 02:51:40.000000000 +0100
   4 +++ scripts/fakeroot.in
   5 @@ -19,7 +19,7 @@ PREFIX=@prefix@
   6  BINDIR=@bindir@
   7
   8  LIB=lib@fakeroot_transformed@.so
   9 -PATHS=@libdir@:${PREFIX}/lib64/libfakeroot:${PREFIX}/lib32/libfakeroot
  10 +PATHS=@libdir@:${PREFIX}/lib64:${PREFIX}/lib32
  11  FAKED=${BINDIR}/@faked_transformed@
  12
  13  FAKED_MODE="unknown-is-root"
  14 @@ -101,8 +101,10 @@ then
  15         if test -r "$dir/$LIB"
  16         then
  17             libfound=yes
  18 +           uselib=$dir/$LIB
  19         fi
  20      done
  21 +    LIB=$uselib
  22  else
  23      if test -r "$LIB"
  24      then
  25 @@ -132,11 +134,7 @@ if test -z "$FAKEROOTKEY" || test -z "$P
  26    exit 1
  27  fi
  28
  29 -# Keep other library paths
  30 -if test -n "$LD_LIBRARY_PATH"; then
  31 -  PATHS="$PATHS:$LD_LIBRARY_PATH"
  32 -fi
  33 -# ...and preloaded libs
  34 +# Keep preloaded libs
  35  if test -n "$LD_PRELOAD"; then
  36    LIB="$LIB $LD_PRELOAD"
  37  fi
  38 @@ -144,10 +142,10 @@ fi
  39  export FAKEROOT_FD_BASE
  40
  41  if test -z "$*"; then
  42 -  FAKEROOTKEY=$FAKEROOTKEY LD_LIBRARY_PATH="$PATHS" LD_PRELOAD="$LIB" ${SHELL:-/bin/sh}
  43 +  FAKEROOTKEY=$FAKEROOTKEY LD_PRELOAD="$LIB" ${SHELL:-/bin/sh}
  44    RESULT=$?
  45  else
  46 -  FAKEROOTKEY=$FAKEROOTKEY LD_LIBRARY_PATH="$PATHS" LD_PRELOAD="$LIB" "$@"
  47 +  FAKEROOTKEY=$FAKEROOTKEY LD_PRELOAD="$LIB" "$@"
  48    RESULT=$?
  49  fi
  50