From 97e3227fbe83af85ee7d9c69106c48f82cf6fafe Mon Sep 17 00:00:00 2001
From: HolzHannes <holzhannes@posteo.de>
Date: Wed, 15 Dec 2021 16:22:16 +0100
Subject: [PATCH 1/2] added key CalDAVPassword and key CardDAVPassword

If the user is choosing the config with app password, it is now also used for CalDav and CardDav.
---
 data/web/mobileconfig.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/data/web/mobileconfig.php b/data/web/mobileconfig.php
index 532e405c..44aaa30a 100644
--- a/data/web/mobileconfig.php
+++ b/data/web/mobileconfig.php
@@ -153,6 +153,10 @@ echo '<?xml version="1.0" encoding="UTF-8"?>' . "\n";
         <true/>
         <key>CalDAVUsername</key>
         <string><?=$email?></string>
+        <?php if($app_password === true): ?>
+        <key>CalDAVPassword</key>
+        <string><?=$password?></string>
+        <?php endif; ?>
         <key>PayloadDescription</key>
         <string>Configures CalDAV account.</string>
         <key>PayloadDisplayName</key>
@@ -181,6 +185,10 @@ echo '<?xml version="1.0" encoding="UTF-8"?>' . "\n";
         <true/>
         <key>CardDAVUsername</key>
         <string><?=$email?></string>
+        <?php if($app_password === true): ?>
+        <key>CardDAVPassword</key>
+        <string><?=$password?></string>
+        <?php endif; ?>
         <key>PayloadDescription</key>
         <string>Configures CardDAV accounts</string>
         <key>PayloadDisplayName</key>

From a0b0d36e222a47fd9bbf8064aa85954d7e4e89f0 Mon Sep 17 00:00:00 2001
From: Alex Beakes <alex@beakes.me>
Date: Sun, 2 Jan 2022 03:51:09 +0300
Subject: [PATCH 2/2] Fix pip3 uninstall error

---
 data/Dockerfiles/netfilter/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/Dockerfiles/netfilter/Dockerfile b/data/Dockerfiles/netfilter/Dockerfile
index c63e99bc..0b6b6b6e 100644
--- a/data/Dockerfiles/netfilter/Dockerfile
+++ b/data/Dockerfiles/netfilter/Dockerfile
@@ -16,7 +16,7 @@ RUN apk add --virtual .build-deps \
   tzdata \
   py3-pip \
   musl-dev \
-&& pip3 install --upgrade pip \
+&& pip3 install --ignore-installed --upgrade pip \
   python-iptables \
   redis \
   ipaddress \