Remove no longer needed build workarounds (#6329)

* Revert xenial workaround in speex (no longer needed)

This reverts commit 84c9dd3600e2c348aaca78b2717067412fea8323.

* Revert xenial opus workaround (no longer needed)

This reverts commit 7cc0561aad415673f3ca3f15bfd240c75584849e.

* Remove ffmpeg build workaround for nasm

* Remove build workaround for dav1d

* Remove libavif build workaround

* Remove p11-kit build workaround

* Remove postgis build workaround

13 files changed, 2 insertions, 50 deletions

diff --git a/projects/dav1d/Dockerfile b/projects/dav1d/Dockerfile
index 81a4e590..0df0a5b3 100644
--- a/projects/dav1d/Dockerfile
+++ b/projects/dav1d/Dockerfile
@@ -15,10 +15,6 @@
 ################################################################################
 
 FROM gcr.io/oss-fuzz-base/base-builder
-
-ADD nasm.list /etc/apt/sources.list.d/nasm.list
-ADD nasm_apt.pin /etc/apt/preferences
-
 RUN apt-get update && \
     apt-get install --no-install-recommends -y curl python3-pip python3-setuptools python3-wheel nasm && \
     pip3 install meson ninja
diff --git a/projects/dav1d/nasm.list b/projects/dav1d/nasm.list
deleted file mode 100644
index 673ee997..00000000
--- a/projects/dav1d/nasm.list
+++ /dev/null
@@ -1,2 +0,0 @@
-# use nasm from a newer ubuntu release
-deb http://archive.ubuntu.com/ubuntu/ focal universe
diff --git a/projects/dav1d/nasm_apt.pin b/projects/dav1d/nasm_apt.pin
deleted file mode 100644
index d1932e9d..00000000
--- a/projects/dav1d/nasm_apt.pin
+++ /dev/null
@@ -1,7 +0,0 @@
-Package: *
-Pin: release n=focal
-Pin-Priority: 1
-
-Package: nasm
-Pin: release n=focal
-Pin-Priority: 555
diff --git a/projects/ffmpeg/Dockerfile b/projects/ffmpeg/Dockerfile
index ed9d1d39..552cd322 100644
--- a/projects/ffmpeg/Dockerfile
+++ b/projects/ffmpeg/Dockerfile
@@ -15,8 +15,6 @@
 ################################################################################
 
 FROM gcr.io/oss-fuzz-base/base-builder
-ADD bionic.list /etc/apt/sources.list.d/bionic.list
-ADD nasm_apt.pin /etc/apt/preferences
 RUN apt-get update && apt-get install -y make autoconf automake libtool build-essential \
     libass-dev libfreetype6-dev libsdl1.2-dev \
     libvdpau-dev libxcb1-dev libxcb-shm0-dev libdrm-dev \
diff --git a/projects/ffmpeg/bionic.list b/projects/ffmpeg/bionic.list
deleted file mode 100644
index 8621803a..00000000
--- a/projects/ffmpeg/bionic.list
+++ /dev/null
@@ -1,2 +0,0 @@
-# use nasm 2.13.02 from bionic
-deb http://archive.ubuntu.com/ubuntu/ bionic universe
diff --git a/projects/ffmpeg/nasm_apt.pin b/projects/ffmpeg/nasm_apt.pin
deleted file mode 100644
index 69099026..00000000
--- a/projects/ffmpeg/nasm_apt.pin
+++ /dev/null
@@ -1,7 +0,0 @@
-Package: *
-Pin: release n=bionic
-Pin-Priority: 1
-
-Package: nasm
-Pin: release n=bionic
-Pin-Priority: 555
diff --git a/projects/libavif/Dockerfile b/projects/libavif/Dockerfile
index a1f030e9..71e45215 100644
--- a/projects/libavif/Dockerfile
+++ b/projects/libavif/Dockerfile
@@ -15,10 +15,6 @@
 ################################################################################
 
 FROM gcr.io/oss-fuzz-base/base-builder
-
-ADD bionic.list /etc/apt/sources.list.d/bionic.list
-ADD nasm_apt.pin /etc/apt/preferences
-
 RUN apt-get update && \
     apt-get install --no-install-recommends -y curl python3-pip python3-setuptools python3-wheel cmake git && \
     pip3 install meson ninja
diff --git a/projects/libavif/bionic.list b/projects/libavif/bionic.list
deleted file mode 100644
index 8621803a..00000000
--- a/projects/libavif/bionic.list
+++ /dev/null
@@ -1,2 +0,0 @@
-# use nasm 2.13.02 from bionic
-deb http://archive.ubuntu.com/ubuntu/ bionic universe
diff --git a/projects/libavif/nasm_apt.pin b/projects/libavif/nasm_apt.pin
deleted file mode 100644
index 69099026..00000000
--- a/projects/libavif/nasm_apt.pin
+++ /dev/null
@@ -1,7 +0,0 @@
-Package: *
-Pin: release n=bionic
-Pin-Priority: 1
-
-Package: nasm
-Pin: release n=bionic
-Pin-Priority: 555
diff --git a/projects/opus/Dockerfile b/projects/opus/Dockerfile
index fa1c985b..717b8827 100644
--- a/projects/opus/Dockerfile
+++ b/projects/opus/Dockerfile
@@ -18,10 +18,6 @@ FROM gcr.io/oss-fuzz-base/base-builder
 RUN apt-get update && apt-get install -y make autoconf automake libtool wget
 
 RUN git clone https://gitlab.xiph.org/xiph/opus.git
-# Install more recent wget to work around https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=34761
-# "OpenSSL: error:1407742E:SSL routines:SSL23_GET_SERVER_HELLO:tlsv1 alert protocol version"
-RUN sed -i -e 's/xenial/bionic/g' /etc/apt/sources.list
-RUN apt-get update && apt-get install -y --reinstall wget
 RUN wget https://opus-codec.org/static/testvectors/opus_testvectors.tar.gz
 WORKDIR opus
 COPY build.sh $SRC/
diff --git a/projects/p11-kit/Dockerfile b/projects/p11-kit/Dockerfile
index 5ae78581..d3636ecf 100644
--- a/projects/p11-kit/Dockerfile
+++ b/projects/p11-kit/Dockerfile
@@ -15,9 +15,7 @@
 ################################################################################
 
 FROM gcr.io/oss-fuzz-base/base-builder
-RUN apt-get update && apt-get install -y make autoconf automake libtool pkg-config libtasn1-6-dev libffi-dev
-RUN echo deb http://archive.ubuntu.com/ubuntu/ bionic main >> /etc/apt/sources.list
-RUN apt-get update && apt-get install -y -t bionic gettext autopoint
+RUN apt-get update && apt-get install -y make autoconf automake libtool pkg-config libtasn1-6-dev libffi-dev gettext autopoint
 RUN git clone --depth 1 https://github.com/p11-glue/p11-kit.git p11-kit
 WORKDIR p11-kit
 COPY build.sh $SRC/
diff --git a/projects/postgis/Dockerfile b/projects/postgis/Dockerfile
index 67b7a696..2c55c549 100644
--- a/projects/postgis/Dockerfile
+++ b/projects/postgis/Dockerfile
@@ -15,8 +15,7 @@
 ################################################################################
 
 FROM gcr.io/oss-fuzz-base/base-builder
-RUN echo deb http://archive.ubuntu.com/ubuntu/ bionic main restricted universe multiverse >> /etc/apt/sources.list
-RUN apt-get update && apt-get install -y make autoconf automake libtool g++ postgresql-server-dev-10 libgeos-dev libproj-dev libxml2-dev pkg-config libjson-c-dev
+RUN apt-get update && apt-get install -y make autoconf automake libtool g++ postgresql-server-dev-12 libgeos-dev libproj-dev libxml2-dev pkg-config libjson-c-dev
 RUN git clone --depth 1 https://git.osgeo.org/gitea/postgis/postgis.git postgis
 WORKDIR postgis
 COPY build.sh $SRC/
diff --git a/projects/speex/Dockerfile b/projects/speex/Dockerfile
index eb3f3c0d..f8d8ef60 100644
--- a/projects/speex/Dockerfile
+++ b/projects/speex/Dockerfile
@@ -18,9 +18,5 @@ FROM gcr.io/oss-fuzz-base/base-builder
 RUN apt-get update && apt-get install -y make autoconf libtool pkg-config wget
 RUN git clone --depth 1 https://gitlab.xiph.org/xiph/ogg.git
 RUN git clone --depth 1 https://gitlab.xiph.org/xiph/speex.git speex
-# Install more recent wget to work around https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=34762
-# "OpenSSL: error:1407742E:SSL routines:SSL23_GET_SERVER_HELLO:tlsv1 alert protocol version"
-RUN sed -i -e 's/xenial/bionic/g' /etc/apt/sources.list
-RUN apt-get update && apt-get install -y --reinstall wget
 WORKDIR speex
 COPY build.sh $SRC/