py-esptool: updated to 3.1

Version 3.1

New Features

Support for ESP32-C3 SoC has been added
Added --encrypt-files option to specify which files need encryption before flashing.
Added --use_segments option for elf2image to use segments instead of sections to generate the image.
Improved the write_flash timeout calculation and status message.
Support for detecting ESP8285 versions -N08, -N16, -H08, and -H16 has been added.
Added support for all write_reg command forms (including delay and mask parameters) to flasher stub.
Added merge_bin command to combine binary files on host
Extended the --min-rev argument of elf2image to work on all chips apart from ESP8266.
Added diagnostic warnings about the memory regions needing to be erased during a flash write
Added --after no_reset_stub option to keep the flasher stub running and allow its repeated usage.
Added support for the USB-JTAG-Serial peripheral of ESP32-C3.

espsecure.py

Added custom command-line argument to allow calling from other Python scripts.
Added --aes-xts option to encrypt/decrypt flash data files with AES-XTS algorithm on the S2 and C3.
Fixed handling of files to forbid empty output and re-writing input.

espefuse.py

Added custom command-line argument to allow calling from other Python scripts.
Added security measures to prevent burning custom multicast MAC address.
Fixed errors when burning and read-protecting an efuse at the same time
Fixed burning of SPI pins configuration efuses

Internal features

These features are intended for use inside Espressif:

Support for ESP32-S3-beta3 & ESP32-C6-beta have been added. These SoCs are not generally available, so they are unsupported in this release. Official support will be added in a later esptool release.
Support for 32-bit addressing to enable 32/64MB flash memory chips on the S3.

Bug Fixes

Fixed error outputs when installing from pip.
Increased the timeout for writing to flash to improve stability
Fixed failing dump_mem overall bytes read message.
Allowed the write_mem mask argument to be optional to match with its usage example on Wiki.
Ensured expand_file_arguments gets called when using custom command-line arguments.
Fixed SecureBoot v2 public key extraction

Miscellaneous Changes

Decomposed port detection logic.
Added flushing after each command before waiting for a reply.
Made it easier to use esptool.py as a component by permitting passing an already formed esp object to main()
Added function to merge adjacent sections in elf2image for the use case of linker scripts that have a large number of sections.
Decoupled esptool reset logic for easier monkey-patching

3 files changed, 108 insertions, 10 deletions

diff --git a/comms/py-esptool/Makefile b/comms/py-esptool/Makefile
index c9f636a0160..3b6f2a5eeec 100644
--- a/comms/py-esptool/Makefile
+++ b/comms/py-esptool/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2020/07/21 08:14:06 adam Exp $
+# $NetBSD: Makefile,v 1.6 2021/09/09 08:04:23 adam Exp $
 
-DISTNAME=	esptool-2.8
+DISTNAME=	esptool-3.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	comms python
 MASTER_SITES=	${MASTER_SITE_PYPI:=e/esptool/}
@@ -10,8 +10,10 @@ HOMEPAGE=	https://github.com/espressif/esptool
 COMMENT=	Firmware tool for ESP8266/ESP32
 LICENSE=	gnu-gpl-v2
 
-DEPENDS+=	${PYPKGPREFIX}-aes-[0-9]*:../../security/py-aes
-DEPENDS+=	${PYPKGPREFIX}-ecdsa-[0-9]*:../../security/py-ecdsa
+DEPENDS+=	${PYPKGPREFIX}-bitstring>=3.1.6:../../devel/py-bitstring
+DEPENDS+=	${PYPKGPREFIX}-cryptography>=2.1.4:../../security/py-cryptography
+DEPENDS+=	${PYPKGPREFIX}-ecdsa>=0.16.0:../../security/py-ecdsa
+DEPENDS+=	${PYPKGPREFIX}-reedsolo>=1.5.3:../../converters/py-reedsolo
 DEPENDS+=	${PYPKGPREFIX}-serial>=3.0:../../comms/py-serial
 
 USE_LANGUAGES=	# none
diff --git a/comms/py-esptool/PLIST b/comms/py-esptool/PLIST
index dfb123ee918..6d8eb2d48c6 100644
--- a/comms/py-esptool/PLIST
+++ b/comms/py-esptool/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2020/07/21 08:14:06 adam Exp $
+@comment $NetBSD: PLIST,v 1.3 2021/09/09 08:04:23 adam Exp $
 bin/espefuse.py
 bin/espsecure.py
 bin/esptool.py
@@ -10,6 +10,102 @@ ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/espefuse.py
 ${PYSITELIB}/espefuse.pyc
 ${PYSITELIB}/espefuse.pyo
+${PYSITELIB}/espressif/__init__.py
+${PYSITELIB}/espressif/__init__.pyc
+${PYSITELIB}/espressif/__init__.pyo
+${PYSITELIB}/espressif/efuse/__init__.py
+${PYSITELIB}/espressif/efuse/__init__.pyc
+${PYSITELIB}/espressif/efuse/__init__.pyo
+${PYSITELIB}/espressif/efuse/base_fields.py
+${PYSITELIB}/espressif/efuse/base_fields.pyc
+${PYSITELIB}/espressif/efuse/base_fields.pyo
+${PYSITELIB}/espressif/efuse/base_operations.py
+${PYSITELIB}/espressif/efuse/base_operations.pyc
+${PYSITELIB}/espressif/efuse/base_operations.pyo
+${PYSITELIB}/espressif/efuse/emulate_efuse_controller_base.py
+${PYSITELIB}/espressif/efuse/emulate_efuse_controller_base.pyc
+${PYSITELIB}/espressif/efuse/emulate_efuse_controller_base.pyo
+${PYSITELIB}/espressif/efuse/esp32/__init__.py
+${PYSITELIB}/espressif/efuse/esp32/__init__.pyc
+${PYSITELIB}/espressif/efuse/esp32/__init__.pyo
+${PYSITELIB}/espressif/efuse/esp32/emulate_efuse_controller.py
+${PYSITELIB}/espressif/efuse/esp32/emulate_efuse_controller.pyc
+${PYSITELIB}/espressif/efuse/esp32/emulate_efuse_controller.pyo
+${PYSITELIB}/espressif/efuse/esp32/fields.py
+${PYSITELIB}/espressif/efuse/esp32/fields.pyc
+${PYSITELIB}/espressif/efuse/esp32/fields.pyo
+${PYSITELIB}/espressif/efuse/esp32/mem_definition.py
+${PYSITELIB}/espressif/efuse/esp32/mem_definition.pyc
+${PYSITELIB}/espressif/efuse/esp32/mem_definition.pyo
+${PYSITELIB}/espressif/efuse/esp32/operations.py
+${PYSITELIB}/espressif/efuse/esp32/operations.pyc
+${PYSITELIB}/espressif/efuse/esp32/operations.pyo
+${PYSITELIB}/espressif/efuse/esp32c3/__init__.py
+${PYSITELIB}/espressif/efuse/esp32c3/__init__.pyc
+${PYSITELIB}/espressif/efuse/esp32c3/__init__.pyo
+${PYSITELIB}/espressif/efuse/esp32c3/emulate_efuse_controller.py
+${PYSITELIB}/espressif/efuse/esp32c3/emulate_efuse_controller.pyc
+${PYSITELIB}/espressif/efuse/esp32c3/emulate_efuse_controller.pyo
+${PYSITELIB}/espressif/efuse/esp32c3/fields.py
+${PYSITELIB}/espressif/efuse/esp32c3/fields.pyc
+${PYSITELIB}/espressif/efuse/esp32c3/fields.pyo
+${PYSITELIB}/espressif/efuse/esp32c3/mem_definition.py
+${PYSITELIB}/espressif/efuse/esp32c3/mem_definition.pyc
+${PYSITELIB}/espressif/efuse/esp32c3/mem_definition.pyo
+${PYSITELIB}/espressif/efuse/esp32c3/operations.py
+${PYSITELIB}/espressif/efuse/esp32c3/operations.pyc
+${PYSITELIB}/espressif/efuse/esp32c3/operations.pyo
+${PYSITELIB}/espressif/efuse/esp32s2/__init__.py
+${PYSITELIB}/espressif/efuse/esp32s2/__init__.pyc
+${PYSITELIB}/espressif/efuse/esp32s2/__init__.pyo
+${PYSITELIB}/espressif/efuse/esp32s2/emulate_efuse_controller.py
+${PYSITELIB}/espressif/efuse/esp32s2/emulate_efuse_controller.pyc
+${PYSITELIB}/espressif/efuse/esp32s2/emulate_efuse_controller.pyo
+${PYSITELIB}/espressif/efuse/esp32s2/fields.py
+${PYSITELIB}/espressif/efuse/esp32s2/fields.pyc
+${PYSITELIB}/espressif/efuse/esp32s2/fields.pyo
+${PYSITELIB}/espressif/efuse/esp32s2/mem_definition.py
+${PYSITELIB}/espressif/efuse/esp32s2/mem_definition.pyc
+${PYSITELIB}/espressif/efuse/esp32s2/mem_definition.pyo
+${PYSITELIB}/espressif/efuse/esp32s2/operations.py
+${PYSITELIB}/espressif/efuse/esp32s2/operations.pyc
+${PYSITELIB}/espressif/efuse/esp32s2/operations.pyo
+${PYSITELIB}/espressif/efuse/esp32s3beta2/__init__.py
+${PYSITELIB}/espressif/efuse/esp32s3beta2/__init__.pyc
+${PYSITELIB}/espressif/efuse/esp32s3beta2/__init__.pyo
+${PYSITELIB}/espressif/efuse/esp32s3beta2/emulate_efuse_controller.py
+${PYSITELIB}/espressif/efuse/esp32s3beta2/emulate_efuse_controller.pyc
+${PYSITELIB}/espressif/efuse/esp32s3beta2/emulate_efuse_controller.pyo
+${PYSITELIB}/espressif/efuse/esp32s3beta2/fields.py
+${PYSITELIB}/espressif/efuse/esp32s3beta2/fields.pyc
+${PYSITELIB}/espressif/efuse/esp32s3beta2/fields.pyo
+${PYSITELIB}/espressif/efuse/esp32s3beta2/mem_definition.py
+${PYSITELIB}/espressif/efuse/esp32s3beta2/mem_definition.pyc
+${PYSITELIB}/espressif/efuse/esp32s3beta2/mem_definition.pyo
+${PYSITELIB}/espressif/efuse/esp32s3beta2/operations.py
+${PYSITELIB}/espressif/efuse/esp32s3beta2/operations.pyc
+${PYSITELIB}/espressif/efuse/esp32s3beta2/operations.pyo
+${PYSITELIB}/espressif/efuse/esp32s3beta3/__init__.py
+${PYSITELIB}/espressif/efuse/esp32s3beta3/__init__.pyc
+${PYSITELIB}/espressif/efuse/esp32s3beta3/__init__.pyo
+${PYSITELIB}/espressif/efuse/esp32s3beta3/emulate_efuse_controller.py
+${PYSITELIB}/espressif/efuse/esp32s3beta3/emulate_efuse_controller.pyc
+${PYSITELIB}/espressif/efuse/esp32s3beta3/emulate_efuse_controller.pyo
+${PYSITELIB}/espressif/efuse/esp32s3beta3/fields.py
+${PYSITELIB}/espressif/efuse/esp32s3beta3/fields.pyc
+${PYSITELIB}/espressif/efuse/esp32s3beta3/fields.pyo
+${PYSITELIB}/espressif/efuse/esp32s3beta3/mem_definition.py
+${PYSITELIB}/espressif/efuse/esp32s3beta3/mem_definition.pyc
+${PYSITELIB}/espressif/efuse/esp32s3beta3/mem_definition.pyo
+${PYSITELIB}/espressif/efuse/esp32s3beta3/operations.py
+${PYSITELIB}/espressif/efuse/esp32s3beta3/operations.pyc
+${PYSITELIB}/espressif/efuse/esp32s3beta3/operations.pyo
+${PYSITELIB}/espressif/efuse/mem_definition_base.py
+${PYSITELIB}/espressif/efuse/mem_definition_base.pyc
+${PYSITELIB}/espressif/efuse/mem_definition_base.pyo
+${PYSITELIB}/espressif/efuse/util.py
+${PYSITELIB}/espressif/efuse/util.pyc
+${PYSITELIB}/espressif/efuse/util.pyo
 ${PYSITELIB}/espsecure.py
 ${PYSITELIB}/espsecure.pyc
 ${PYSITELIB}/espsecure.pyo
diff --git a/comms/py-esptool/distinfo b/comms/py-esptool/distinfo
index 80dd3442803..7ea5e7ecd3b 100644
--- a/comms/py-esptool/distinfo
+++ b/comms/py-esptool/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2020/07/21 08:14:06 adam Exp $
+$NetBSD: distinfo,v 1.4 2021/09/09 08:04:23 adam Exp $
 
-SHA1 (esptool-2.8.tar.gz) = 62dcf0b9242301c10127f24eddf3a50644246b52
-RMD160 (esptool-2.8.tar.gz) = d0c3c94e7f58be3a768fd1d9bd8942b9ea872e90
-SHA512 (esptool-2.8.tar.gz) = e64dd7e60e273872dd9ac9880c8a150c3f58f1a6a5e115a899a9fde107788c9dc80b9c0425e0fa9631870a16013881e223d02e1338b13e17827686f9f9569ae0
-Size (esptool-2.8.tar.gz) = 84520 bytes
+SHA1 (esptool-3.1.tar.gz) = a53c10eaa3a6b3f9905fe4b024f1e04a2578fc88
+RMD160 (esptool-3.1.tar.gz) = 2e6f345235f3c8400d92f726a348cff94582c7ca
+SHA512 (esptool-3.1.tar.gz) = c8c360213911125244d8e9c5460a82a026545b5e09a518ca92af4e3155770ed2333169aa64a4ff7df38519be7074f040b03685f231fd7a6e617ba5e1b6ee6913
+Size (esptool-3.1.tar.gz) = 175268 bytes