From c0a50032c6916508c793c6a6417294ae6ec30bfb Mon Sep 17 00:00:00 2001
From: Ben Banfield-Zanin <benbz@matrix.org>
Date: Thu, 11 Mar 2021 16:11:19 +0000
Subject: [PATCH 1/2] Use backports where newer versions exist and stop us
 needing to build

---
 prosody/Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/prosody/Dockerfile b/prosody/Dockerfile
index c2da8ea673..d9561073f6 100644
--- a/prosody/Dockerfile
+++ b/prosody/Dockerfile
@@ -7,12 +7,10 @@ RUN \
     && apt-dpkg-wrap apt-get install -y \
       lua5.2 \
       liblua5.2-dev \
-      libsasl2-dev \
       libssl-dev \
       luarocks \
       git \
       gcc \
-    && luarocks install cyrussasl 1.1.0-1 \
     && luarocks install net-url 0.9-1 \
     && luarocks install luajwtjitsi 2.0-0
 
@@ -31,8 +29,10 @@ RUN \
       libsasl2-modules-ldap \
       lua-basexx \
       lua-ldap \
-      lua-sec \
       patch \
+    && apt-dpkg-wrap apt-get install -t buster-backports -y \
+      lua-cyrussasl \
+      lua-sec \
     && apt-cleanup \
     && rm -rf /etc/prosody
 

From 76c56a5de704f8dc59577df4dc76d9b37a69c441 Mon Sep 17 00:00:00 2001
From: Ben Banfield-Zanin <benbz@matrix.org>
Date: Thu, 11 Mar 2021 16:11:30 +0000
Subject: [PATCH 2/2] Install lua-http from Debian

---
 prosody/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/prosody/Dockerfile b/prosody/Dockerfile
index d9561073f6..f4c7e50d32 100644
--- a/prosody/Dockerfile
+++ b/prosody/Dockerfile
@@ -29,6 +29,7 @@ RUN \
       libsasl2-modules-ldap \
       lua-basexx \
       lua-ldap \
+      lua-http \
       patch \
     && apt-dpkg-wrap apt-get install -t buster-backports -y \
       lua-cyrussasl \