From 90cdc26376cf01df3b7943c54c7aa6c5d584fc41 Mon Sep 17 00:00:00 2001
From: Dan Langille <dvl@FreeBSD.org>
Date: Thu, 3 Sep 2020 21:36:53 +0000
Subject: [PATCH] Update to 2.8.7

* Support External Account Binding(EAB)
* Support ZeroSSL.com CA
* Support preferred-chain
* More dns api support
* Adds Docker multi-arch build support
---
 security/acme.sh/Makefile            |  3 +--
 security/acme.sh/distinfo            |  6 +++---
 security/acme.sh/files/patch-acme.sh | 19 -------------------
 security/acme.sh/pkg-plist           |  8 ++++++++
 4 files changed, 12 insertions(+), 24 deletions(-)
 delete mode 100644 security/acme.sh/files/patch-acme.sh

diff --git a/security/acme.sh/Makefile b/security/acme.sh/Makefile
index 11e767f822fc..ef0377e3e7cd 100644
--- a/security/acme.sh/Makefile
+++ b/security/acme.sh/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	acme.sh
-PORTVERSION=	2.8.6
-PORTREVISION=	2
+PORTVERSION=	2.8.7
 CATEGORIES=	security
 
 MAINTAINER=	dvl@FreeBSD.org
diff --git a/security/acme.sh/distinfo b/security/acme.sh/distinfo
index b40e261ca692..91d6a0618e85 100644
--- a/security/acme.sh/distinfo
+++ b/security/acme.sh/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1588553979
-SHA256 (Neilpang-acme.sh-2.8.6_GH0.tar.gz) = fd36cb749466296ded521ceacda3fc841ec76be620900d1116e0492d171c1d9f
-SIZE (Neilpang-acme.sh-2.8.6_GH0.tar.gz) = 193182
+TIMESTAMP = 1599009231
+SHA256 (Neilpang-acme.sh-2.8.7_GH0.tar.gz) = 774010429730882f6bbfcd3756ff0fa755846106664841092af828a814159861
+SIZE (Neilpang-acme.sh-2.8.7_GH0.tar.gz) = 206475
diff --git a/security/acme.sh/files/patch-acme.sh b/security/acme.sh/files/patch-acme.sh
deleted file mode 100644
index b258699ec949..000000000000
--- a/security/acme.sh/files/patch-acme.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-Fix sudo issue
-https://github.com/acmesh-official/acme.sh/pull/2574
-
---- acme.sh.orig	2020-08-02 05:02:04 UTC
-+++ acme.sh
-@@ -6415,10 +6415,10 @@ _checkSudo() {
-       #it's root using sudo, no matter it's using sudo or not, just fine
-       return 0
-     fi
--    if [ "$SUDO_COMMAND" = "/bin/su" ] || [ "$SUDO_COMMAND" = "/bin/bash" ]; then
-+    if [ -n "$SUDO_COMMAND" ]; then
-       #it's a normal user doing "sudo su", or `sudo -i` or `sudo -s`
--      #fine
--      return 0
-+      _endswith "$SUDO_COMMAND" /bin/su || grep "^$SUDO_COMMAND\$" /etc/shells >/dev/null 2>&1
-+      return $?
-     fi
-     #otherwise
-     return 1
diff --git a/security/acme.sh/pkg-plist b/security/acme.sh/pkg-plist
index f41e96bd8436..ec220e621070 100644
--- a/security/acme.sh/pkg-plist
+++ b/security/acme.sh/pkg-plist
@@ -18,6 +18,7 @@ sbin/acme.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/deploy/mysqld.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/deploy/nginx.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/deploy/opensshd.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/deploy/openstack.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/deploy/panos.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/deploy/pureftpd.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/deploy/qiniu.sh
@@ -73,6 +74,7 @@ sbin/acme.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_gd.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_gdnsdk.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_he.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_hetzner.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_hexonet.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_hostingde.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_infoblox.sh
@@ -81,6 +83,7 @@ sbin/acme.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_ispconfig.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_jd.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_joker.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_kappernet.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_kas.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_kinghost.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_knot.sh
@@ -103,7 +106,9 @@ sbin/acme.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_nederhost.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_neodigit.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_netcup.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_netlify.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_nic.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_njalla.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_nm.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_nsd.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_nsone.sh
@@ -112,6 +117,7 @@ sbin/acme.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_one.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_online.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_openprovider.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_openstack.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_opnsense.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_ovh.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_pdns.sh
@@ -125,6 +131,7 @@ sbin/acme.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_servercow.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_tele3.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_ultra.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_transip.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_unoeuro.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_variomedia.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsapi/dns_vscale.sh
@@ -144,6 +151,7 @@ sbin/acme.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/notify/sendgrid.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/notify/slack.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/notify/smtp.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/notify/teams.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/notify/xmpp.sh
 @sample(acme,acme,0640) /var/db/acme/.acme.sh/account.conf.sample
 %%PORTEXAMPLES%%/var/db/acme/.acme.sh/deploy