From 9d8fe281c3277587d45b73eca67fc64449ee21ed Mon Sep 17 00:00:00 2001
From: Michal Nowak <mnowak@isc.org>
Date: Wed, 25 Jan 2023 16:55:46 +0100
Subject: [PATCH 1/2] Add Alpine Linux 3.17

(cherry picked from commit 345089ad2365917b941e2e74da91a0355a1979c4)
---
 .gitlab-ci.yml            | 22 +++++++++++-----------
 doc/arm/platforms.inc.rst |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bf3d0694ed..09a0cfbeb5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -105,8 +105,8 @@ stages:
 
 # Alpine Linux
 
-.alpine-3.16-amd64: &alpine_3_16_amd64_image
-  image: "$CI_REGISTRY_IMAGE:alpine-3.16-amd64"
+.alpine-3.17-amd64: &alpine_3_17_amd64_image
+  image: "$CI_REGISTRY_IMAGE:alpine-3.17-amd64"
   <<: *linux_amd64
 
 # Oracle Linux
@@ -574,28 +574,28 @@ docs:tarball:
     - job: tarball-create
       artifacts: true
 
-# Jobs for regular GCC builds on Alpine Linux 3.16 (amd64)
+# Jobs for regular GCC builds on Alpine Linux 3.17 (amd64)
 
-gcc:alpine3.16:amd64:
+gcc:alpine3.17:amd64:
   variables:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON}"
     EXTRA_CONFIGURE: "${WITHOUT_READLINE}"
-  <<: *alpine_3_16_amd64_image
+  <<: *alpine_3_17_amd64_image
   <<: *build_job
 
-system:gcc:alpine3.16:amd64:
-  <<: *alpine_3_16_amd64_image
+system:gcc:alpine3.17:amd64:
+  <<: *alpine_3_17_amd64_image
   <<: *system_test_job
   needs:
-    - job: gcc:alpine3.16:amd64
+    - job: gcc:alpine3.17:amd64
       artifacts: true
 
-unit:gcc:alpine3.16:amd64:
-  <<: *alpine_3_16_amd64_image
+unit:gcc:alpine3.17:amd64:
+  <<: *alpine_3_17_amd64_image
   <<: *unit_test_job
   needs:
-    - job: gcc:alpine3.16:amd64
+    - job: gcc:alpine3.17:amd64
       artifacts: true
 
 # Jobs for regular GCC builds on Oracle Linux 7 (amd64)
diff --git a/doc/arm/platforms.inc.rst b/doc/arm/platforms.inc.rst
index 9420e57533..17ba800701 100644
--- a/doc/arm/platforms.inc.rst
+++ b/doc/arm/platforms.inc.rst
@@ -51,7 +51,7 @@ following systems:
 -  Red Hat Enterprise Linux / CentOS / Oracle Linux 7, 8, 9
 -  FreeBSD 12.3, 13.1
 -  OpenBSD 7.2
--  Alpine Linux 3.16
+-  Alpine Linux 3.17
 
 The amd64, i386, armhf, and arm64 CPU architectures are all fully
 supported.

From 259dd5a3ec49266c4ee632c3507cca4103924052 Mon Sep 17 00:00:00 2001
From: Michal Nowak <mnowak@isc.org>
Date: Tue, 3 Jan 2023 11:08:37 +0100
Subject: [PATCH 2/2] Drop date from "Regularly Tested Platforms" section

Changing the date is easy to forget and may be outdated.

(cherry picked from commit 5783280b1078797b20c674764a7ef5aaaec66e92)
---
 doc/arm/platforms.inc.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/arm/platforms.inc.rst b/doc/arm/platforms.inc.rst
index 17ba800701..5a13fb2a33 100644
--- a/doc/arm/platforms.inc.rst
+++ b/doc/arm/platforms.inc.rst
@@ -42,7 +42,7 @@ able to offer support on a “best-effort” basis for some.
 Regularly Tested Platforms
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-As of August 2022, current versions of BIND 9 are fully supported and regularly tested on the
+Current versions of BIND 9 are fully supported and regularly tested on the
 following systems:
 
 -  Debian 10, 11