From bcd843e0fcdd22e2020050872193785d688b7f6aff9f3276ae080fa74fbcb6bb Mon Sep 17 00:00:00 2001 From: Andreas Stieger Date: Thu, 9 Apr 2015 13:22:04 +0000 Subject: [PATCH] Accepting request 295162 from home:AndreasStieger:branches:devel:tools afl 1.60b OBS-URL: https://build.opensuse.org/request/show/295162 OBS-URL: https://build.opensuse.org/package/show/devel:tools/afl?expand=0&rev=8 --- afl-1.46b-nodate.patch | 82 +++++++++++++++++++++--------------------- afl-1.58b.tgz | 3 -- afl-1.60b.tgz | 3 ++ afl.changes | 21 +++++++++++ afl.spec | 2 +- 5 files changed, 66 insertions(+), 45 deletions(-) delete mode 100644 afl-1.58b.tgz create mode 100644 afl-1.60b.tgz diff --git a/afl-1.46b-nodate.patch b/afl-1.46b-nodate.patch index c86d9f2..de9483d 100644 --- a/afl-1.46b-nodate.patch +++ b/afl-1.46b-nodate.patch @@ -1,8 +1,8 @@ -Index: afl-1.46b/afl-as.c +Index: afl-1.60b/afl-as.c =================================================================== ---- afl-1.46b.orig/afl-as.c -+++ afl-1.46b/afl-as.c -@@ -450,8 +450,7 @@ int main(int argc, char** argv) { +--- afl-1.60b.orig/afl-as.c ++++ afl-1.60b/afl-as.c +@@ -471,8 +471,7 @@ int main(int argc, char** argv) { if (isatty(2) && !getenv("AFL_QUIET")) { @@ -12,11 +12,11 @@ Index: afl-1.46b/afl-as.c } else be_quiet = 1; -Index: afl-1.46b/afl-fuzz.c +Index: afl-1.60b/afl-fuzz.c =================================================================== ---- afl-1.46b.orig/afl-fuzz.c -+++ afl-1.46b/afl-fuzz.c -@@ -6762,8 +6762,7 @@ int main(int argc, char** argv) { +--- afl-1.60b.orig/afl-fuzz.c ++++ afl-1.60b/afl-fuzz.c +@@ -6859,8 +6859,7 @@ int main(int argc, char** argv) { char** use_argv; @@ -26,10 +26,10 @@ Index: afl-1.46b/afl-fuzz.c doc_path = access(DOC_PATH, F_OK) ? "docs" : DOC_PATH; -Index: afl-1.46b/afl-gcc.c +Index: afl-1.60b/afl-gcc.c =================================================================== ---- afl-1.46b.orig/afl-gcc.c -+++ afl-1.46b/afl-gcc.c +--- afl-1.60b.orig/afl-gcc.c ++++ afl-1.60b/afl-gcc.c @@ -276,8 +276,7 @@ int main(int argc, char** argv) { if (isatty(2) && !getenv("AFL_QUIET")) { @@ -40,10 +40,10 @@ Index: afl-1.46b/afl-gcc.c } else be_quiet = 1; -Index: afl-1.46b/afl-gotcpu.c +Index: afl-1.60b/afl-gotcpu.c =================================================================== ---- afl-1.46b.orig/afl-gotcpu.c -+++ afl-1.46b/afl-gotcpu.c +--- afl-1.60b.orig/afl-gotcpu.c ++++ afl-1.60b/afl-gotcpu.c @@ -77,8 +77,7 @@ int main(int argc, char** argv) { s32 loop_repeats = 0, util_perc; u64 st_t, en_t, st_c, en_c, real_delta, slice_delta; @@ -54,11 +54,11 @@ Index: afl-1.46b/afl-gotcpu.c /* Run a busy loop for CTEST_TARGET_MS. */ -Index: afl-1.46b/afl-showmap.c +Index: afl-1.60b/afl-showmap.c =================================================================== ---- afl-1.46b.orig/afl-showmap.c -+++ afl-1.46b/afl-showmap.c -@@ -412,8 +412,7 @@ static void detect_file_args(char** argv +--- afl-1.60b.orig/afl-showmap.c ++++ afl-1.60b/afl-showmap.c +@@ -416,8 +416,7 @@ static void detect_file_args(char** argv static void show_banner(void) { @@ -68,11 +68,11 @@ Index: afl-1.46b/afl-showmap.c } -Index: afl-1.46b/afl-tmin.c +Index: afl-1.60b/afl-tmin.c =================================================================== ---- afl-1.46b.orig/afl-tmin.c -+++ afl-1.46b/afl-tmin.c -@@ -834,8 +834,7 @@ int main(int argc, char** argv) { +--- afl-1.60b.orig/afl-tmin.c ++++ afl-1.60b/afl-tmin.c +@@ -899,8 +899,7 @@ int main(int argc, char** argv) { doc_path = access(DOC_PATH, F_OK) ? "docs" : DOC_PATH; @@ -82,31 +82,31 @@ Index: afl-1.46b/afl-tmin.c while ((opt = getopt(argc,argv,"+i:o:f:m:t:xeQ")) > 0) -Index: afl-1.46b/experimental/arm_support/afl-as.c +Index: afl-1.60b/llvm_mode/afl-clang-fast.c =================================================================== ---- afl-1.46b.orig/experimental/arm_support/afl-as.c -+++ afl-1.46b/experimental/arm_support/afl-as.c -@@ -241,8 +241,7 @@ int main(int argc, char** argv) { - struct timeval tv; - struct timezone tz; +--- afl-1.60b.orig/llvm_mode/afl-clang-fast.c ++++ afl-1.60b/llvm_mode/afl-clang-fast.c +@@ -194,8 +194,7 @@ int main(int argc, char** argv) { -- SAYF(cCYA "afl-as " cBRI VERSION cNOR " (" __DATE__ " " __TIME__ -- ") by \n"); -+ SAYF(cCYA "afl-as " cBRI VERSION cNOR " by \n"); + if (isatty(2) && !getenv("AFL_QUIET")) { - if (argc < 2) { +- SAYF(cCYA "afl-clang-fast " cBRI VERSION cRST " (" __DATE__ " " __TIME__ +- ") by \n"); ++ SAYF(cCYA "afl-clang-fast " cBRI VERSION cRST " by \n"); -Index: afl-1.46b/experimental/arm_support/afl-gcc.c + } + +Index: afl-1.60b/llvm_mode/afl-llvm-pass.so.cc =================================================================== ---- afl-1.46b.orig/experimental/arm_support/afl-gcc.c -+++ afl-1.46b/experimental/arm_support/afl-gcc.c -@@ -169,8 +169,7 @@ static void edit_params(u32 argc, char** +--- afl-1.60b.orig/llvm_mode/afl-llvm-pass.so.cc ++++ afl-1.60b/llvm_mode/afl-llvm-pass.so.cc +@@ -77,8 +77,7 @@ bool AFLCoverage::runOnModule(Module &M) - int main(int argc, char** argv) { + if (isatty(2) && !getenv("AFL_QUIET")) { -- SAYF(cCYA "afl-gcc " cBRI VERSION cNOR " (" __DATE__ " " __TIME__ -- ") by \n"); -+ SAYF(cCYA "afl-gcc " cBRI VERSION cNOR " by \n"); +- SAYF(cCYA "afl-llvm-pass " cBRI VERSION cRST " (" __DATE__ " " __TIME__ +- ") by \n"); ++ SAYF(cCYA "afl-llvm-pass " cBRI VERSION cRST " by \n"); - if (argc < 2) { + } else be_quiet = 1; diff --git a/afl-1.58b.tgz b/afl-1.58b.tgz deleted file mode 100644 index 17d1f8d..0000000 --- a/afl-1.58b.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8d5ed2c5ade69e3eab4a8fa10fb73cf72966dfda45a7b458d62bc5d4497defeb -size 785211 diff --git a/afl-1.60b.tgz b/afl-1.60b.tgz new file mode 100644 index 0000000..c2f32f0 --- /dev/null +++ b/afl-1.60b.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:af541b9f43ec410569a12d9ddec8943278bf92171f1ccc958be2d59f14ba9e14 +size 787796 diff --git a/afl.changes b/afl.changes index 87e5837..2b9afa9 100644 --- a/afl.changes +++ b/afl.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Thu Apr 9 13:12:37 UTC 2015 - astieger@suse.com + +- afl 1.60b: + * Allowed experimental/llvm_instrumentation/ to graduate to llvm_mode/. + * Removed experimental/arm_support/, since it's completely broken and likely + unnecessary with LLVM support in place. + * Added ASAN cgroups script to experimental/asan_cgroups/, updated existing + docs. Courtesy Sam Hakim and David A. Wheeler. + * Refactored afl-tmin to reduce the number of execs in common use cases. + Ideas from Jonathan Neuschafer and Turo Lamminen. + * Added a note about CLAs at the bottom of README. + * Renamed testcases_readme.txt to README.testcases for some semblance of + consistency. + * Made assorted updates to docs. +- includes changes from 1.59b + * Imported Laszlo Szekeres' experimental LLVM instrumentation into + experimental/llvm_instrumentation. I'll work on including it in the + "mainstream" version soon. +- updates afl-1.46b-nodate.patch + ------------------------------------------------------------------- Fri Mar 27 20:26:35 UTC 2015 - astieger@suse.com diff --git a/afl.spec b/afl.spec index 278b659..4fd1783 100644 --- a/afl.spec +++ b/afl.spec @@ -17,7 +17,7 @@ Name: afl -Version: 1.58b +Version: 1.60b Release: 0 Summary: American fuzzy lop is a security-oriented fuzzer License: Apache-2.0