Update to 4.0.4. From the git log:

- Make regular expression accept a whitespace after CN.
- Don't fail on openssl 1.1 output
- Add documentation and support for Red Hat openssl directories
- fix parsing of new (?) openssl output format
- Fix broken Markdown headings
- FIX CN parsing to work with OpenSSL 1.1
- Make acme_tiny.py executable in index
- Minor tweak that makes deploying a tiny bit easier
- OpenSSL output seems to have changed another time.
- fixed changing error message
- fixed more error message case changes
- Fix typos
- switched to grabbing the agreement url from /directory, addresses #145, #148, #172, #189
- damn python3 bytes-to-strings encoding gets you again...
- added python 3.6 to test coverage
- update SSL config
- mostly working ACMEv2, except for letsencrypt/boulder#3367
- deprecated CA url in favor of using the direct certificate authority directory url
- added badNonce retries
- consolidated external commandline execution error handling to bring back under 200 lines of code
- removed challenge payload that is no longer needed in new acme spec
- updated test coverage to ignore new setup.py file (setup install still gets tested via test_install.py)
- updated readme to note that ACME v2 certificate downloads now include the intermediate certificate
- added optional contact details
- fixed buffer to unicode decoding for tests
- cleaned up help and copyright text
- Readme: Only needs access to private account key
- added tiny user agent
- don't skip ValueError when urlopen(Request(nonvalid, ...))

3 files changed, 8 insertions, 25 deletions

diff --git a/security/py-acme-tiny/Makefile b/security/py-acme-tiny/Makefile
index 08b74da45d8..88ddf626e37 100644
--- a/security/py-acme-tiny/Makefile
+++ b/security/py-acme-tiny/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2018/03/10 17:18:42 schmonz Exp $
+# $NetBSD: Makefile,v 1.3 2018/09/08 18:52:18 schmonz Exp $
 
-DISTNAME=	acme-tiny-0.0.20170214
+DISTNAME=	acme-tiny-4.0.4
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GITHUB:=diafygi/}
 
@@ -12,7 +11,7 @@ COMMENT=	Tiny script to issue and renew TLS certs from Let's Encrypt
 LICENSE=	mit
 
 GITHUB_PROJECT=	acme-tiny
-GITHUB_TAG=	daba51d37efd7c1f205f9da383b9b09968e30d29
+GITHUB_TAG=	${PKGVERSION_NOREV}
 
 NO_BUILD=	yes
 INSTALLATION_DIRS=bin share/doc/${PYPKGPREFIX}-acme-tiny
diff --git a/security/py-acme-tiny/distinfo b/security/py-acme-tiny/distinfo
index 58d02f748ed..ec306d61bd3 100644
--- a/security/py-acme-tiny/distinfo
+++ b/security/py-acme-tiny/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.2 2018/03/10 17:18:42 schmonz Exp $
+$NetBSD: distinfo,v 1.3 2018/09/08 18:52:18 schmonz Exp $
 
-SHA1 (acme-tiny-0.0.20170214-daba51d37efd7c1f205f9da383b9b09968e30d29.tar.gz) = 1e312aa9e1dd24eb34bd42bb418f83b2df7e5235
-RMD160 (acme-tiny-0.0.20170214-daba51d37efd7c1f205f9da383b9b09968e30d29.tar.gz) = 82897ea46269517e4328e2d1f67ca7b27d05481e
-SHA512 (acme-tiny-0.0.20170214-daba51d37efd7c1f205f9da383b9b09968e30d29.tar.gz) = 260de3fe3052e3eba3e8438b15e34d95c99f95d75137ddabe9c031a83bd7b967bebabe6916fa23de6194ab19cc687942af0cc700b7095b7c810820800c26061e
-Size (acme-tiny-0.0.20170214-daba51d37efd7c1f205f9da383b9b09968e30d29.tar.gz) = 10510 bytes
-SHA1 (patch-acme__tiny.py) = 8f845e7db15c448f87af79af95f32c394286d2fe
+SHA1 (acme-tiny-4.0.4.tar.gz) = 7927fad282834cc9fc1a9b835ace93006125d4fb
+RMD160 (acme-tiny-4.0.4.tar.gz) = 927fa9509d6200dddbab29b2e58cf309e8434369
+SHA512 (acme-tiny-4.0.4.tar.gz) = e66befe8262b3396e5e55ea01fc47c668c527868832d2ccdc2786156ec52e698fd20cb6fa4fe861d97947d64f4b6c751be9c79bf546eaac34978c53b9e6f85e4
+Size (acme-tiny-4.0.4.tar.gz) = 12667 bytes
diff --git a/security/py-acme-tiny/patches/patch-acme__tiny.py b/security/py-acme-tiny/patches/patch-acme__tiny.py
deleted file mode 100644
index 6b6aec69c7a..00000000000
--- a/security/py-acme-tiny/patches/patch-acme__tiny.py
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-acme__tiny.py,v 1.1 2018/03/10 17:18:42 schmonz Exp $
-
-The user agreement URL moved. Find it again. (Upstream patch c4940d2.)
-
---- acme_tiny.py.orig	2016-08-18 03:29:25.000000000 +0000
-+++ acme_tiny.py
-@@ -82,7 +82,7 @@ def get_crt(account_key, csr, acme_dir, 
-     log.info("Registering account...")
-     code, result = _send_signed_request(CA + "/acme/new-reg", {
-         "resource": "new-reg",
--        "agreement": "https://letsencrypt.org/documents/LE-SA-v1.1.1-August-1-2016.pdf",
-+        "agreement": json.load(urlopen(CA + "/directory"))['meta']['terms-of-service'],
-     })
-     if code == 201:
-         log.info("Registered!")