From f5632185f54d37e98064617fc4fb76de52ac975f Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Fri, 9 Jun 2023 16:28:51 +0200
Subject: [PATCH] security/acme.sh: partially sync with upstream

Taken from: FreeBSD
---
 security/acme.sh/Makefile                     |  4 +---
 security/acme.sh/distinfo                     |  6 +++---
 .../files/patch-dnsapi_dns__opnsense.sh       | 20 -------------------
 security/acme.sh/pkg-plist                    |  4 ++++
 4 files changed, 8 insertions(+), 26 deletions(-)
 delete mode 100644 security/acme.sh/files/patch-dnsapi_dns__opnsense.sh

diff --git a/security/acme.sh/Makefile b/security/acme.sh/Makefile
index 80cd003a9eac..47c8632c6fb1 100644
--- a/security/acme.sh/Makefile
+++ b/security/acme.sh/Makefile
@@ -1,7 +1,5 @@
 PORTNAME=	acme.sh
-PORTVERSION=	3.0.5
-DISTVERSIONPREFIX=	v
-PORTREVISION=	2
+PORTVERSION=	3.0.6
 CATEGORIES=	security
 
 MAINTAINER=	dvl@FreeBSD.org
diff --git a/security/acme.sh/distinfo b/security/acme.sh/distinfo
index f3cf98b6e8d0..4d96068983be 100644
--- a/security/acme.sh/distinfo
+++ b/security/acme.sh/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1669227084
-SHA256 (acmesh-official-acme.sh-v3.0.5_GH0.tar.gz) = a19132ed65491409a8d8a93c264dcbcf265a91d45a46de674811b93f5995398f
-SIZE (acmesh-official-acme.sh-v3.0.5_GH0.tar.gz) = 270092
+TIMESTAMP = 1686333811
+SHA256 (acmesh-official-acme.sh-3.0.6_GH0.tar.gz) = 4a8e44c27e2a8f01a978e8d15add8e9908b83f9b1555670e49a9b769421f5fa6
+SIZE (acmesh-official-acme.sh-3.0.6_GH0.tar.gz) = 275569
diff --git a/security/acme.sh/files/patch-dnsapi_dns__opnsense.sh b/security/acme.sh/files/patch-dnsapi_dns__opnsense.sh
deleted file mode 100644
index 2b6dad74354b..000000000000
--- a/security/acme.sh/files/patch-dnsapi_dns__opnsense.sh
+++ /dev/null
@@ -1,20 +0,0 @@
---- dnsapi/dns_opnsense.sh.orig	2023-05-08 12:20:30 UTC
-+++ dnsapi/dns_opnsense.sh
-@@ -137,7 +137,7 @@ _get_root() {
-   domain=$1
-   i=2
-   p=1
--  if _opns_rest "GET" "/domain/searchMasterDomain"; then
-+  if _opns_rest "GET" "/domain/searchPrimaryDomain"; then
-     _domain_response="$response"
-   else
-     return 1
-@@ -150,7 +150,7 @@ _get_root() {
-       return 1
-     fi
-     _debug h "$h"
--    id=$(echo "$_domain_response" | _egrep_o "\"uuid\":\"[a-z0-9\-]*\",\"enabled\":\"1\",\"type\":\"master\",\"domainname\":\"${h}\"" | cut -d ':' -f 2 | cut -d '"' -f 2)
-+    id=$(echo "$_domain_response" | _egrep_o "\"uuid\":\"[a-z0-9\-]*\",\"enabled\":\"1\",\"type\":\"primary\",\"domainname\":\"${h}\"" | cut -d ':' -f 2 | cut -d '"' -f 2)
-     if [ -n "$id" ]; then
-       _debug id "$id"
-       _host=$(printf "%s" "$domain" | cut -d . -f 1-$p)
diff --git a/security/acme.sh/pkg-plist b/security/acme.sh/pkg-plist
index 531475acc35f..53a54df89338 100644
--- a/security/acme.sh/pkg-plist
+++ b/security/acme.sh/pkg-plist
@@ -88,9 +88,11 @@ sbin/acme.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_fornex.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_freedns.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_gandi_livedns.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_gcore.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_gcloud.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_gd.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_geoscaling.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_googledomains.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_huaweicloud.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_he.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_hetzner.sh
@@ -99,6 +101,7 @@ sbin/acme.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_infoblox.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_infomaniak.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_ionos.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_ipv64.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_internetbs.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_inwx.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_ispconfig.sh
@@ -126,6 +129,7 @@ sbin/acme.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_namecheap.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_namecom.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_namesilo.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_nanelo.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_nederhost.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_neodigit.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_netcup.sh