From fc38c6975367c09d003474ebd7bfefc465459a06 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Thu, 26 Aug 2021 15:11:37 -0500
Subject: [PATCH] Update matrix-eavesdrop for bullseye

Bullseye means we don't need the backports repos. Also, the upstream
images have bullseye-backports in them already now.

Depends-On: https://review.opendev.org/c/opendev/system-config/+/800318
Change-Id: I3813068c21d06d9b182fe81efcf2e636b2170c4a
---
 docker/matrix-eavesdrop/Dockerfile     | 2 --
 docker/matrix-eavesdrop/src/bindep.txt | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/docker/matrix-eavesdrop/Dockerfile b/docker/matrix-eavesdrop/Dockerfile
index 52cee9a7e5..92cc5e48c4 100644
--- a/docker/matrix-eavesdrop/Dockerfile
+++ b/docker/matrix-eavesdrop/Dockerfile
@@ -14,13 +14,11 @@
 # limitations under the License.
 
 FROM docker.io/opendevorg/python-builder:3.9 as builder
-RUN echo 'deb http://deb.debian.org/debian buster-backports main' >> /etc/apt/sources.list
 
 COPY src /tmp/src
 RUN assemble
 
 FROM docker.io/opendevorg/python-base:3.9 as eavesdrop
-RUN echo 'deb http://deb.debian.org/debian buster-backports main' >> /etc/apt/sources.list
 
 COPY --from=builder /output/ /output
 RUN /output/install-from-bindep \
diff --git a/docker/matrix-eavesdrop/src/bindep.txt b/docker/matrix-eavesdrop/src/bindep.txt
index 16b91ae828..e65b421f3f 100644
--- a/docker/matrix-eavesdrop/src/bindep.txt
+++ b/docker/matrix-eavesdrop/src/bindep.txt
@@ -1,7 +1,7 @@
 gcc [compile test]
 libc6-dev [compile test]
 libffi-dev [compile test]
-libolm-dev/buster-backports [compile test]
+libolm-dev [compile test]
 make [compile test]
 python3-dev [compile test]
-libolm3/buster-backports
+libolm3