From 2ceabadb81f98dd5b4b80f6a86b1e1050d216f68 Mon Sep 17 00:00:00 2001
From: alexzorin <alex@zorin.id.au>
Date: Sat, 5 Sep 2020 07:55:21 +1000
Subject: [PATCH 1/3] snap: use snap REST API in certbot.wrapper (#8260)

In order to avoid potentially breaking changes in the snap CLI on the
host, this commit changes certbot.wrapper to use the snap REST API (via
curl and jq) to list connected Certbot plugins.
---
 certbot.wrapper     | 2 +-
 snap/snapcraft.yaml | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/certbot.wrapper b/certbot.wrapper
index b7ce120bd..4f1143a2e 100755
--- a/certbot.wrapper
+++ b/certbot.wrapper
@@ -29,7 +29,7 @@ esac
 
 export CERTBOT_AUGEAS_PATH="${SNAP}/usr/lib/${ARCH_TRIPLET}/libaugeas.so.0"
 
-CERTBOT_PLUGIN_PATH="$(snap connections certbot | gawk 'BEGIN {ORS=""} NR>1 { if ($1 == "content[certbot-1]") { split($3,a,":"); PLUGINS=PLUGINS":/snap/"a[1]"/current/lib/python3.8/site-packages/"; next; } } END { print substr(PLUGINS, 2) }')"
+CERTBOT_PLUGIN_PATH="$(curl -s --unix-socket /run/snapd.socket "http://localhost/v2/connections?snap=certbot&interface=content" | jq -r  '.result.established | map(select(.plug.plug == "plugin" and ."plug-attrs".content == "certbot-1") | "/snap/"+.slot.snap+"/current/lib/python3.8/site-packages/" ) | join(":")')"
 export CERTBOT_PLUGIN_PATH
 
 exec certbot "$@"
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 2cd5271c4..c048a5dbc 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -72,7 +72,8 @@ parts:
       - python3-pkg-resources
       - python3.8-minimal
       # added for certbot.wrapper script:
-      - gawk
+      - curl
+      - jq
     # To build cryptography and cffi if needed
     build-packages: [gcc, libffi-dev, libssl-dev, git, libaugeas-dev, python3-dev]
     build-environment:

From 8e736479f7b00e979c13d16d4b9e89bb7e93c6b8 Mon Sep 17 00:00:00 2001
From: osirisinferi <github@flut.demon.nl>
Date: Sun, 6 Sep 2020 14:03:15 +0200
Subject: [PATCH 2/3] Lower heading level of "Changing a certs domain" (#8267)

---
 certbot/docs/using.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/certbot/docs/using.rst b/certbot/docs/using.rst
index c2c0910e5..cca6e2b2f 100644
--- a/certbot/docs/using.rst
+++ b/certbot/docs/using.rst
@@ -392,7 +392,7 @@ abuse of the ACME protocol, as described
 .. _changing:
 
 Changing a Certificate's Domains
-================================
+--------------------------------
 
 The ``--cert-name`` flag can also be used to modify the domains a certificate contains,
 by specifying new domains using the ``-d`` or ``--domains`` flag. If certificate ``example.com``

From b841f0f307e3f7bda7122761e0efa1139a50c6c8 Mon Sep 17 00:00:00 2001
From: osirisinferi <github@flut.demon.nl>
Date: Sun, 6 Sep 2020 14:14:33 +0200
Subject: [PATCH 3/3] Change ACME spec link to RFC 8555 (#8266)

---
 certbot/README.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/certbot/README.rst b/certbot/README.rst
index 8af8a344c..6d04e6fa3 100644
--- a/certbot/README.rst
+++ b/certbot/README.rst
@@ -67,9 +67,9 @@ Let's Encrypt Website: https://letsencrypt.org
 
 Community: https://community.letsencrypt.org
 
-ACME spec: http://ietf-wg-acme.github.io/acme/
+ACME spec: `RFC 8555 <https://tools.ietf.org/html/rfc8555>`_
 
-ACME working area in github: https://github.com/ietf-wg-acme/acme
+ACME working area in github (archived): https://github.com/ietf-wg-acme/acme
 
 |build-status|