Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e15bac8f76a7
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 551aecfa833d
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Nov 16, 2018

  1. tmpdir audit: only fail with files referenced below (#35068) 

    On Linux the `$TMPDIR` is `/build`. The TMPDIR audit looks for `$TMPDIR`
in the build output, which will then fail with packages like
/buildkite-agent.

This fixes the heuristic to look for `$TMPDIR/` instead.
    @zimbatm
    zimbatm authored Nov 16, 2018
    1
    Copy the full SHA
    551aecf View commit details
Showing with 5 additions and 5 deletions.
  1. +5 −5 pkgs/build-support/setup-hooks/audit-tmpdir.sh
10 changes: 5 additions & 5 deletions pkgs/build-support/setup-hooks/audit-tmpdir.sh
View file
Original file line number Diff line number Diff line change
@@ -13,23 +13,23 @@ auditTmpdir() {
local dir="$1"
[ -e "$dir" ] || return 0

header "checking for references to $TMPDIR in $dir..."
header "checking for references to $TMPDIR/ in $dir..."

local i
while IFS= read -r -d $'\0' i; do
if [[ "$i" =~ .build-id ]]; then continue; fi

if isELF "$i"; then
if patchelf --print-rpath "$i" | grep -q -F "$TMPDIR"; then
echo "RPATH of binary $i contains a forbidden reference to $TMPDIR"
if patchelf --print-rpath "$i" | grep -q -F "$TMPDIR/"; then
echo "RPATH of binary $i contains a forbidden reference to $TMPDIR/"
exit 1
fi
fi

if isScript "$i"; then
if [ -e "$(dirname "$i")/.$(basename "$i")-wrapped" ]; then
if grep -q -F "$TMPDIR" "$i"; then
echo "wrapper script $i contains a forbidden reference to $TMPDIR"
if grep -q -F "$TMPDIR/" "$i"; then
echo "wrapper script $i contains a forbidden reference to $TMPDIR/"
exit 1
fi
fi