Merge branch 'master' into cirq-revise-dockerfile

mhucka · web-flow · commit 1d5b273719b7 · 2026-02-20T14:17:02.000-08:00
diff --git a/projects/apache-commons-collections/Dockerfile b/projects/apache-commons-collections/Dockerfile
@@ -16,11 +16,11 @@
 
 FROM gcr.io/oss-fuzz-base/base-builder-jvm
 
-RUN curl -L https://archive.apache.org/dist/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.zip -o maven.zip && \
+RUN curl -L https://archive.apache.org/dist/maven/maven-3/3.9.9/binaries/apache-maven-3.9.9-bin.zip -o maven.zip && \
 unzip maven.zip -d $SRC/maven && \
 rm -rf maven.zip
 
-ENV MVN $SRC/maven/apache-maven-3.6.3/bin/mvn
+ENV MVN $SRC/maven/apache-maven-3.9.9/bin/mvn
 
 RUN git clone https://github.com/apache/commons-collections
 
diff --git a/projects/docker-client/Dockerfile b/projects/docker-client/Dockerfile
@@ -14,10 +14,10 @@
 #
 ##########################################################################
 FROM gcr.io/oss-fuzz-base/base-builder-jvm
-RUN curl -L https://archive.apache.org/dist/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.zip -o maven.zip && \
+RUN curl -L https://archive.apache.org/dist/maven/maven-3/3.9.9/binaries/apache-maven-3.9.9-bin.zip -o maven.zip && \
     unzip maven.zip -d $SRC/maven && \
     rm -rf maven.zip
-ENV MVN $SRC/maven/apache-maven-3.6.3/bin/mvn
+ENV MVN $SRC/maven/apache-maven-3.9.9/bin/mvn
 RUN git clone --depth 1 https://github.com/spotify/docker-client docker-client
 COPY *.sh *.java $SRC/
 WORKDIR $SRC/docker-client
diff --git a/projects/ghostscript/Dockerfile b/projects/ghostscript/Dockerfile
@@ -18,7 +18,7 @@ FROM gcr.io/oss-fuzz-base/base-builder
 
 RUN apt-get update && apt-get install -y autoconf zlibc libtool liblcms2-dev libpng-dev
 RUN git clone --branch branch-2.2 --single-branch --depth 1 https://github.com/apple/cups.git cups
-RUN git clone --branch VER-2-13-0 --single-branch --depth 1 https://git.savannah.gnu.org/git/freetype/freetype2.git freetype
+RUN git clone --branch VER-2-14-0 --single-branch --depth 1 https://git.savannah.gnu.org/git/freetype/freetype2.git freetype
 RUN git clone --single-branch --depth 1 git://git.ghostscript.com/ghostpdl.git ghostpdl
 RUN mkdir ghostpdl/fuzz
 
diff --git a/projects/haproxy/Dockerfile b/projects/haproxy/Dockerfile
@@ -16,7 +16,7 @@
 FROM gcr.io/oss-fuzz-base/base-builder
 RUN apt-get update && apt-get install -y make libpcre2-dev zlib1g-dev
 RUN git clone https://github.com/haproxy/haproxy
-RUN git clone https://github.com/vtest/VTest2 --depth=1
+RUN git clone https://code.vinyl-cache.org/vtest/VTest2
 
 WORKDIR $SRC/haproxy
 
diff --git a/projects/hostap/Dockerfile b/projects/hostap/Dockerfile
@@ -18,6 +18,6 @@ FROM gcr.io/oss-fuzz-base/base-builder
 RUN apt-get update && \
     apt-get install -y make autoconf automake libtool g++ libssl-dev \
                        libssl-dev:i386
-RUN git clone --depth 1 git://w1.fi/srv/git/hostap.git hostap
+RUN git clone --depth 1 https://w1.fi/hostap.git hostap
 WORKDIR hostap
 COPY build.sh $SRC/
diff --git a/projects/jboss-logging/build.sh b/projects/jboss-logging/build.sh
@@ -22,7 +22,7 @@ MAIN_REPOSITORY=https://github.com/jboss-logging/jboss-logging
 
 function set_project_version_in_fuzz_targets_dependency {
   #PROJECT_VERSION=$(cd $PROJECT && $MVN org.apache.maven.plugins:maven-help-plugin:3.2.0:evaluate -Dexpression=project.version -q -DforceStdout)
-  PROJECT_VERSION=3.6.2.Final-SNAPSHOT #workaround to make it consistent with pom.xml
+  PROJECT_VERSION=3.6.3.Final-SNAPSHOT #workaround to make it consistent with pom.xml
   # set dependency project version in fuzz-targets
   (cd fuzz-targets && $MVN versions:use-dep-version -Dincludes=$PROJECT_GROUP_ID:$PROJECT_ARTIFACT_ID -DdepVersion=$PROJECT_VERSION -DforceVersion=true)
 }
diff --git a/projects/jmh/Dockerfile b/projects/jmh/Dockerfile
@@ -16,11 +16,11 @@
 
 FROM gcr.io/oss-fuzz-base/base-builder-jvm
 
-RUN curl -L https://archive.apache.org/dist/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.zip -o maven.zip && \
+RUN curl -L https://archive.apache.org/dist/maven/maven-3/3.9.9/binaries/apache-maven-3.9.9-bin.zip -o maven.zip && \
 unzip maven.zip -d $SRC/maven && \
 rm -rf maven.zip
 
-ENV MVN $SRC/maven/apache-maven-3.6.3/bin/mvn
+ENV MVN $SRC/maven/apache-maven-3.9.9/bin/mvn
 
 RUN git clone https://github.com/openjdk/jmh
 
diff --git a/projects/kryo/Dockerfile b/projects/kryo/Dockerfile
@@ -16,11 +16,11 @@
 
 FROM gcr.io/oss-fuzz-base/base-builder-jvm
 
-RUN curl -L https://archive.apache.org/dist/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.zip -o maven.zip && \
+RUN curl -L https://archive.apache.org/dist/maven/maven-3/3.9.9/binaries/apache-maven-3.9.9-bin.zip -o maven.zip && \
     unzip maven.zip -d $SRC/maven && \
     rm -rf maven.zip
 
-ENV MVN $SRC/maven/apache-maven-3.6.3/bin/mvn
+ENV MVN $SRC/maven/apache-maven-3.9.9/bin/mvn
 
 RUN git clone --depth 1 https://github.com/EsotericSoftware/kryo
 
diff --git a/projects/nginx/Dockerfile b/projects/nginx/Dockerfile
@@ -16,8 +16,8 @@
 
 FROM gcr.io/oss-fuzz-base/base-builder
 
-RUN apt-get update && apt-get install -y libpcre3-dev zlib1g-dev mercurial ninja-build cmake liblzma-dev libz-dev binutils libtool
-RUN hg clone http://hg.nginx.org/nginx/
+RUN apt-get update && apt-get install -y libpcre3-dev zlib1g-dev ninja-build cmake liblzma-dev libz-dev binutils libtool
+RUN git clone --depth 1 https://github.com/nginx/nginx.git
 RUN git clone --depth 1 https://github.com/google/libprotobuf-mutator.git
 RUN git clone --depth 1 https://github.com/google/fuzzer-test-suite
 RUN (mkdir LPM && cd LPM && cmake ../libprotobuf-mutator -GNinja -DLIB_PROTO_MUTATOR_DOWNLOAD_PROTOBUF=ON -DLIB_PROTO_MUTATOR_TESTING=OFF -DCMAKE_BUILD_TYPE=Release && ninja)
diff --git a/projects/nginx/build.sh b/projects/nginx/build.sh
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 ################################################################################
-hg import $SRC/add_fuzzers.diff --no-commit
+git apply $SRC/add_fuzzers.diff || patch -p1 < $SRC/add_fuzzers.diff
 
 cp -r $SRC/fuzz src/
 cp $SRC/make_fuzzers auto/make_fuzzers
diff --git a/projects/pip/build.sh b/projects/pip/build.sh
@@ -17,7 +17,6 @@
 
 cd $SRC/pip
 pip3 install .
-python3 setup.py install
 
 cd $SRC/pip/src
 
diff --git a/projects/python-multipart/Dockerfile b/projects/python-multipart/Dockerfile
@@ -19,5 +19,5 @@ RUN apt-get update && apt-get install -y make autoconf automake libtool
 RUN git clone --depth 1 https://github.com/Kludex/python-multipart python-multipart
 RUN python3 -m pip install --upgrade pip
 WORKDIR python-multipart
-COPY *.patch $SRC/python-multipart
+COPY *.patch $SRC/python-multipart/
 COPY build.sh *.options $SRC/
diff --git a/projects/python-nvd3/build.sh b/projects/python-nvd3/build.sh
@@ -14,8 +14,8 @@
 # limitations under the License.
 #
 ################################################################################
-python3 ./setup.py install
+pip3 install .
 # Build fuzzers in $OUT.
 for fuzzer in $(find $SRC -name 'fuzz_*.py'); do
-  compile_python_fuzzer $fuzzer
+  compile_python_fuzzer $fuzzer --collect-data nvd3
 done
diff --git a/projects/undertow/Dockerfile b/projects/undertow/Dockerfile
@@ -14,10 +14,10 @@
 #
 ##########################################################################
 FROM gcr.io/oss-fuzz-base/base-builder-jvm
-RUN curl -L https://archive.apache.org/dist/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.zip -o maven.zip && \
+RUN curl -L https://archive.apache.org/dist/maven/maven-3/3.9.9/binaries/apache-maven-3.9.9-bin.zip -o maven.zip && \
     unzip maven.zip -d $SRC/maven && \
     rm -rf maven.zip
-ENV MVN $SRC/maven/apache-maven-3.6.3/bin/mvn
+ENV MVN $SRC/maven/apache-maven-3.9.9/bin/mvn
 RUN git clone --depth 1 https://github.com/undertow-io/undertow undertow
 COPY *.sh *.java $SRC/
 WORKDIR $SRC/undertow
diff --git a/projects/upx/build.sh b/projects/upx/build.sh
@@ -23,7 +23,8 @@ git apply   --ignore-space-change --ignore-whitespace  $SRC/upx/fuzzers/build.pa
 # e.g.
 mkdir -p build/debug
 cd build/debug
-cmake ../..
+# Disable UBSan for the compiler sanity check that intentionally tests overflow
+cmake ../.. -DCMAKE_CXX_FLAGS="${CXXFLAGS} -fno-sanitize=signed-integer-overflow" -DCMAKE_C_FLAGS="${CFLAGS} -fno-sanitize=signed-integer-overflow"
 
 for fuzzer in $(find $SRC -name '*_fuzzer.cpp'); do
     fuzz_basename=$(basename -s .cpp $fuzzer)
diff --git a/projects/varnish/Dockerfile b/projects/varnish/Dockerfile
@@ -16,6 +16,6 @@
 
 FROM gcr.io/oss-fuzz-base/base-builder
 RUN apt-get update && apt install -y automake autoconf libtool pkg-config python3-docutils python3-sphinx libedit-dev libpcre2-dev libncurses-dev
-RUN git clone --depth 1 --recursive https://github.com/varnishcache/varnish-cache
+RUN git clone --recursive https://code.vinyl-cache.org/vinyl-cache/vinyl-cache
 COPY run_tests.sh build.sh $SRC/
-WORKDIR $SRC/varnish-cache
+WORKDIR $SRC/vinyl-cache

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ MAIN_REPOSITORY=https://github.com/jboss-logging/jboss-logging`
`22`	`22`
`23`	`23`	`function set_project_version_in_fuzz_targets_dependency {`
`24`	`24`	`#PROJECT_VERSION=$(cd $PROJECT && $MVN org.apache.maven.plugins:maven-help-plugin:3.2.0:evaluate -Dexpression=project.version -q -DforceStdout)`
`25`		`- PROJECT_VERSION=3.6.2.Final-SNAPSHOT #workaround to make it consistent with pom.xml`
	`25`	`+ PROJECT_VERSION=3.6.3.Final-SNAPSHOT #workaround to make it consistent with pom.xml`
`26`	`26`	`# set dependency project version in fuzz-targets`
`27`	`27`	`(cd fuzz-targets && $MVN versions:use-dep-version -Dincludes=$PROJECT_GROUP_ID:$PROJECT_ARTIFACT_ID -DdepVersion=$PROJECT_VERSION -DforceVersion=true)`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`# limitations under the License.`
`15`	`15`	`#`
`16`	`16`	`################################################################################`
`17`		`-hg import $SRC/add_fuzzers.diff --no-commit`
	`17`	`+git apply $SRC/add_fuzzers.diff \|\| patch -p1 < $SRC/add_fuzzers.diff`
`18`	`18`
`19`	`19`	`cp -r $SRC/fuzz src/`
`20`	`20`	`cp $SRC/make_fuzzers auto/make_fuzzers`