<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4a17d1dd4b9afc4c640cb2b8fcbc2f1a9e279a36">https://github.com/macports/macports-ports/commit/4a17d1dd4b9afc4c640cb2b8fcbc2f1a9e279a36</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 4a17d1d certbot: add python 3.8 support
</span>4a17d1d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4a17d1dd4b9afc4c640cb2b8fcbc2f1a9e279a36
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Tue Oct 22 15:37:02 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> certbot: add python 3.8 support
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> certbot-apache: add mod_perl2 dependency
</span><span style='display:block; white-space:pre;color:#404040;'> certbot-nginx: fix path to nginx/nginx.conf
</span>---
security/certbot/Portfile | 24 +++++++++++++++++-----
...h-certbot-nginx-certbot_nginx-constants.py.diff | 11 ++++++++++
2 files changed, 30 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/certbot/Portfile b/security/certbot/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c3037ec..316d499 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/certbot/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/certbot/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,6 +23,8 @@ if {[variant_isset python27]} {
</span> python.default_version 27
} elseif {[variant_isset python36]} {
python.default_version 36
<span style='display:block; white-space:pre;background:#e0ffe0;'>+} elseif {[variant_isset python38]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python.default_version 38
</span> } else {
python.default_version 37
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,15 +58,17 @@ post-patch {
</span> reinplace "s|/var/log/|${prefix}/var/log/|" ${worksrcpath}/certbot/compat/misc.py
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python27 conflicts python36 python37 description {Use Python 2.7} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python27 conflicts python36 python37 python38 description {Use Python 2.7} {
</span> depends_lib-append port:py${python.version}-python2-pythondialog
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python36 conflicts python27 python37 description {Use Python 3.6} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python36 conflicts python27 python37 python38 description {Use Python 3.6} {}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python37 conflicts python27 python36 description {Use Python 3.7} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python37 conflicts python27 python36 python38 description {Use Python 3.7} {}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset python27] && ![variant_isset python36]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python38 conflicts python27 python36 python37 description {Use Python 3.8} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset python27] && ![variant_isset python36] && ![variant_isset python38]} {
</span> default_variants +python37
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -108,6 +112,7 @@ if {![variant_isset python27] && ![variant_isset python36]} {
</span> #
subport ${name}-apache {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span> description The certbot Apache plugin for http-01 challenges
long_description The Apache plugin currently supports modern OSes based on Debian, \
Fedora, SUSE, Gentoo and Darwin. This automates both obtaining \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -116,11 +121,13 @@ subport ${name}-apache {
</span> https://certbot.eff.org/docs/using.html\#apache
build.dir ${worksrcpath}/${name}-apache
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py${python.version}-python-augeas \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:mod_perl2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-python-augeas \
</span> port:py${python.version}-zopeinterface
}
subport ${name}-nginx {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span> description The certbot Nginx plugin for http-01 challenges
long_description The Nginx plugin should work for most configurations. We \
recommend backing up Nginx configurations before using it (though \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -131,6 +138,13 @@ subport ${name}-nginx {
</span> build.dir ${worksrcpath}/${name}-nginx
depends_lib-append port:py${python.version}-parsing
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-certbot-nginx-certbot_nginx-constants.py.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|%PREFIX%|${prefix}|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/certbot-nginx/certbot_nginx/constants.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
#
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/certbot/files/patch-certbot-nginx-certbot_nginx-constants.py.diff b/security/certbot/files/patch-certbot-nginx-certbot_nginx-constants.py.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..c221100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/certbot/files/patch-certbot-nginx-certbot_nginx-constants.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- certbot-nginx/certbot_nginx/constants.py.orig 2019-10-01 15:04:08.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ certbot-nginx/certbot_nginx/constants.py 2019-10-22 15:26:28.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ """nginx plugin constants."""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import platform
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-FREEBSD_DARWIN_SERVER_ROOT = "/usr/local/etc/nginx"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++FREEBSD_DARWIN_SERVER_ROOT = "%PREFIX%/etc/nginx"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LINUX_SERVER_ROOT = "/etc/nginx"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if platform.system() in ('FreeBSD', 'Darwin'):
</span></pre><pre style='margin:0'>
</pre>