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.
This commit is contained in:
Mrmaxmeier 2022-07-17 14:17:49 +02:00 committed by GitHub
parent c45b6be7e1
commit 321bcfeba1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 20 additions and 20 deletions

View File

@ -1,5 +1,5 @@
[package] [package]
name = "baby_fuzzer" name = "baby_fuzzer_gramatron"
version = "0.8.0" version = "0.8.0"
authors = ["Andrea Fioraldi <andreafioraldi@gmail.com>", "Dominik Maier <domenukk@gmail.com>"] authors = ["Andrea Fioraldi <andreafioraldi@gmail.com>", "Dominik Maier <domenukk@gmail.com>"]
edition = "2021" edition = "2021"

View File

@ -1,5 +1,5 @@
[package] [package]
name = "baby_fuzzer" name = "baby_fuzzer_grimoire"
version = "0.8.0" version = "0.8.0"
authors = ["Andrea Fioraldi <andreafioraldi@gmail.com>", "Dominik Maier <domenukk@gmail.com>"] authors = ["Andrea Fioraldi <andreafioraldi@gmail.com>", "Dominik Maier <domenukk@gmail.com>"]
edition = "2021" edition = "2021"

View File

@ -1,5 +1,5 @@
[package] [package]
name = "baby_fuzzer" name = "baby_fuzzer_nautilus"
version = "0.8.0" version = "0.8.0"
authors = ["Andrea Fioraldi <andreafioraldi@gmail.com>", "Dominik Maier <domenukk@gmail.com>"] authors = ["Andrea Fioraldi <andreafioraldi@gmail.com>", "Dominik Maier <domenukk@gmail.com>"]
edition = "2018" edition = "2018"

View File

@ -1,5 +1,5 @@
[package] [package]
name = "baby_fuzzer" name = "baby_fuzzer_tokens"
version = "0.8.0" version = "0.8.0"
authors = ["Andrea Fioraldi <andreafioraldi@gmail.com>", "Dominik Maier <domenukk@gmail.com>"] authors = ["Andrea Fioraldi <andreafioraldi@gmail.com>", "Dominik Maier <domenukk@gmail.com>"]
edition = "2021" edition = "2021"

View File

@ -1,5 +1,5 @@
[package] [package]
name = "c_code_with_fork_executor" name = "c_code_with_inprocess_executor"
version = "0.0.1" version = "0.0.1"
edition = "2021" edition = "2021"

View File

@ -1,5 +1,5 @@
[package] [package]
name = "fuzzbench" name = "fuzzbench_text"
version = "0.8.0" version = "0.8.0"
authors = ["Andrea Fioraldi <andreafioraldi@gmail.com>", "Dominik Maier <domenukk@gmail.com>"] authors = ["Andrea Fioraldi <andreafioraldi@gmail.com>", "Dominik Maier <domenukk@gmail.com>"]
edition = "2021" edition = "2021"

View File

@ -1,5 +1,5 @@
[package] [package]
name = "fuzzbench" name = "fuzzbench_weighted"
version = "0.8.0" version = "0.8.0"
authors = ["Andrea Fioraldi <andreafioraldi@gmail.com>", "Dominik Maier <domenukk@gmail.com>"] authors = ["Andrea Fioraldi <andreafioraldi@gmail.com>", "Dominik Maier <domenukk@gmail.com>"]
edition = "2021" edition = "2021"

View File

@ -53,7 +53,7 @@ windows_alias = "unsupported"
[tasks.lib_unix] [tasks.lib_unix]
script=''' 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}" cd "${PROJECT_DIR}"
make -C mozjpeg-4.0.3 make -C mozjpeg-4.0.3
''' '''
@ -121,4 +121,4 @@ script='''
rm -f ./${FUZZER_NAME} rm -f ./${FUZZER_NAME}
make -C mozjpeg-4.0.3 clean make -C mozjpeg-4.0.3 clean
cargo clean cargo clean
''' '''

View File

@ -1,5 +1,5 @@
[package] [package]
name = "libfuzzer_libpng_launcher" name = "libfuzzer_libpng_accounting"
version = "0.8.0" version = "0.8.0"
authors = ["Andrea Fioraldi <andreafioraldi@gmail.com>", "Dominik Maier <domenukk@gmail.com>"] authors = ["Andrea Fioraldi <andreafioraldi@gmail.com>", "Dominik Maier <domenukk@gmail.com>"]
edition = "2021" edition = "2021"

View File

@ -1,6 +1,6 @@
# Variables # Variables
[env] [env]
FUZZER_NAME='fuzzer_libpng' FUZZER_NAME='fuzzer_libpng_accounting'
LIBAFL_CC = './target/release/libafl_cc' LIBAFL_CC = './target/release/libafl_cc'
LIBAFL_CXX = './target/release/libafl_cxx' LIBAFL_CXX = './target/release/libafl_cxx'
FUZZER = './target/release/${FUZZER_NAME}' FUZZER = './target/release/${FUZZER_NAME}'
@ -113,4 +113,4 @@ script='''
rm -f ./${FUZZER_NAME} rm -f ./${FUZZER_NAME}
make -C libpng-1.6.37 clean make -C libpng-1.6.37 clean
cargo clean cargo clean
''' '''

View File

@ -1,5 +1,5 @@
[package] [package]
name = "libfuzzer_libpng_launcher" name = "libfuzzer_libpng_ctx"
version = "0.8.0" version = "0.8.0"
authors = ["Andrea Fioraldi <andreafioraldi@gmail.com>", "Dominik Maier <domenukk@gmail.com>"] authors = ["Andrea Fioraldi <andreafioraldi@gmail.com>", "Dominik Maier <domenukk@gmail.com>"]
edition = "2021" edition = "2021"

View File

@ -1,6 +1,6 @@
# Variables # Variables
[env] [env]
FUZZER_NAME='fuzzer_libpng' FUZZER_NAME='fuzzer_libpng_ctx'
LIBAFL_CC = './target/release/libafl_cc' LIBAFL_CC = './target/release/libafl_cc'
LIBAFL_CXX = './target/release/libafl_cxx' LIBAFL_CXX = './target/release/libafl_cxx'
FUZZER = './target/release/${FUZZER_NAME}' FUZZER = './target/release/${FUZZER_NAME}'
@ -113,4 +113,4 @@ script='''
rm -f ./${FUZZER_NAME} rm -f ./${FUZZER_NAME}
make -C libpng-1.6.37 clean make -C libpng-1.6.37 clean
cargo clean cargo clean
''' '''

View File

@ -1,6 +1,6 @@
# Variables # Variables
[env] [env]
FUZZER_NAME='fuzzer_libpng' FUZZER_NAME='fuzzer_libpng_launcher'
LIBAFL_CC = './target/release/libafl_cc' LIBAFL_CC = './target/release/libafl_cc'
LIBAFL_CXX = './target/release/libafl_cxx' LIBAFL_CXX = './target/release/libafl_cxx'
FUZZER = './target/release/${FUZZER_NAME}' FUZZER = './target/release/${FUZZER_NAME}'
@ -113,4 +113,4 @@ script='''
rm -f ./${FUZZER_NAME} rm -f ./${FUZZER_NAME}
make -C libpng-1.6.37 clean make -C libpng-1.6.37 clean
cargo clean cargo clean
''' '''

View File

@ -1,5 +1,5 @@
[package] [package]
name = "libfuzzer_stb_image" name = "libfuzzer_stb_image_sugar"
version = "0.8.0" version = "0.8.0"
authors = ["Andrea Fioraldi <andreafioraldi@gmail.com>", "Dominik Maier <domenukk@gmail.com>"] authors = ["Andrea Fioraldi <andreafioraldi@gmail.com>", "Dominik Maier <domenukk@gmail.com>"]
edition = "2021" edition = "2021"

View File

@ -1,6 +1,6 @@
# Variables # Variables
[env] [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_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'} } 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'} } 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=''' script='''
rm -f ./${FUZZER_NAME} rm -f ./${FUZZER_NAME}
cargo clean cargo clean
''' '''