py-acme/py-cerbot-*: updated to 1.0.0

Certbot 1.0.0

Removed:
* The docs extras for the certbot-apache and certbot-nginx packages
  have been removed.

Changed:
* certbot-auto has deprecated support for systems using OpenSSL 1.0.1 that are
  not running on x86-64. This primarily affects RHEL 6 based systems.
* Certbot's config_changes subcommand has been removed
* certbot.plugins.common.TLSSNI01 has been removed.
* Deprecated attributes related to the TLS-SNI-01 challenge in
  acme.challenges and acme.standalone
  have been removed.
* The functions certbot.client.view_config_changes,
  certbot.main.config_changes,
  certbot.plugins.common.Installer.view_config_changes,
  certbot.reverter.Reverter.view_config_changes, and
  certbot.util.get_systemd_os_info have been removed
* Certbot's register --update-registration subcommand has been removed
* When possible, default to automatically configuring the webserver so all requests
  redirect to secure HTTPS access. This is mostly relevant when running Certbot
  in non-interactive mode. Previously, the default was to not redirect all requests.

2 files changed, 57 insertions, 245 deletions

diff --git a/security/py-certbot-apache/PLIST b/security/py-certbot-apache/PLIST
index 07168004c61..b5f39ea5082 100644
--- a/security/py-certbot-apache/PLIST
+++ b/security/py-certbot-apache/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2019/07/15 12:52:54 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2019/12/15 09:48:38 adam Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -8,242 +8,54 @@ ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/certbot_apache/__init__.py
 ${PYSITELIB}/certbot_apache/__init__.pyc
 ${PYSITELIB}/certbot_apache/__init__.pyo
-${PYSITELIB}/certbot_apache/apache_util.py
-${PYSITELIB}/certbot_apache/apache_util.pyc
-${PYSITELIB}/certbot_apache/apache_util.pyo
-${PYSITELIB}/certbot_apache/augeas_lens/httpd.aug
-${PYSITELIB}/certbot_apache/centos-options-ssl-apache.conf
-${PYSITELIB}/certbot_apache/configurator.py
-${PYSITELIB}/certbot_apache/configurator.pyc
-${PYSITELIB}/certbot_apache/configurator.pyo
-${PYSITELIB}/certbot_apache/constants.py
-${PYSITELIB}/certbot_apache/constants.pyc
-${PYSITELIB}/certbot_apache/constants.pyo
-${PYSITELIB}/certbot_apache/display_ops.py
-${PYSITELIB}/certbot_apache/display_ops.pyc
-${PYSITELIB}/certbot_apache/display_ops.pyo
-${PYSITELIB}/certbot_apache/entrypoint.py
-${PYSITELIB}/certbot_apache/entrypoint.pyc
-${PYSITELIB}/certbot_apache/entrypoint.pyo
-${PYSITELIB}/certbot_apache/http_01.py
-${PYSITELIB}/certbot_apache/http_01.pyc
-${PYSITELIB}/certbot_apache/http_01.pyo
-${PYSITELIB}/certbot_apache/obj.py
-${PYSITELIB}/certbot_apache/obj.pyc
-${PYSITELIB}/certbot_apache/obj.pyo
-${PYSITELIB}/certbot_apache/options-ssl-apache.conf
-${PYSITELIB}/certbot_apache/override_arch.py
-${PYSITELIB}/certbot_apache/override_arch.pyc
-${PYSITELIB}/certbot_apache/override_arch.pyo
-${PYSITELIB}/certbot_apache/override_centos.py
-${PYSITELIB}/certbot_apache/override_centos.pyc
-${PYSITELIB}/certbot_apache/override_centos.pyo
-${PYSITELIB}/certbot_apache/override_darwin.py
-${PYSITELIB}/certbot_apache/override_darwin.pyc
-${PYSITELIB}/certbot_apache/override_darwin.pyo
-${PYSITELIB}/certbot_apache/override_debian.py
-${PYSITELIB}/certbot_apache/override_debian.pyc
-${PYSITELIB}/certbot_apache/override_debian.pyo
-${PYSITELIB}/certbot_apache/override_fedora.py
-${PYSITELIB}/certbot_apache/override_fedora.pyc
-${PYSITELIB}/certbot_apache/override_fedora.pyo
-${PYSITELIB}/certbot_apache/override_gentoo.py
-${PYSITELIB}/certbot_apache/override_gentoo.pyc
-${PYSITELIB}/certbot_apache/override_gentoo.pyo
-${PYSITELIB}/certbot_apache/override_suse.py
-${PYSITELIB}/certbot_apache/override_suse.pyc
-${PYSITELIB}/certbot_apache/override_suse.pyo
-${PYSITELIB}/certbot_apache/parser.py
-${PYSITELIB}/certbot_apache/parser.pyc
-${PYSITELIB}/certbot_apache/parser.pyo
-${PYSITELIB}/certbot_apache/tests/__init__.py
-${PYSITELIB}/certbot_apache/tests/__init__.pyc
-${PYSITELIB}/certbot_apache/tests/__init__.pyo
-${PYSITELIB}/certbot_apache/tests/autohsts_test.py
-${PYSITELIB}/certbot_apache/tests/autohsts_test.pyc
-${PYSITELIB}/certbot_apache/tests/autohsts_test.pyo
-${PYSITELIB}/certbot_apache/tests/centos6_test.py
-${PYSITELIB}/certbot_apache/tests/centos6_test.pyc
-${PYSITELIB}/certbot_apache/tests/centos6_test.pyo
-${PYSITELIB}/certbot_apache/tests/centos_test.py
-${PYSITELIB}/certbot_apache/tests/centos_test.pyc
-${PYSITELIB}/certbot_apache/tests/centos_test.pyo
-${PYSITELIB}/certbot_apache/tests/complex_parsing_test.py
-${PYSITELIB}/certbot_apache/tests/complex_parsing_test.pyc
-${PYSITELIB}/certbot_apache/tests/complex_parsing_test.pyo
-${PYSITELIB}/certbot_apache/tests/configurator_reverter_test.py
-${PYSITELIB}/certbot_apache/tests/configurator_reverter_test.pyc
-${PYSITELIB}/certbot_apache/tests/configurator_reverter_test.pyo
-${PYSITELIB}/certbot_apache/tests/configurator_test.py
-${PYSITELIB}/certbot_apache/tests/configurator_test.pyc
-${PYSITELIB}/certbot_apache/tests/configurator_test.pyo
-${PYSITELIB}/certbot_apache/tests/debian_test.py
-${PYSITELIB}/certbot_apache/tests/debian_test.pyc
-${PYSITELIB}/certbot_apache/tests/debian_test.pyo
-${PYSITELIB}/certbot_apache/tests/display_ops_test.py
-${PYSITELIB}/certbot_apache/tests/display_ops_test.pyc
-${PYSITELIB}/certbot_apache/tests/display_ops_test.pyo
-${PYSITELIB}/certbot_apache/tests/entrypoint_test.py
-${PYSITELIB}/certbot_apache/tests/entrypoint_test.pyc
-${PYSITELIB}/certbot_apache/tests/entrypoint_test.pyo
-${PYSITELIB}/certbot_apache/tests/fedora_test.py
-${PYSITELIB}/certbot_apache/tests/fedora_test.pyc
-${PYSITELIB}/certbot_apache/tests/fedora_test.pyo
-${PYSITELIB}/certbot_apache/tests/gentoo_test.py
-${PYSITELIB}/certbot_apache/tests/gentoo_test.pyc
-${PYSITELIB}/certbot_apache/tests/gentoo_test.pyo
-${PYSITELIB}/certbot_apache/tests/http_01_test.py
-${PYSITELIB}/certbot_apache/tests/http_01_test.pyc
-${PYSITELIB}/certbot_apache/tests/http_01_test.pyo
-${PYSITELIB}/certbot_apache/tests/obj_test.py
-${PYSITELIB}/certbot_apache/tests/obj_test.pyc
-${PYSITELIB}/certbot_apache/tests/obj_test.pyo
-${PYSITELIB}/certbot_apache/tests/parser_test.py
-${PYSITELIB}/certbot_apache/tests/parser_test.pyc
-${PYSITELIB}/certbot_apache/tests/parser_test.pyo
-${PYSITELIB}/certbot_apache/tests/testdata/centos6_apache/apache/httpd/conf.d/README
-${PYSITELIB}/certbot_apache/tests/testdata/centos6_apache/apache/httpd/conf.d/ssl.conf
-${PYSITELIB}/certbot_apache/tests/testdata/centos6_apache/apache/httpd/conf.d/test.example.com.conf
-${PYSITELIB}/certbot_apache/tests/testdata/centos6_apache/apache/httpd/conf.d/welcome.conf
-${PYSITELIB}/certbot_apache/tests/testdata/centos6_apache/apache/httpd/conf/httpd.conf
-${PYSITELIB}/certbot_apache/tests/testdata/centos7_apache/apache/httpd/conf.d/README
-${PYSITELIB}/certbot_apache/tests/testdata/centos7_apache/apache/httpd/conf.d/autoindex.conf
-${PYSITELIB}/certbot_apache/tests/testdata/centos7_apache/apache/httpd/conf.d/centos.example.com.conf
-${PYSITELIB}/certbot_apache/tests/testdata/centos7_apache/apache/httpd/conf.d/ssl.conf
-${PYSITELIB}/certbot_apache/tests/testdata/centos7_apache/apache/httpd/conf.d/userdir.conf
-${PYSITELIB}/certbot_apache/tests/testdata/centos7_apache/apache/httpd/conf.d/welcome.conf
-${PYSITELIB}/certbot_apache/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-base.conf
-${PYSITELIB}/certbot_apache/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-dav.conf
-${PYSITELIB}/certbot_apache/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-lua.conf
-${PYSITELIB}/certbot_apache/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-mpm.conf
-${PYSITELIB}/certbot_apache/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-proxy.conf
-${PYSITELIB}/certbot_apache/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-ssl.conf
-${PYSITELIB}/certbot_apache/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-systemd.conf
-${PYSITELIB}/certbot_apache/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/01-cgi.conf
-${PYSITELIB}/certbot_apache/tests/testdata/centos7_apache/apache/httpd/conf/httpd.conf
-${PYSITELIB}/certbot_apache/tests/testdata/centos7_apache/apache/httpd/conf/magic
-${PYSITELIB}/certbot_apache/tests/testdata/centos7_apache/apache/sites
-${PYSITELIB}/certbot_apache/tests/testdata/centos7_apache/apache/sysconfig/httpd
-${PYSITELIB}/certbot_apache/tests/testdata/complex_parsing/apache2.conf
-${PYSITELIB}/certbot_apache/tests/testdata/complex_parsing/conf-enabled/dummy.conf
-${PYSITELIB}/certbot_apache/tests/testdata/complex_parsing/test_fnmatch.conf
-${PYSITELIB}/certbot_apache/tests/testdata/complex_parsing/test_variables.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/apache2.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-available/bad_conf_file.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-available/other-vhosts-access-log.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-available/security.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-available/serve-cgi-bin.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-enabled/other-vhosts-access-log.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-enabled/security.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-enabled/serve-cgi-bin.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/envvars
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/authz_svn.load
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/dav.load
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/dav_svn.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/dav_svn.load
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/rewrite.load
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/ssl.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/ssl.load
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-enabled/authz_svn.load
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-enabled/dav.load
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-enabled/dav_svn.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-enabled/dav_svn.load
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/ports.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-available/another_wildcard.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-available/old-and-default.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-available/wildcard.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-enabled/another_wildcard.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-enabled/old-and-default.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-enabled/wildcard.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/augeas_vhosts/sites
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/apache2.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/other-vhosts-access-log.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/security.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/serve-cgi-bin.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/other-vhosts-access-log.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/security.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/serve-cgi-bin.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/envvars
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/mods-available/ssl.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/mods-available/ssl.load
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/ports.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/sites-available/000-default.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/sites-available/default-ssl.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/sites-enabled/000-default.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/default_vhost/sites
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/apache2.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/envvars
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/ports.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/sites-available/default.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/sites-available/multi-vhost.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/sites-enabled/default.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/sites-enabled/multi-vhost.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/apache2.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/bad_conf_file.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/other-vhosts-access-log.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/security.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/serve-cgi-bin.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-enabled/other-vhosts-access-log.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-enabled/security.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-enabled/serve-cgi-bin.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/envvars
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/authz_svn.load
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/dav.load
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/dav_svn.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/dav_svn.load
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/rewrite.load
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/ssl.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/ssl.load
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/authz_svn.load
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/dav.load
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/dav_svn.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/dav_svn.load
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/ports.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/000-default.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/certbot.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/default-ssl-port-only.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/default-ssl.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/duplicatehttp.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/duplicatehttps.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/encryption-example.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/mod_macro-example.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/ocsp-ssl.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/wildcard.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/000-default.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/certbot.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/default-ssl-port-only.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/default-ssl.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/duplicatehttp.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/duplicatehttps.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/encryption-example.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/mod_macro-example.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/non-symlink.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/ocsp-ssl.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/wildcard.conf
-${PYSITELIB}/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/sites
-${PYSITELIB}/certbot_apache/tests/testdata/gentoo_apache/apache/apache2/httpd.conf
-${PYSITELIB}/certbot_apache/tests/testdata/gentoo_apache/apache/apache2/magic
-${PYSITELIB}/certbot_apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_default_settings.conf
-${PYSITELIB}/certbot_apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_error_documents.conf
-${PYSITELIB}/certbot_apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_languages.conf
-${PYSITELIB}/certbot_apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_autoindex.conf
-${PYSITELIB}/certbot_apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_info.conf
-${PYSITELIB}/certbot_apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_log_config.conf
-${PYSITELIB}/certbot_apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_mime.conf
-${PYSITELIB}/certbot_apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_status.conf
-${PYSITELIB}/certbot_apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_userdir.conf
-${PYSITELIB}/certbot_apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mpm.conf
-${PYSITELIB}/certbot_apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/10_mod_mem_cache.conf
-${PYSITELIB}/certbot_apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/40_mod_ssl.conf
-${PYSITELIB}/certbot_apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/41_mod_http2.conf
-${PYSITELIB}/certbot_apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/45_mod_dav.conf
-${PYSITELIB}/certbot_apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/46_mod_ldap.conf
-${PYSITELIB}/certbot_apache/tests/testdata/gentoo_apache/apache/apache2/vhosts.d/00_default_ssl_vhost.conf
-${PYSITELIB}/certbot_apache/tests/testdata/gentoo_apache/apache/apache2/vhosts.d/00_default_vhost.conf
-${PYSITELIB}/certbot_apache/tests/testdata/gentoo_apache/apache/apache2/vhosts.d/default_vhost.include
-${PYSITELIB}/certbot_apache/tests/testdata/gentoo_apache/apache/apache2/vhosts.d/gentoo.example.com.conf
-${PYSITELIB}/certbot_apache/tests/testdata/gentoo_apache/apache/conf.d/apache2
-${PYSITELIB}/certbot_apache/tests/testdata/gentoo_apache/apache/sites
-${PYSITELIB}/certbot_apache/tests/util.py
-${PYSITELIB}/certbot_apache/tests/util.pyc
-${PYSITELIB}/certbot_apache/tests/util.pyo
+${PYSITELIB}/certbot_apache/_internal/__init__.py
+${PYSITELIB}/certbot_apache/_internal/__init__.pyc
+${PYSITELIB}/certbot_apache/_internal/__init__.pyo
+${PYSITELIB}/certbot_apache/_internal/apache_util.py
+${PYSITELIB}/certbot_apache/_internal/apache_util.pyc
+${PYSITELIB}/certbot_apache/_internal/apache_util.pyo
+${PYSITELIB}/certbot_apache/_internal/augeas_lens/httpd.aug
+${PYSITELIB}/certbot_apache/_internal/centos-options-ssl-apache.conf
+${PYSITELIB}/certbot_apache/_internal/configurator.py
+${PYSITELIB}/certbot_apache/_internal/configurator.pyc
+${PYSITELIB}/certbot_apache/_internal/configurator.pyo
+${PYSITELIB}/certbot_apache/_internal/constants.py
+${PYSITELIB}/certbot_apache/_internal/constants.pyc
+${PYSITELIB}/certbot_apache/_internal/constants.pyo
+${PYSITELIB}/certbot_apache/_internal/display_ops.py
+${PYSITELIB}/certbot_apache/_internal/display_ops.pyc
+${PYSITELIB}/certbot_apache/_internal/display_ops.pyo
+${PYSITELIB}/certbot_apache/_internal/entrypoint.py
+${PYSITELIB}/certbot_apache/_internal/entrypoint.pyc
+${PYSITELIB}/certbot_apache/_internal/entrypoint.pyo
+${PYSITELIB}/certbot_apache/_internal/http_01.py
+${PYSITELIB}/certbot_apache/_internal/http_01.pyc
+${PYSITELIB}/certbot_apache/_internal/http_01.pyo
+${PYSITELIB}/certbot_apache/_internal/obj.py
+${PYSITELIB}/certbot_apache/_internal/obj.pyc
+${PYSITELIB}/certbot_apache/_internal/obj.pyo
+${PYSITELIB}/certbot_apache/_internal/options-ssl-apache.conf
+${PYSITELIB}/certbot_apache/_internal/override_arch.py
+${PYSITELIB}/certbot_apache/_internal/override_arch.pyc
+${PYSITELIB}/certbot_apache/_internal/override_arch.pyo
+${PYSITELIB}/certbot_apache/_internal/override_centos.py
+${PYSITELIB}/certbot_apache/_internal/override_centos.pyc
+${PYSITELIB}/certbot_apache/_internal/override_centos.pyo
+${PYSITELIB}/certbot_apache/_internal/override_darwin.py
+${PYSITELIB}/certbot_apache/_internal/override_darwin.pyc
+${PYSITELIB}/certbot_apache/_internal/override_darwin.pyo
+${PYSITELIB}/certbot_apache/_internal/override_debian.py
+${PYSITELIB}/certbot_apache/_internal/override_debian.pyc
+${PYSITELIB}/certbot_apache/_internal/override_debian.pyo
+${PYSITELIB}/certbot_apache/_internal/override_fedora.py
+${PYSITELIB}/certbot_apache/_internal/override_fedora.pyc
+${PYSITELIB}/certbot_apache/_internal/override_fedora.pyo
+${PYSITELIB}/certbot_apache/_internal/override_gentoo.py
+${PYSITELIB}/certbot_apache/_internal/override_gentoo.pyc
+${PYSITELIB}/certbot_apache/_internal/override_gentoo.pyo
+${PYSITELIB}/certbot_apache/_internal/override_suse.py
+${PYSITELIB}/certbot_apache/_internal/override_suse.pyc
+${PYSITELIB}/certbot_apache/_internal/override_suse.pyo
+${PYSITELIB}/certbot_apache/_internal/parser.py
+${PYSITELIB}/certbot_apache/_internal/parser.pyc
+${PYSITELIB}/certbot_apache/_internal/parser.pyo
diff --git a/security/py-certbot-apache/distinfo b/security/py-certbot-apache/distinfo
index 99c77efae50..a16891a9b86 100644
--- a/security/py-certbot-apache/distinfo
+++ b/security/py-certbot-apache/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.12 2019/11/14 18:28:17 adam Exp $
+$NetBSD: distinfo,v 1.13 2019/12/15 09:48:38 adam Exp $
 
-SHA1 (certbot-apache-0.40.1.tar.gz) = 2dbc0e307b3d0fdcc2634d87075d71f7b69b8018
-RMD160 (certbot-apache-0.40.1.tar.gz) = de4a7f1b82b21af468509e7fc45bd1b47368b1cc
-SHA512 (certbot-apache-0.40.1.tar.gz) = ad51a4d04000127b351a58c07d0d793f15a5077430d3a7896dbaba8da71e9677f9fd94af1aa154e74fa8ad74c8ef7bc2f19c0044e624fbb523f98f85efc6e487
-Size (certbot-apache-0.40.1.tar.gz) = 180430 bytes
+SHA1 (certbot-apache-1.0.0.tar.gz) = e84bd9b245da70ead905d33b40db303be65d1b4a
+RMD160 (certbot-apache-1.0.0.tar.gz) = 5cd3c115f475a35247085e678427cc398f119975
+SHA512 (certbot-apache-1.0.0.tar.gz) = 25cfaf8d58f52c502cf7a0cc70f279ccc7eb44f16dc509b32cd15310fff52c5b92c2cf0ecbc55abab830659219cf4c458363dfd4b8391d23f098d5afce3f636d
+Size (certbot-apache-1.0.0.tar.gz) = 195910 bytes