diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-04-25 21:33:33 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-04-25 21:33:33 +0200 |
| commit | fba28f19754f62b5227650143d5441fc86d4c7d7 (patch) | |
| tree | 26629d73f83543ff92a060fd7b310bb748b13173 /security/nss/fuzz/config | |
| parent | b4154e043bfc0d2f301d88304efc896989d650bf (diff) | |
| download | UXP-fba28f19754f62b5227650143d5441fc86d4c7d7.tar UXP-fba28f19754f62b5227650143d5441fc86d4c7d7.tar.gz UXP-fba28f19754f62b5227650143d5441fc86d4c7d7.tar.lz UXP-fba28f19754f62b5227650143d5441fc86d4c7d7.tar.xz UXP-fba28f19754f62b5227650143d5441fc86d4c7d7.zip | |
Revert "Update NSS to 3.35-RTM"
This reverts commit f1a0f0a56fdd0fc39f255174ce08c06b91c66c94.
Diffstat (limited to 'security/nss/fuzz/config')
| -rw-r--r-- | security/nss/fuzz/config/clone_libfuzzer.sh | 2 | ||||
| -rw-r--r-- | security/nss/fuzz/config/git-copy.sh | 27 |
2 files changed, 14 insertions, 15 deletions
diff --git a/security/nss/fuzz/config/clone_libfuzzer.sh b/security/nss/fuzz/config/clone_libfuzzer.sh index c516057d7..f1dc2e14b 100644 --- a/security/nss/fuzz/config/clone_libfuzzer.sh +++ b/security/nss/fuzz/config/clone_libfuzzer.sh @@ -1,6 +1,6 @@ #!/bin/sh -LIBFUZZER_REVISION=6937e68f927b6aefe526fcb9db8953f497e6e74d +LIBFUZZER_REVISION=56bd1d43451cca4b6a11d3be316bb77ab159b09d d=$(dirname $0) $d/git-copy.sh https://chromium.googlesource.com/chromium/llvm-project/llvm/lib/Fuzzer $LIBFUZZER_REVISION $d/../libFuzzer diff --git a/security/nss/fuzz/config/git-copy.sh b/security/nss/fuzz/config/git-copy.sh index a9e817e2a..a5c7d371d 100644 --- a/security/nss/fuzz/config/git-copy.sh +++ b/security/nss/fuzz/config/git-copy.sh @@ -7,18 +7,18 @@ if [ $# -lt 3 ]; then exit 2 fi -REPO="$1" -COMMIT="$2" -DIR="$3" +REPO=$1 +COMMIT=$2 +DIR=$3 echo "Copy '$COMMIT' from '$REPO' to '$DIR'" -if [ -f "$DIR"/.git-copy ]; then - CURRENT=$(cat "$DIR"/.git-copy) - if [ $(echo -n "$COMMIT" | wc -c) != "40" ]; then +if [ -f $DIR/.git-copy ]; then + CURRENT=$(cat $DIR/.git-copy) + if [ $(echo -n $COMMIT | wc -c) != "40" ]; then # On the off chance that $COMMIT is a remote head. - ACTUAL=$(git ls-remote "$REPO" "$COMMIT" | cut -c 1-40 -) + ACTUAL=$(git ls-remote $REPO $COMMIT | cut -c 1-40 -) else - ACTUAL="$COMMIT" + ACTUAL=$COMMIT fi if [ "$CURRENT" = "$ACTUAL" ]; then echo "Up to date." @@ -26,9 +26,8 @@ if [ -f "$DIR"/.git-copy ]; then fi fi -rm -rf "$DIR" -git init -q "$DIR" -git -C "$DIR" fetch -q --depth=1 "$REPO" "$COMMIT":git-copy-tmp -git -C "$DIR" reset --hard git-copy-tmp -git -C "$DIR" rev-parse --verify HEAD > "$DIR"/.git-copy -rm -rf "$DIR"/.git +git init -q $DIR +git -C $DIR fetch -q --depth=1 $REPO $COMMIT:git-copy-tmp +git -C $DIR reset --hard git-copy-tmp +git -C $DIR rev-parse --verify HEAD > $DIR/.git-copy +rm -rf $DIR/.git |