diff --git a/.gitignore b/.gitignore index f659124..5667540 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /afl-0.50b.tgz +/afl-0.78b.tgz diff --git a/afl-0.50b-override-cflags.patch b/afl-0.50b-override-cflags.patch deleted file mode 100644 index 65b38ef..0000000 --- a/afl-0.50b-override-cflags.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- afl-0.50b.old/Makefile 2014-11-16 16:16:11.000000000 +0000 -+++ afl-0.50b/Makefile 2014-11-16 16:19:13.328069379 +0000 -@@ -21,7 +21,7 @@ - - PROGS = afl-gcc afl-as afl-fuzz afl-showmap - --CFLAGS += -O3 -Wall -D_FORTIFY_SOURCE=2 -g -Wno-pointer-sign \ -+override CFLAGS += -O3 -Wall -D_FORTIFY_SOURCE=2 -g -Wno-pointer-sign \ - -DAFL_PATH=\"$(HELPER_PATH)\" -DVERSION=\"$(VERSION)\" - - ifneq "$(HOSTNAME)" "raccoon" diff --git a/afl-0.78b-override-cflags.patch b/afl-0.78b-override-cflags.patch new file mode 100644 index 0000000..9f96cf7 --- /dev/null +++ b/afl-0.78b-override-cflags.patch @@ -0,0 +1,12 @@ +diff -Naur afl-0.78b.orig/Makefile afl-0.78b/Makefile +--- afl-0.78b.orig/Makefile 2014-11-30 07:42:28.000000000 +0000 ++++ afl-0.78b/Makefile 2014-11-30 11:14:43.260885236 +0000 +@@ -25,7 +25,7 @@ + PROGS = afl-gcc afl-as afl-fuzz afl-showmap + + CFLAGS ?= -O3 -funroll-loops +-CFLAGS += -Wall -D_FORTIFY_SOURCE=2 -g -Wno-pointer-sign \ ++override CFLAGS += -Wall -D_FORTIFY_SOURCE=2 -g -Wno-pointer-sign \ + -DAFL_PATH=\"$(HELPER_PATH)\" -DDOC_PATH=\"$(DOC_PATH)\" \ + -DVERSION=\"$(VERSION)\" + diff --git a/american-fuzzy-lop.spec b/american-fuzzy-lop.spec index 97fb2f6..9b38bf8 100644 --- a/american-fuzzy-lop.spec +++ b/american-fuzzy-lop.spec @@ -1,6 +1,6 @@ Name: american-fuzzy-lop -Version: 0.50b -Release: 2%{?dist} +Version: 0.78b +Release: 1%{?dist} Summary: Practical, instrumentation-driven fuzzer for binary formats @@ -10,7 +10,7 @@ URL: http://lcamtuf.coredump.cx/afl/ Source0: http://lcamtuf.coredump.cx/afl/releases/afl-%{version}.tgz # Allow CFLAGS to be appended. -Patch1: afl-0.50b-override-cflags.patch +Patch1: afl-0.78b-override-cflags.patch # Upstream includes armv7hl support as some non-integrated 'contrib' # files, so I have not enabled it here. No other arch is supported @@ -59,27 +59,24 @@ This subpackage contains clang and clang++ support for %build -make %{_smp_mflags} \ - CFLAGS="%{optflags}" \ - BIN_PATH=%{_bindir} \ - HELPER_PATH=%{afl_helper_path} \ - all +%make_build \ + CFLAGS="%{optflags}" \ + PREFIX=%{_prefix} \ + HELPER_PATH=%{afl_helper_path} \ + DOC_PATH=%{_pkgdocdir} %install -mkdir -p $RPM_BUILD_ROOT%{_bindir} -mkdir -p $RPM_BUILD_ROOT%{afl_helper_path} -make \ - BIN_PATH=$RPM_BUILD_ROOT%{_bindir} \ - HELPER_PATH=$RPM_BUILD_ROOT%{afl_helper_path} \ - install +%make_install \ + PREFIX=%{_prefix} \ + HELPER_PATH=%{afl_helper_path} \ + DOC_PATH=%{_pkgdocdir} \ + MISC_PATH=%{_pkgdocdir} %files %doc docs/* -%doc experimental/crash_triage -%doc experimental/distributed_fuzzing -%doc experimental/minimization_script +%doc experimental/ %{_bindir}/afl-fuzz %{_bindir}/afl-gcc %{_bindir}/afl-g++ @@ -96,6 +93,9 @@ make \ %changelog +* Sun Nov 30 2014 Pádraig Brady - 0.78b-1 +- Latest upstream + * Mon Nov 17 2014 Richard W.M. Jones - 0.50b-2 - Don't use epoch in requires. diff --git a/sources b/sources index dd4687e..c668788 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -965976f1dcb31723250a29e59f95b202 afl-0.50b.tgz +15bd943db1174f50125023c322656034 afl-0.78b.tgz