diff -Nru afl-1.96b/debian/afl-doc.install afl-1.96b/debian/afl-doc.install --- afl-1.96b/debian/afl-doc.install 1970-01-01 00:00:00.000000000 +0000 +++ afl-1.96b/debian/afl-doc.install 2016-02-02 04:53:42.000000000 +0000 @@ -0,0 +1,4 @@ +/usr/share/afl +/usr/share/doc/afl/* /usr/share/doc/afl-doc/docs +experimental/ /usr/share/doc/afl-doc +docs/vuln_samples /usr/share/doc/afl-doc diff -Nru afl-1.96b/debian/afl-doc.lintian-overrides afl-1.96b/debian/afl-doc.lintian-overrides --- afl-1.96b/debian/afl-doc.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ afl-1.96b/debian/afl-doc.lintian-overrides 2016-02-02 04:44:27.000000000 +0000 @@ -0,0 +1,18 @@ +# crafted test-case +arch-dependent-file-in-usr-share usr/share/afl/testcases/* +# crafted test-case +statically-linked-binary usr/share/afl/testcases/* +# crafted test-case, timestamp not updated at build time; see also bug #762105 +package-contains-timestamped-gzip usr/share/afl/testcases/*.gz +# crafted test-case +arch-dependent-file-in-usr-share usr/share/doc/afl-doc/vuln_samples/* +# crafted test-case +statically-linked-binary usr/share/doc/afl-doc/vuln_samples/* +# false positive; the included HTML file is not documentation +possible-documentation-but-no-doc-base-registration +# crafted test-case +arch-independent-package-contains-binary-or-object usr/share/afl/testcases/archives/common/ar/small_archive.a +# crafted test-case +arch-independent-package-contains-binary-or-object usr/share/afl/testcases/others/elf/*.elf +# vulnerability sample +arch-independent-package-contains-binary-or-object usr/share/doc/afl-doc/vuln_samples/*.elf diff -Nru afl-1.96b/debian/afl.install afl-1.96b/debian/afl.install --- afl-1.96b/debian/afl.install 2016-01-08 19:43:48.000000000 +0000 +++ afl-1.96b/debian/afl.install 2016-02-02 04:00:26.000000000 +0000 @@ -9,5 +9,3 @@ /usr/bin/afl-whatsup /usr/lib/afl/afl-as /usr/lib/afl/as -/usr/share/afl -/usr/share/doc/afl diff -Nru afl-1.96b/debian/afl.NEWS afl-1.96b/debian/afl.NEWS --- afl-1.96b/debian/afl.NEWS 1970-01-01 00:00:00.000000000 +0000 +++ afl-1.96b/debian/afl.NEWS 2016-02-02 04:50:51.000000000 +0000 @@ -0,0 +1,6 @@ +afl (1.96b-2) unstable; urgency=medium + + The documentation, testcases, vulnerability samples and + experimental stuff is now to be found in the package afl-doc. + + -- Daniel Stender Tue, 02 Feb 2016 05:49:57 +0100 diff -Nru afl-1.96b/debian/changelog afl-1.96b/debian/changelog --- afl-1.96b/debian/changelog 2016-02-01 23:11:11.000000000 +0000 +++ afl-1.96b/debian/changelog 2016-02-18 11:08:25.000000000 +0000 @@ -1,3 +1,23 @@ +afl (1.96b-2) unstable; urgency=medium + + * Build with doc package: + + added package description to deb/control. + + added deb/afl-doc.install. + + removed items from deb/afl.install. + + moved lintian-overrides to afl-doc.lintian-overrides, updated. + + deb/rules: use dh_installdocs to contribute README, strip it from + DOC_PATH in dh_auto_build override; spare doc package from buildinfo. + * deb/control: + + bumped standards to 3.9.7 (regarded changes in 12.3). + + put Architecture fields upward. + * deb/rules: + + added DEB_BUILD_MAINT_OPTIONS with hardening=+all (for PIE and BINDNOW). + + add README to excludes for dh_compress (Closes: #813503). + * deb/changelog: + + expanded copyright span. + + -- Daniel Stender Thu, 18 Feb 2016 12:08:19 +0100 + afl (1.96b-1) unstable; urgency=medium * New upstream release. diff -Nru afl-1.96b/debian/control afl-1.96b/debian/control --- afl-1.96b/debian/control 2016-02-01 22:49:14.000000000 +0000 +++ afl-1.96b/debian/control 2016-02-02 11:22:54.000000000 +0000 @@ -7,12 +7,13 @@ debhelper (>= 9), dh-buildinfo, llvm-3.6-dev -Standards-Version: 3.9.6 +Standards-Version: 3.9.7 Homepage: http://lcamtuf.coredump.cx/afl/ Vcs-Git: https://anonscm.debian.org/git/collab-maint/afl.git Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/afl.git Package: afl +Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} @@ -20,8 +21,8 @@ afl-clang, g++, gcc, - gnuplot -Architecture: any + gnuplot, + afl-doc Description: instrumentation-driven fuzzer for binary formats American fuzzy lop is a fuzzer that employs compile-time instrumentation and genetic algorithms to automatically discover clean, interesting test cases @@ -36,20 +37,40 @@ common image parsing or file compression libraries. Package: afl-clang +Architecture: any Depends: afl (= ${binary:Version}), clang-3.6, ${clang:Depends}, ${misc:Depends}, ${shlibs:Depends} +Recommends: + afl-doc Breaks: afl (<< 1.72b) Replaces: afl (<< 1.72b) -Architecture: any Description: instrumentation-driven fuzzer for binary formats - clang support American fuzzy lop is a fuzzer that employs compile-time instrumentation and genetic algorithms to automatically discover clean, interesting test cases that trigger new internal states in the targeted binary. . This package provides support for the clang compiler. + +Package: afl-doc +Architecture: all +Section: doc +Depends: + ${misc:Depends} +Recommends: + afl, + afl-clang +Breaks: + afl (<= 1.96b-1) +Description: instrumentation-driven fuzzer for binary formats - documentation + American fuzzy lop is a fuzzer that employs compile-time instrumentation and + genetic algorithms to automatically discover clean, interesting test cases + that trigger new internal states in the targeted binary. + . + This package provides the documentation, a collection of special crafted test + cases, vulnerability samples and experimental stuff. diff -Nru afl-1.96b/debian/copyright afl-1.96b/debian/copyright --- afl-1.96b/debian/copyright 2016-01-08 19:43:48.000000000 +0000 +++ afl-1.96b/debian/copyright 2016-02-02 03:47:37.000000000 +0000 @@ -9,7 +9,7 @@ Files: debian/* Copyright: 2014-2015 Jakub Wilk - 2015 Daniel Stender + 2015-2016 Daniel Stender License: Apache-2.0 License: Apache-2.0 diff -Nru afl-1.96b/debian/lintian-overrides afl-1.96b/debian/lintian-overrides --- afl-1.96b/debian/lintian-overrides 2016-01-08 19:43:48.000000000 +0000 +++ afl-1.96b/debian/lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -# crafted test-case -arch-dependent-file-in-usr-share usr/share/afl/testcases/* -# crafted test-case -statically-linked-binary usr/share/afl/testcases/* -# crafted test-case, timestamp not updated at build time; see also bug #762105 -package-contains-timestamped-gzip usr/share/afl/testcases/*.gz -# crafted test-case -arch-dependent-file-in-usr-share usr/share/doc/afl/vuln_samples/* -# crafted test-case -binary-from-other-architecture usr/share/doc/afl/vuln_samples/*.elf -# crafted test-case -statically-linked-binary usr/share/doc/afl/vuln_samples/* -# false positive; the included HTML file is not documentation -possible-documentation-but-no-doc-base-registration diff -Nru afl-1.96b/debian/rules afl-1.96b/debian/rules --- afl-1.96b/debian/rules 2016-02-01 22:49:14.000000000 +0000 +++ afl-1.96b/debian/rules 2016-02-18 11:05:06.000000000 +0000 @@ -1,6 +1,8 @@ #!/usr/bin/make -f #export DH_VERBOSE=1 +export DEB_BUILD_MAINT_OPTIONS = hardening=+all + # Support for -fstack-protector in clang is broken on some architectures; # see bug #785365. ifneq "$(filter kfreebsd-% powerpc ppc64el s390x,$(shell dpkg-architecture -q DEB_HOST_ARCH))" "" @@ -26,6 +28,7 @@ override_dh_auto_install: $(MAKE) install DESTDIR=debian/tmp rm debian/tmp/usr/share/doc/afl/ChangeLog + rm debian/tmp/usr/share/doc/afl/README dh_install --fail-missing ifneq "$(AFL_NOX86)" "" cd debian/afl/usr/bin/ && rm afl-gcc afl-g++ @@ -35,15 +38,14 @@ endif override_dh_installdocs: - dh_installdocs -p afl -Xexperimental/persistent_demo experimental/ docs/vuln_samples - dh_installdocs -p afl-clang llvm_mode/README* experimental/persistent_demo - dh_buildinfo + dh_installdocs -A docs/README + dh_buildinfo -Nafl-doc override_dh_strip_nondeterminism: # not needed, and don't touch testcases and vuln_samples (see e.g. #803503) override_dh_compress: - dh_compress -X.c -X.mp4 -X.sql + dh_compress -X.c -X.mp4 -X.sql -XREADME override_dh_gencontrol: # debian/dh_clang -p afl-clang