diff options
| author |  Tim Rühsen <tim.ruehsen@gmx.de> | 2017-06-05 02:53:00 +0200 |
|---|---|---|
| committer |  Abhishek Arya <inferno@chromium.org> | 2017-06-04 17:53:00 -0700 |
| commit | 5bd65c6bc9fd43e626f5ee3d41866a564fd41e91 (patch) | |
| tree | b87b6965bbcf5c14b6f4f9e752db30413c99abe5 /projects/wget2 | |
| parent | e999b2cbabf4c719bdc842b501114537880dc4d8 (diff) | |
[wget2] Fix build, better upstream integration, added auto_ccs (#650)
Diffstat (limited to 'projects/wget2')
| -rw-r--r-- | projects/wget2/Dockerfile | 1 | ||||
| -rwxr-xr-x | projects/wget2/build.sh | 29 | ||||
| -rw-r--r-- | projects/wget2/project.yaml | 3 |
3 files changed, 19 insertions, 14 deletions
diff --git a/projects/wget2/Dockerfile b/projects/wget2/Dockerfile index 518fc698..9cd25092 100644 --- a/projects/wget2/Dockerfile +++ b/projects/wget2/Dockerfile @@ -26,6 +26,7 @@ RUN apt-get update && apt-get install -y \ texinfo \ flex \ liblzma-dev \ + libidn11-dev \ libidn2-0-dev \ libunistring-dev \ zlib1g-dev \ diff --git a/projects/wget2/build.sh b/projects/wget2/build.sh index 81c74067..ff7920f2 100755 --- a/projects/wget2/build.sh +++ b/projects/wget2/build.sh @@ -15,21 +15,22 @@ # ################################################################################ -! test -d lib && ./bootstrap -! test -f config.h && ./configure --enable-static --disable-doc -make -j$(nproc) +# avoid iconv() memleak on Ubuntu 16.04 image (breaks test suite) +export ASAN_OPTIONS=detect_leaks=0 -find fuzz -name '*_fuzzer.dict' -exec cp -v '{}' $OUT ';' -find fuzz -name '*_fuzzer.options' -exec cp -v '{}' $OUT ';' +! test -f lib/Makefile.in && ./bootstrap +./configure --enable-static --disable-doc +make clean +make -j$(nproc) all check -fuzzers=$(find fuzz -name "*_fuzzer.cc") +cd fuzz +find . -name '*_fuzzer.dict' -exec cp -v '{}' $OUT ';' +find . -name '*_fuzzer.options' -exec cp -v '{}' $OUT ';' -for f in $fuzzers; do - fuzzer=$(basename "$f" ".cc") - - $CXX $CXXFLAGS -std=c++11 -Iinclude/wget/ \ - "fuzz/${fuzzer}.cc" -o "$OUT/${fuzzer}" \ - libwget/.libs/libwget.a -lFuzzingEngine -Wl,-Bstatic \ +for fuzzer in *_fuzzer; do + $CXX $CXXFLAGS -std=c++11 -I../include/wget/ \ + "${fuzzer}.cc" -o "$OUT/${fuzzer}" \ + ../libwget/.libs/libwget.a -lFuzzingEngine -Wl,-Bstatic \ -lidn2 -lunistring \ -Wl,-Bdynamic @@ -37,7 +38,7 @@ for f in $fuzzers; do cp "$SRC/${fuzzer}_seed_corpus.zip" "$OUT/" fi - if [ -d "fuzz/${fuzzer}.in/" ]; then - zip -rj "$OUT/${fuzzer}_seed_corpus.zip" "fuzz/${fuzzer}.in/" + if [ -d "${fuzzer}.in/" ]; then + zip -rj "$OUT/${fuzzer}_seed_corpus.zip" "${fuzzer}.in/" fi done diff --git a/projects/wget2/project.yaml b/projects/wget2/project.yaml index 99ca0648..ef3a3e54 100644 --- a/projects/wget2/project.yaml +++ b/projects/wget2/project.yaml @@ -2,3 +2,6 @@ homepage: "https://gitlab.com/gnuwget/wget2" primary_contact: "rockdaboot@gmail.com" auto_ccs: - "tim.ruehsen@gmx.de" + - "darnir@gmail.com" + - "gscrivan@redhat.com" + - "ajuaristi@gmx.es" |