From a45a8fb04463b43631011b034fcdbd506f614e26 Mon Sep 17 00:00:00 2001
From: Frank Wall <fw@moov.de>
Date: Wed, 23 Mar 2022 13:14:14 +0100
Subject: [PATCH 1/4] security/acme-client: fix copyright, refs #2898

---
 .../mvc/app/models/OPNsense/AcmeClient/Migrations/M3_3_0.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/Migrations/M3_3_0.php b/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/Migrations/M3_3_0.php
index fc6cf2e41..16c2164bb 100644
--- a/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/Migrations/M3_3_0.php
+++ b/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/Migrations/M3_3_0.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- *    Copyright (C) 2021 Frank Wall
+ *    Copyright (C) 2022 Juergen Kellerer
  *
  *    All rights reserved.
  *

From 03ad1c834bc68d70b866d477cbd67b30f7e4ecee Mon Sep 17 00:00:00 2001
From: Frank Wall <fw@moov.de>
Date: Wed, 23 Mar 2022 13:22:35 +0100
Subject: [PATCH 2/4] security/acme-clent: preserve sort order of automations,
 closes #2833

---
 .../controllers/OPNsense/AcmeClient/forms/dialogCertificate.xml  | 1 +
 .../opnsense/mvc/app/models/OPNsense/AcmeClient/AcmeClient.xml   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/forms/dialogCertificate.xml b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/forms/dialogCertificate.xml
index ead828f21..d8f0bfd3c 100644
--- a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/forms/dialogCertificate.xml
+++ b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/forms/dialogCertificate.xml
@@ -84,6 +84,7 @@
         <type>select_multiple</type>
         <style>tokenize</style>
         <allownew>true</allownew>
+        <sortable>true</sortable>
         <help>Choose the automations that should be run after certificate creation and renewal. Basically every application requires a quick restart to reload the updated certificate. If you don't configure an automation, the in-memory certificate may expire and cause security warnings and other issues.</help>
     </field>
     <field>
diff --git a/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/AcmeClient.xml b/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/AcmeClient.xml
index cf8c7fd09..7d195f02e 100644
--- a/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/AcmeClient.xml
+++ b/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/AcmeClient.xml
@@ -270,6 +270,7 @@
                         </actions>
                     </Model>
                     <ValidationMessage>Related automation not found</ValidationMessage>
+                    <Sorted>Y</Sorted>
                     <multiple>Y</multiple>
                     <Required>N</Required>
                 </restartActions>

From 38e5a610e7f6d4e1057529b3cb3f25b3b3e51bad Mon Sep 17 00:00:00 2001
From: Frank Wall <fw@moov.de>
Date: Wed, 23 Mar 2022 13:26:34 +0100
Subject: [PATCH 3/4] security/acme-client: bump version

---
 security/acme-client/Makefile  | 3 +--
 security/acme-client/pkg-descr | 9 +++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/security/acme-client/Makefile b/security/acme-client/Makefile
index eee4abebd..00d852986 100644
--- a/security/acme-client/Makefile
+++ b/security/acme-client/Makefile
@@ -1,6 +1,5 @@
 PLUGIN_NAME=		acme-client
-PLUGIN_VERSION=		3.8
-PLUGIN_REVISION=	1
+PLUGIN_VERSION=		3.9
 PLUGIN_COMMENT=		ACME Client
 PLUGIN_MAINTAINER=	opnsense@moov.de
 PLUGIN_DEPENDS=		acme.sh py${PLUGIN_PYTHON}-dns-lexicon
diff --git a/security/acme-client/pkg-descr b/security/acme-client/pkg-descr
index b5025b594..9305b7752 100644
--- a/security/acme-client/pkg-descr
+++ b/security/acme-client/pkg-descr
@@ -8,6 +8,15 @@ WWW: https://github.com/acmesh-official/acme.sh
 Plugin Changelog
 ================
 
+3.9
+
+Added:
+* add support for Transip DNS API ( #2871)
+* execution order of automations can be changed (#2833)
+
+Fixed:
+* fix the use of a self hosted ACME-DNS service (#2898)
+
 3.8
 
 NOTE: Support for the cPanel and Selfhost API is not functional. It requires

From ccb2d6cf9bad34bfaafc9e84816a427fc4d3c7d3 Mon Sep 17 00:00:00 2001
From: Frank Wall <fw@moov.de>
Date: Wed, 23 Mar 2022 13:45:12 +0100
Subject: [PATCH 4/4] security/acme-client: fix missing closing tag, refs 
 #2871

---
 .../OPNsense/AcmeClient/forms/dialogValidation.xml         | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/forms/dialogValidation.xml b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/forms/dialogValidation.xml
index 5b14a4c23..7ee42f574 100644
--- a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/forms/dialogValidation.xml
+++ b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/forms/dialogValidation.xml
@@ -303,7 +303,7 @@
         <label>Password</label>
         <type>password</type>
     </field>
-	<field>
+    <field>
         <label>DDNSS API</label>
         <type>header</type>
         <style>table_dns table_dns_ddnss</style>
@@ -1069,12 +1069,13 @@
         <id>validation.dns_transip_username</id>
         <label>Username</label>
         <type>text</type>
-	<help>Your TransIP username.</help>
+        <help>Your TransIP username.</help>
+    </field>
     <field>
         <id>validation.dns_transip_key</id>
         <label>API Key</label>
         <type>text</type>
-	<help>Requires the whole key file in a format that is compatible with TransIP.</help>
+        <help>Requires the whole key file in a format that is compatible with TransIP.</help>
     </field>
     <field>
         <label>UnoEuro</label>