OSS-fuzz needs some love

[Uri Simchoni]

With the attached obvious patch, the oss-fuzz build succeeds on their 
stock image. Haven't actually *ran* the fuzzer binaries though.

What do you suppose I should do on the oss-fuzz side? Do I just issue a 
pull request, or do I have to be listed somewhere?

Regarding drop of 16.04 build, we don't seem to have one in CI, so I can 
just remove the old Python exception. Do note however that oss-fuzz 
builds with clang, so we might want to have an Ubuntu 20.04+clang CI job 
to ensure that build doesn't fail when it gets to oss-fuzz.

I hope that helps,
Uri.

On 9/1/21 11:10 PM, Andrew Bartlett via samba-technical wrote:
> 
> Looks like work needs to be done to confirm we build in oss-fuzz mode
> on 20.04, upgrade the Dockerfile on their side to say so, then on our
> side drop the 16.04 build (and the old python exception for the fuzzing
> case in buildtools/wafsamba/samba_python.py).
> 
> Andrew Bartlett
> 

-------------- next part --------------
From 8886072464d6a216236019f2c3b5536acd90bbd2 Mon Sep 17 00:00:00 2001
From: Uri Simchoni <uri at samba.org>
Date: Fri, 3 Sep 2021 18:46:17 +0000
Subject: [PATCH] fuzzing/oss-fuzz: fix image build recipe for Ubuntu 20.04

Update the build_image.sh script to install Ubuntu 20.04 packages
instead of Ubuntu 16.04 on the oss-fuzz container - this will
allow the oss-fuzz container to be based on Ubuntu 20.04.

Signed-off-by: Uri Simchoni <uri at samba.org>
---
 lib/fuzzing/oss-fuzz/build_image.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/fuzzing/oss-fuzz/build_image.sh b/lib/fuzzing/oss-fuzz/build_image.sh
index 5df07dc43be..5d5e27e716d 100755
--- a/lib/fuzzing/oss-fuzz/build_image.sh
+++ b/lib/fuzzing/oss-fuzz/build_image.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 
-DIST=ubuntu1604
+DIST=ubuntu2004
 SCRIPT_DIR=`dirname $0`
 
 $SCRIPT_DIR/../../../bootstrap/generated-dists/$DIST/bootstrap.sh
-- 
2.33.0