From fc409a145d69fdd95d2317ea96389382c3839c4c Mon Sep 17 00:00:00 2001
From: Andreas Olsson <andreas@arrakis.se>
Date: Sun, 24 Mar 2024 08:22:41 +0100
Subject: [PATCH] Upgrade to Zonemaster release 2023.2

Upstream release: https://github.com/zonemaster/zonemaster/releases/tag/v2023.2
---
 .github/workflows/publish.yaml | 2 +-
 Dockerfile                     | 8 +++++---
 README.md                      | 4 ++--
 profile.json.in                | 5 ++++-
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index d418eaa..4a0b819 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -14,7 +14,7 @@ jobs:
 
     runs-on: ubuntu-latest
     env:
-      ZMREL: 2023.1.4-2
+      ZMREL: 2023.2-1
 
     steps:
       - name: Check out repository
diff --git a/Dockerfile b/Dockerfile
index fb74fb4..c91b330 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,7 +17,9 @@ RUN apt-get update \
   liblist-moreutils-perl \
   liblocale-po-perl \
   liblog-any-perl \
+  libmail-spf-perl \
   libmailtools-perl \
+  libmime-base32-perl \
   libmodule-find-perl \
   libmodule-install-xsutil-perl \
   libmoosex-getopt-perl \
@@ -37,9 +39,9 @@ RUN apt-get update \
   libyaml-libyaml-perl \
   make \
   && rm -rf /var/lib/apt/lists/*
-RUN cpanm https://cpan.metacpan.org/authors/id/Z/ZN/ZNMSTR/Zonemaster-LDNS-3.2.0.tar.gz \
-    && cpanm https://cpan.metacpan.org/authors/id/Z/ZN/ZNMSTR/Zonemaster-Engine-v4.7.3.tar.gz \
-    && cpanm https://cpan.metacpan.org/authors/id/Z/ZN/ZNMSTR/Zonemaster-CLI-v6.0.3.tar.gz \
+RUN cpanm https://cpan.metacpan.org/authors/id/Z/ZN/ZNMSTR/Zonemaster-LDNS-4.0.0.tar.gz \
+    && cpanm https://cpan.metacpan.org/authors/id/Z/ZN/ZNMSTR/Zonemaster-Engine-v5.0.0.tar.gz \
+    && cpanm https://cpan.metacpan.org/authors/id/Z/ZN/ZNMSTR/Zonemaster-CLI-v6.1.0.tar.gz \
     && rm -rf /root/.cpanm/
 COPY entry /entry
 COPY profile.json.in /etc/zonemaster-profile.json.in
diff --git a/README.md b/README.md
index 90d4111..6982232 100644
--- a/README.md
+++ b/README.md
@@ -13,11 +13,11 @@ for the Zonemaster project.
 ## Usage
 
 ```shell
-docker run --rm --user=4848 --cap-drop=all --security-opt=no-new-privileges --read-only --tty ghcr.io/andreaso/zonemaster-cli:2023.1.4-2 --help
+docker run --rm --user=4848 --cap-drop=all --security-opt=no-new-privileges --read-only --tty ghcr.io/andreaso/zonemaster-cli:2023.2-1 --help
 ```
 
 ```shell
-docker run --rm --user=4848 --cap-drop=all --security-opt=no-new-privileges --read-only --network=host --tty ghcr.io/andreaso/zonemaster-cli:2023.1.4-2 DOMAIN
+docker run --rm --user=4848 --cap-drop=all --security-opt=no-new-privileges --read-only --network=host --tty ghcr.io/andreaso/zonemaster-cli:2023.2-1 DOMAIN
 ```
 
 (Suggesting `--network=host` since it's more likely to have IPv6 connectivity by default.)
diff --git a/profile.json.in b/profile.json.in
index 60ed940..f125474 100644
--- a/profile.json.in
+++ b/profile.json.in
@@ -6,6 +6,8 @@
     "address01",
     "address02",
     "address03",
+    "basic01",
+    "basic02",
     "basic03",
     "connectivity01",
     "connectivity02",
@@ -71,6 +73,7 @@
     "zone07",
     "zone08",
     "zone09",
-    "zone10"
+    "zone10",
+    "zone11"
   ]
 }