py-aiosmtpd: update to 1.1

1.1:
Drop support for Python 3.4.
As per RFC 5321, §4.1.4, multiple HELO / EHLO commands in the same session are semantically equivalent to RSET.
As per RFC 5321, $4.1.1.9, NOOP takes an optional argument, which is ignored. API BREAK If you have a handler that implements handle_NOOP(), it previously took zero arguments but now requires a single argument.
The command line options --version / -v has been added to print the package’s current version number.
General improvements in the Controller class.
When aiosmtpd handles a STARTTLS it must arrange for the original transport to be closed when the wrapped transport is closed. This fixes a hidden exception which occurs when an EOF is received on the original tranport after the connection is lost.
Widen the catch of ConnectionResetError and CancelledError to also catch such errors from handler methods.
Added a manpage for the aiosmtpd command line script.
Added much better support for the HELP. There’s a new decorator called @syntax() which you can use in derived classes to decorate smtp_*() methods. These then show up in HELP responses. This also fixes HELP responses for the LMTP subclass.
The Controller class now takes an optional keyword argument ssl_context which is passed directly to the asyncio create_server() call.

4 files changed, 55 insertions, 51 deletions

diff --git a/mail/py-aiosmtpd/ALTERNATIVES b/mail/py-aiosmtpd/ALTERNATIVES
index e726a447d65..ef6b0b4af19 100644
--- a/mail/py-aiosmtpd/ALTERNATIVES
+++ b/mail/py-aiosmtpd/ALTERNATIVES
@@ -1 +1 @@
-bin/smtpd @PREFIX@/bin/smtpd@PYVERSSUFFIX@
+bin/aiosmtpd @PREFIX@/bin/aiosmtpd@PYVERSSUFFIX@
diff --git a/mail/py-aiosmtpd/Makefile b/mail/py-aiosmtpd/Makefile
index 38dc599e8dd..a9936225883 100644
--- a/mail/py-aiosmtpd/Makefile
+++ b/mail/py-aiosmtpd/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2017/04/26 08:44:46 fhajny Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/29 12:40:55 adam Exp $
 
-DISTNAME=	aiosmtpd-1.0a5
+DISTNAME=	aiosmtpd-1.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=	mail
+CATEGORIES=	mail python
 MASTER_SITES=	${MASTER_SITE_PYPI:=a/aiosmtpd/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -14,10 +14,10 @@ DEPENDS+=	${PYPKGPREFIX}-atpublic-[0-9]*:../../devel/py-atpublic
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_ACCEPTED=	36 35 34
+PYTHON_VERSIONS_INCOMPATIBLE=	34 27
 
 post-install:
-	cd ${DESTDIR}${PREFIX}/bin && ${MV} smtpd smtpd${PYVERSSUFFIX}
+	cd ${DESTDIR}${PREFIX}/bin && ${MV} aiosmtpd aiosmtpd${PYVERSSUFFIX} || ${TRUE}
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/py-aiosmtpd/PLIST b/mail/py-aiosmtpd/PLIST
index 2849245d837..bfec331ee6c 100644
--- a/mail/py-aiosmtpd/PLIST
+++ b/mail/py-aiosmtpd/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2017/04/25 17:16:57 fhajny Exp $
-bin/smtpd${PYVERSSUFFIX}
+@comment $NetBSD: PLIST,v 1.2 2017/09/29 12:40:55 adam Exp $
+bin/aiosmtpd${PYVERSSUFFIX}
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -7,76 +7,80 @@ ${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
 ${PYSITELIB}/${EGG_INFODIR}/requires.txt
 ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/aiosmtpd/__init__.py
-${PYSITELIB}/aiosmtpd/__main__.py
-${PYSITELIB}/aiosmtpd/__init__.pyo
 ${PYSITELIB}/aiosmtpd/__init__.pyc
-${PYSITELIB}/aiosmtpd/__main__.pyo
+${PYSITELIB}/aiosmtpd/__init__.pyo
+${PYSITELIB}/aiosmtpd/__main__.py
 ${PYSITELIB}/aiosmtpd/__main__.pyc
-${PYSITELIB}/aiosmtpd/controller.pyo
-${PYSITELIB}/aiosmtpd/controller.pyc
-${PYSITELIB}/aiosmtpd/handlers.pyo
-${PYSITELIB}/aiosmtpd/handlers.pyc
-${PYSITELIB}/aiosmtpd/lmtp.pyo
-${PYSITELIB}/aiosmtpd/lmtp.pyc
-${PYSITELIB}/aiosmtpd/main.pyo
-${PYSITELIB}/aiosmtpd/main.pyc
-${PYSITELIB}/aiosmtpd/smtp.pyo
-${PYSITELIB}/aiosmtpd/smtp.pyc
+${PYSITELIB}/aiosmtpd/__main__.pyo
 ${PYSITELIB}/aiosmtpd/controller.py
-${PYSITELIB}/aiosmtpd/docs/.gitignore
-${PYSITELIB}/aiosmtpd/docs/Makefile
+${PYSITELIB}/aiosmtpd/controller.pyc
+${PYSITELIB}/aiosmtpd/controller.pyo
 ${PYSITELIB}/aiosmtpd/docs/NEWS.rst
 ${PYSITELIB}/aiosmtpd/docs/__init__.py
-${PYSITELIB}/aiosmtpd/docs/__init__.pyo
 ${PYSITELIB}/aiosmtpd/docs/__init__.pyc
+${PYSITELIB}/aiosmtpd/docs/__init__.pyo
 ${PYSITELIB}/aiosmtpd/docs/cli.rst
+${PYSITELIB}/aiosmtpd/docs/concepts.rst
 ${PYSITELIB}/aiosmtpd/docs/controller.rst
 ${PYSITELIB}/aiosmtpd/docs/handlers.rst
 ${PYSITELIB}/aiosmtpd/docs/intro.rst
 ${PYSITELIB}/aiosmtpd/docs/lmtp.rst
+${PYSITELIB}/aiosmtpd/docs/manpage.rst
+${PYSITELIB}/aiosmtpd/docs/migrating.rst
 ${PYSITELIB}/aiosmtpd/docs/smtp.rst
 ${PYSITELIB}/aiosmtpd/handlers.py
+${PYSITELIB}/aiosmtpd/handlers.pyc
+${PYSITELIB}/aiosmtpd/handlers.pyo
 ${PYSITELIB}/aiosmtpd/lmtp.py
+${PYSITELIB}/aiosmtpd/lmtp.pyc
+${PYSITELIB}/aiosmtpd/lmtp.pyo
 ${PYSITELIB}/aiosmtpd/main.py
+${PYSITELIB}/aiosmtpd/main.pyc
+${PYSITELIB}/aiosmtpd/main.pyo
 ${PYSITELIB}/aiosmtpd/smtp.py
+${PYSITELIB}/aiosmtpd/smtp.pyc
+${PYSITELIB}/aiosmtpd/smtp.pyo
 ${PYSITELIB}/aiosmtpd/testing/__init__.py
-${PYSITELIB}/aiosmtpd/testing/__init__.pyo
 ${PYSITELIB}/aiosmtpd/testing/__init__.pyc
-${PYSITELIB}/aiosmtpd/testing/helpers.pyo
-${PYSITELIB}/aiosmtpd/testing/helpers.pyc
+${PYSITELIB}/aiosmtpd/testing/__init__.pyo
 ${PYSITELIB}/aiosmtpd/testing/helpers.py
+${PYSITELIB}/aiosmtpd/testing/helpers.pyc
+${PYSITELIB}/aiosmtpd/testing/helpers.pyo
 ${PYSITELIB}/aiosmtpd/tests/__init__.py
-${PYSITELIB}/aiosmtpd/tests/__init__.pyo
 ${PYSITELIB}/aiosmtpd/tests/__init__.pyc
-${PYSITELIB}/aiosmtpd/tests/test_handlers.pyo
-${PYSITELIB}/aiosmtpd/tests/test_handlers.pyc
-${PYSITELIB}/aiosmtpd/tests/test_lmtp.pyo
-${PYSITELIB}/aiosmtpd/tests/test_lmtp.pyc
-${PYSITELIB}/aiosmtpd/tests/test_main.pyo
-${PYSITELIB}/aiosmtpd/tests/test_main.pyc
-${PYSITELIB}/aiosmtpd/tests/test_server.pyo
-${PYSITELIB}/aiosmtpd/tests/test_server.pyc
-${PYSITELIB}/aiosmtpd/tests/test_smtp.pyo
-${PYSITELIB}/aiosmtpd/tests/test_smtp.pyc
-${PYSITELIB}/aiosmtpd/tests/test_starttls.pyo
-${PYSITELIB}/aiosmtpd/tests/test_starttls.pyc
+${PYSITELIB}/aiosmtpd/tests/__init__.pyo
 ${PYSITELIB}/aiosmtpd/tests/certs/__init__.py
-${PYSITELIB}/aiosmtpd/tests/certs/__init__.pyo
 ${PYSITELIB}/aiosmtpd/tests/certs/__init__.pyc
+${PYSITELIB}/aiosmtpd/tests/certs/__init__.pyo
 ${PYSITELIB}/aiosmtpd/tests/certs/server.crt
 ${PYSITELIB}/aiosmtpd/tests/certs/server.key
 ${PYSITELIB}/aiosmtpd/tests/test_handlers.py
+${PYSITELIB}/aiosmtpd/tests/test_handlers.pyc
+${PYSITELIB}/aiosmtpd/tests/test_handlers.pyo
 ${PYSITELIB}/aiosmtpd/tests/test_lmtp.py
+${PYSITELIB}/aiosmtpd/tests/test_lmtp.pyc
+${PYSITELIB}/aiosmtpd/tests/test_lmtp.pyo
 ${PYSITELIB}/aiosmtpd/tests/test_main.py
+${PYSITELIB}/aiosmtpd/tests/test_main.pyc
+${PYSITELIB}/aiosmtpd/tests/test_main.pyo
 ${PYSITELIB}/aiosmtpd/tests/test_server.py
+${PYSITELIB}/aiosmtpd/tests/test_server.pyc
+${PYSITELIB}/aiosmtpd/tests/test_server.pyo
 ${PYSITELIB}/aiosmtpd/tests/test_smtp.py
+${PYSITELIB}/aiosmtpd/tests/test_smtp.pyc
+${PYSITELIB}/aiosmtpd/tests/test_smtp.pyo
+${PYSITELIB}/aiosmtpd/tests/test_smtps.py
+${PYSITELIB}/aiosmtpd/tests/test_smtps.pyc
+${PYSITELIB}/aiosmtpd/tests/test_smtps.pyo
 ${PYSITELIB}/aiosmtpd/tests/test_starttls.py
+${PYSITELIB}/aiosmtpd/tests/test_starttls.pyc
+${PYSITELIB}/aiosmtpd/tests/test_starttls.pyo
 ${PYSITELIB}/examples/__init__.py
-${PYSITELIB}/examples/__init__.pyo
 ${PYSITELIB}/examples/__init__.pyc
-${PYSITELIB}/examples/client.pyo
-${PYSITELIB}/examples/client.pyc
-${PYSITELIB}/examples/server.pyo
-${PYSITELIB}/examples/server.pyc
+${PYSITELIB}/examples/__init__.pyo
 ${PYSITELIB}/examples/client.py
+${PYSITELIB}/examples/client.pyc
+${PYSITELIB}/examples/client.pyo
 ${PYSITELIB}/examples/server.py
+${PYSITELIB}/examples/server.pyc
+${PYSITELIB}/examples/server.pyo
diff --git a/mail/py-aiosmtpd/distinfo b/mail/py-aiosmtpd/distinfo
index 4f2fbd6f3cb..a1f8090d39f 100644
--- a/mail/py-aiosmtpd/distinfo
+++ b/mail/py-aiosmtpd/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1 2017/04/25 17:16:57 fhajny Exp $
+$NetBSD: distinfo,v 1.2 2017/09/29 12:40:55 adam Exp $
 
-SHA1 (aiosmtpd-1.0a5.tar.gz) = 8c246349b0947d22dd3bd379aa38f062e0732487
-RMD160 (aiosmtpd-1.0a5.tar.gz) = d335c697e60dadea055738fa79ce8980da7e55d8
-SHA512 (aiosmtpd-1.0a5.tar.gz) = e9c87eaad4c2a09bbcda2619d91958fc0cdc8cd15d8893a4b8ad9c8dc7202207c4bc7000823e83a84fb30441a22339328ec76d2d73027dc9e27beb7ce70d6a13
-Size (aiosmtpd-1.0a5.tar.gz) = 42031 bytes
+SHA1 (aiosmtpd-1.1.tar.gz) = 0df0e6a17ec9b29ed2c27955b4e3023f50fe4ef6
+RMD160 (aiosmtpd-1.1.tar.gz) = cda2cf6d970600c6dbace8fe0a6321c756b9dbc9
+SHA512 (aiosmtpd-1.1.tar.gz) = b61df616f2e14d1da67ac05149543bf48b14a31d44437d9a1dd11b166b98b56220c00e7c55e18d4fd99872d724e23f272922dd3548150632a189d9cb9b652883
+Size (aiosmtpd-1.1.tar.gz) = 50722 bytes