From 321bcfeba170485c6b485f932d9b2c95eba28dba Mon Sep 17 00:00:00 2001 From: Mrmaxmeier <3913977+Mrmaxmeier@users.noreply.github.com> Date: Sun, 17 Jul 2022 14:17:49 +0200 Subject: [PATCH] Cleanup duplicate package warnings (#702) * cleanup duplicate package warnings * libmozjpeg fuzzer: disable png reading support libmozjpeg's libpng support is not used by the fuzzing harness, and the mozjpeg-4.0.3 release has a build system issue with newish libpng versions. --- fuzzers/baby_fuzzer_gramatron/Cargo.toml | 2 +- fuzzers/baby_fuzzer_grimoire/Cargo.toml | 2 +- fuzzers/baby_fuzzer_nautilus/Cargo.toml | 2 +- fuzzers/baby_fuzzer_tokens/Cargo.toml | 2 +- .../c_code_with_inprocess_executor/Cargo.toml | 2 +- fuzzers/fuzzbench_text/Cargo.toml | 2 +- fuzzers/fuzzbench_weighted/Cargo.toml | 2 +- fuzzers/libfuzzer_libmozjpeg/Makefile.toml | 4 ++-- fuzzers/libfuzzer_libpng_accounting/Cargo.toml | 2 +- fuzzers/libfuzzer_libpng_accounting/Makefile.toml | 4 ++-- fuzzers/libfuzzer_libpng_ctx/Cargo.toml | 2 +- fuzzers/libfuzzer_libpng_ctx/Makefile.toml | 4 ++-- fuzzers/libfuzzer_libpng_launcher/Makefile.toml | 4 ++-- fuzzers/libfuzzer_stb_image_sugar/Cargo.toml | 2 +- fuzzers/libfuzzer_stb_image_sugar/Makefile.toml | 4 ++-- 15 files changed, 20 insertions(+), 20 deletions(-) diff --git a/fuzzers/baby_fuzzer_gramatron/Cargo.toml b/fuzzers/baby_fuzzer_gramatron/Cargo.toml index 3809745e3a..9b8b33cc5a 100644 --- a/fuzzers/baby_fuzzer_gramatron/Cargo.toml +++ b/fuzzers/baby_fuzzer_gramatron/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "baby_fuzzer" +name = "baby_fuzzer_gramatron" version = "0.8.0" authors = ["Andrea Fioraldi ", "Dominik Maier "] edition = "2021" diff --git a/fuzzers/baby_fuzzer_grimoire/Cargo.toml b/fuzzers/baby_fuzzer_grimoire/Cargo.toml index 5259a10ce8..a2658a3ca2 100644 --- a/fuzzers/baby_fuzzer_grimoire/Cargo.toml +++ b/fuzzers/baby_fuzzer_grimoire/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "baby_fuzzer" +name = "baby_fuzzer_grimoire" version = "0.8.0" authors = ["Andrea Fioraldi ", "Dominik Maier "] edition = "2021" diff --git a/fuzzers/baby_fuzzer_nautilus/Cargo.toml b/fuzzers/baby_fuzzer_nautilus/Cargo.toml index 911d343177..104cbc8a3e 100644 --- a/fuzzers/baby_fuzzer_nautilus/Cargo.toml +++ b/fuzzers/baby_fuzzer_nautilus/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "baby_fuzzer" +name = "baby_fuzzer_nautilus" version = "0.8.0" authors = ["Andrea Fioraldi ", "Dominik Maier "] edition = "2018" diff --git a/fuzzers/baby_fuzzer_tokens/Cargo.toml b/fuzzers/baby_fuzzer_tokens/Cargo.toml index 5259a10ce8..4455075892 100644 --- a/fuzzers/baby_fuzzer_tokens/Cargo.toml +++ b/fuzzers/baby_fuzzer_tokens/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "baby_fuzzer" +name = "baby_fuzzer_tokens" version = "0.8.0" authors = ["Andrea Fioraldi ", "Dominik Maier "] edition = "2021" diff --git a/fuzzers/backtrace_baby_fuzzers/c_code_with_inprocess_executor/Cargo.toml b/fuzzers/backtrace_baby_fuzzers/c_code_with_inprocess_executor/Cargo.toml index 740eaaf31a..dab9c0bbda 100644 --- a/fuzzers/backtrace_baby_fuzzers/c_code_with_inprocess_executor/Cargo.toml +++ b/fuzzers/backtrace_baby_fuzzers/c_code_with_inprocess_executor/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "c_code_with_fork_executor" +name = "c_code_with_inprocess_executor" version = "0.0.1" edition = "2021" diff --git a/fuzzers/fuzzbench_text/Cargo.toml b/fuzzers/fuzzbench_text/Cargo.toml index d220e6cce9..112e29f2c4 100644 --- a/fuzzers/fuzzbench_text/Cargo.toml +++ b/fuzzers/fuzzbench_text/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "fuzzbench" +name = "fuzzbench_text" version = "0.8.0" authors = ["Andrea Fioraldi ", "Dominik Maier "] edition = "2021" diff --git a/fuzzers/fuzzbench_weighted/Cargo.toml b/fuzzers/fuzzbench_weighted/Cargo.toml index 97619f1007..e15aa4cc31 100644 --- a/fuzzers/fuzzbench_weighted/Cargo.toml +++ b/fuzzers/fuzzbench_weighted/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "fuzzbench" +name = "fuzzbench_weighted" version = "0.8.0" authors = ["Andrea Fioraldi ", "Dominik Maier "] edition = "2021" diff --git a/fuzzers/libfuzzer_libmozjpeg/Makefile.toml b/fuzzers/libfuzzer_libmozjpeg/Makefile.toml index 70b217ca05..103bbc13ad 100644 --- a/fuzzers/libfuzzer_libmozjpeg/Makefile.toml +++ b/fuzzers/libfuzzer_libmozjpeg/Makefile.toml @@ -53,7 +53,7 @@ windows_alias = "unsupported" [tasks.lib_unix] script=''' -cd mozjpeg-4.0.3 && cmake . -DENABLE_SHARED=false -DCMAKE_C_COMPILER="${PROJECT_DIR}/${LIBAFL_CC}" -DCMAKE_CXX_COMPILER="${PROJECT_DIR}/${LIBAFL_CXX}" -G "Unix Makefiles" +cd mozjpeg-4.0.3 && cmake . -DENABLE_SHARED=false -DPNG_SUPPORTED=false -DCMAKE_C_COMPILER="${PROJECT_DIR}/${LIBAFL_CC}" -DCMAKE_CXX_COMPILER="${PROJECT_DIR}/${LIBAFL_CXX}" -G "Unix Makefiles" cd "${PROJECT_DIR}" make -C mozjpeg-4.0.3 ''' @@ -121,4 +121,4 @@ script=''' rm -f ./${FUZZER_NAME} make -C mozjpeg-4.0.3 clean cargo clean -''' \ No newline at end of file +''' diff --git a/fuzzers/libfuzzer_libpng_accounting/Cargo.toml b/fuzzers/libfuzzer_libpng_accounting/Cargo.toml index a4baf02956..cadb2a17c5 100644 --- a/fuzzers/libfuzzer_libpng_accounting/Cargo.toml +++ b/fuzzers/libfuzzer_libpng_accounting/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "libfuzzer_libpng_launcher" +name = "libfuzzer_libpng_accounting" version = "0.8.0" authors = ["Andrea Fioraldi ", "Dominik Maier "] edition = "2021" diff --git a/fuzzers/libfuzzer_libpng_accounting/Makefile.toml b/fuzzers/libfuzzer_libpng_accounting/Makefile.toml index 3ef89db4f6..23442ff862 100644 --- a/fuzzers/libfuzzer_libpng_accounting/Makefile.toml +++ b/fuzzers/libfuzzer_libpng_accounting/Makefile.toml @@ -1,6 +1,6 @@ # Variables [env] -FUZZER_NAME='fuzzer_libpng' +FUZZER_NAME='fuzzer_libpng_accounting' LIBAFL_CC = './target/release/libafl_cc' LIBAFL_CXX = './target/release/libafl_cxx' FUZZER = './target/release/${FUZZER_NAME}' @@ -113,4 +113,4 @@ script=''' rm -f ./${FUZZER_NAME} make -C libpng-1.6.37 clean cargo clean -''' \ No newline at end of file +''' diff --git a/fuzzers/libfuzzer_libpng_ctx/Cargo.toml b/fuzzers/libfuzzer_libpng_ctx/Cargo.toml index f94acc1174..6928b4bf5a 100644 --- a/fuzzers/libfuzzer_libpng_ctx/Cargo.toml +++ b/fuzzers/libfuzzer_libpng_ctx/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "libfuzzer_libpng_launcher" +name = "libfuzzer_libpng_ctx" version = "0.8.0" authors = ["Andrea Fioraldi ", "Dominik Maier "] edition = "2021" diff --git a/fuzzers/libfuzzer_libpng_ctx/Makefile.toml b/fuzzers/libfuzzer_libpng_ctx/Makefile.toml index 3ef89db4f6..2dc10feaf8 100644 --- a/fuzzers/libfuzzer_libpng_ctx/Makefile.toml +++ b/fuzzers/libfuzzer_libpng_ctx/Makefile.toml @@ -1,6 +1,6 @@ # Variables [env] -FUZZER_NAME='fuzzer_libpng' +FUZZER_NAME='fuzzer_libpng_ctx' LIBAFL_CC = './target/release/libafl_cc' LIBAFL_CXX = './target/release/libafl_cxx' FUZZER = './target/release/${FUZZER_NAME}' @@ -113,4 +113,4 @@ script=''' rm -f ./${FUZZER_NAME} make -C libpng-1.6.37 clean cargo clean -''' \ No newline at end of file +''' diff --git a/fuzzers/libfuzzer_libpng_launcher/Makefile.toml b/fuzzers/libfuzzer_libpng_launcher/Makefile.toml index 3ef89db4f6..edb1150554 100644 --- a/fuzzers/libfuzzer_libpng_launcher/Makefile.toml +++ b/fuzzers/libfuzzer_libpng_launcher/Makefile.toml @@ -1,6 +1,6 @@ # Variables [env] -FUZZER_NAME='fuzzer_libpng' +FUZZER_NAME='fuzzer_libpng_launcher' LIBAFL_CC = './target/release/libafl_cc' LIBAFL_CXX = './target/release/libafl_cxx' FUZZER = './target/release/${FUZZER_NAME}' @@ -113,4 +113,4 @@ script=''' rm -f ./${FUZZER_NAME} make -C libpng-1.6.37 clean cargo clean -''' \ No newline at end of file +''' diff --git a/fuzzers/libfuzzer_stb_image_sugar/Cargo.toml b/fuzzers/libfuzzer_stb_image_sugar/Cargo.toml index 906d35acba..d22130ee61 100644 --- a/fuzzers/libfuzzer_stb_image_sugar/Cargo.toml +++ b/fuzzers/libfuzzer_stb_image_sugar/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "libfuzzer_stb_image" +name = "libfuzzer_stb_image_sugar" version = "0.8.0" authors = ["Andrea Fioraldi ", "Dominik Maier "] edition = "2021" diff --git a/fuzzers/libfuzzer_stb_image_sugar/Makefile.toml b/fuzzers/libfuzzer_stb_image_sugar/Makefile.toml index 6c547f4fb6..5b522b2314 100644 --- a/fuzzers/libfuzzer_stb_image_sugar/Makefile.toml +++ b/fuzzers/libfuzzer_stb_image_sugar/Makefile.toml @@ -1,6 +1,6 @@ # Variables [env] -FUZZER_NAME='libfuzzer_stb_image' +FUZZER_NAME='libfuzzer_stb_image_sugar' LIBAFL_CC = { source = "${CARGO_MAKE_RUST_TARGET_OS}", default_value = './target/release/libafl_cc', mapping = {"windows" = '.\\target\\release\\libafl_cc.exe'} } LIBAFL_CXX = { source = "${CARGO_MAKE_RUST_TARGET_OS}", default_value = './target/release/libafl_cxx', mapping = {"windows" = '.\\target\\release\\libafl_cxx.exe'} } FUZZER = { source = "${CARGO_MAKE_RUST_TARGET_OS}", default_value = './target/release/${FUZZER_NAME}', mapping = {"windows" = '.\\target\\release\\${FUZZER_NAME}.exe'} } @@ -77,4 +77,4 @@ script_runner="@shell" script=''' rm -f ./${FUZZER_NAME} cargo clean -''' \ No newline at end of file +'''