Merge branch 'master' into master

google · Feb 24, 2025 · 16dd13f · 16dd13f
2 parents 15a11de + f47a2da
commit 16dd13f
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 20 deletions.
diff --git a/infra/base-images/base-clang/Dockerfile b/infra/base-images/base-clang/Dockerfile
@@ -36,7 +36,7 @@ RUN apt-get update && apt-get install -y wget sudo && \
 RUN apt-get update && apt-get install -y git && \
     git clone https://github.com/ossf/fuzz-introspector.git fuzz-introspector && \
     cd fuzz-introspector && \
-    git checkout c6f69b1f4e661a23b9987b55fdc42d5cc2748f9f && \
+    git checkout b8f0ed351df53afea795a14a8cf9098da0aeddee && \
     git submodule init && \
     git submodule update && \
     apt-get autoremove --purge -y git && \

diff --git a/projects/apache-commons-beanutils/Dockerfile b/projects/apache-commons-beanutils/Dockerfile
@@ -27,10 +27,7 @@ WORKDIR ${SRC}
 # clone repository
 #
 RUN git clone https://github.com/apache/commons-beanutils.git
-COPY *.diff $SRC/
-RUN cd commons-beanutils && tr -d '\015' < $SRC/remove-rat.diff | git apply
-
 
 ADD pom.xml build.sh ${SRC}/
 ADD src/ ${SRC}/src/
-WORKDIR ${SRC}/commons-beanutils
+WORKDIR ${SRC}/commons-beanutils
diff --git a/projects/apache-commons-beanutils/remove-rat.diff b/projects/apache-commons-beanutils/remove-rat.diff
diff --git a/projects/juju/Dockerfile b/projects/juju/Dockerfile
@@ -16,5 +16,5 @@
 
 FROM gcr.io/oss-fuzz-base/base-builder-go
 RUN git clone --depth 1 https://github.com/juju/juju
-COPY build.sh storage_fuzzer.go $SRC/
+COPY build.sh devices_fuzzer.go $SRC/
 WORKDIR $SRC/juju
diff --git a/projects/juju/build.sh b/projects/juju/build.sh
@@ -20,5 +20,5 @@ go mod download
 find /root/go/pkg/mod/github.com/aws/aws-sdk-go-v2 -name "*fuzz.go" -exec rm -rf {} \;
 
 # Compile fuzzer:
-mv $SRC/storage_fuzzer.go $SRC/juju/storage/
-compile_go_fuzzer github.com/juju/juju/storage Fuzz storage_fuzzer
+mv $SRC/devices_fuzzer.go $SRC/juju/core/devices/
+compile_go_fuzzer github.com/juju/juju/core/devices Fuzz devices_fuzzer
diff --git a/projects/juju/storage_fuzzer.go → projects/juju/devices_fuzzer.go b/projects/juju/storage_fuzzer.go → projects/juju/devices_fuzzer.go
@@ -13,7 +13,7 @@
 // limitations under the License.
 //
 
-package storage
+package devices
 
 func Fuzz(data []byte) int {
 	_, err := ParseConstraints(string(data))

diff --git a/projects/libprotobuf-mutator/build.sh b/projects/libprotobuf-mutator/build.sh
@@ -23,6 +23,7 @@ pushd build
 rm -rf *
 cmake .. -GNinja -DCMAKE_BUILD_TYPE=Release \
     -DLIB_PROTO_MUTATOR_DOWNLOAD_PROTOBUF=ON \
+    -DLIB_PROTO_MUTATOR_EXAMPLES_USE_LATEST=ON \
     -DLIB_PROTO_MUTATOR_FUZZER_LIBRARIES=FuzzingEngine
 ninja libxml2_example expat_example
 cp -f examples/libxml2/libxml2_example $OUT/