From bc8ad1c3adf9b491d93698563e72e2d9f639f2f1 Mon Sep 17 00:00:00 2001 From: Willy Sudiarto Raharjo Date: Fri, 14 Sep 2018 01:22:49 +0700 Subject: system/letsencrypt: Updated for version 0.27.1. Signed-off-by: Willy Sudiarto Raharjo --- system/letsencrypt/configurator.patch | 33 ------------------------------- system/letsencrypt/letsencrypt.SlackBuild | 3 +-- system/letsencrypt/letsencrypt.info | 6 +++--- 3 files changed, 4 insertions(+), 38 deletions(-) delete mode 100644 system/letsencrypt/configurator.patch (limited to 'system') diff --git a/system/letsencrypt/configurator.patch b/system/letsencrypt/configurator.patch deleted file mode 100644 index cca84f2518..0000000000 --- a/system/letsencrypt/configurator.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- certbot-0.21.0/certbot-apache/certbot_apache/configurator.py.old 2018-01-19 05:16:48.965843221 +0700 -+++ certbot-0.21.0/certbot-apache/certbot_apache/configurator.py 2018-01-19 05:35:24.916445040 +0700 -@@ -89,20 +89,20 @@ - description = "Apache Web Server plugin - Beta" - - OS_DEFAULTS = dict( -- server_root="/etc/apache2", -- vhost_root="/etc/apache2/sites-available", -- vhost_files="*", -- logs_root="/var/log/apache2", -- version_cmd=['apache2ctl', '-v'], -- apache_cmd="apache2ctl", -- restart_cmd=['apache2ctl', 'graceful'], -- conftest_cmd=['apache2ctl', 'configtest'], -+ server_root="/etc/httpd", -+ vhost_root="/etc/httpd/extra", -+ vhost_files="httpd-vhosts.conf", -+ logs_root="/var/log/httpd", -+ version_cmd=['apachectl', '-v'], -+ apache_cmd="apachectl", -+ restart_cmd=['apachectl', 'graceful'], -+ conftest_cmd=['apachectl', 'configtest'], - enmod=None, - dismod=None, -- le_vhost_ext="-le-ssl.conf", -+ le_vhost_ext="", - handle_mods=False, - handle_sites=False, -- challenge_location="/etc/apache2", -+ challenge_location="/etc/httpd", - MOD_SSL_CONF_SRC=pkg_resources.resource_filename( - "certbot_apache", "options-ssl-apache.conf") - ) diff --git a/system/letsencrypt/letsencrypt.SlackBuild b/system/letsencrypt/letsencrypt.SlackBuild index 81d27c8467..0f9630471f 100644 --- a/system/letsencrypt/letsencrypt.SlackBuild +++ b/system/letsencrypt/letsencrypt.SlackBuild @@ -24,7 +24,7 @@ PRGNAM=letsencrypt SRCNAM=certbot -VERSION=${VERSION:-0.26.1} +VERSION=${VERSION:-0.27.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -73,7 +73,6 @@ find -L . \ sed -i "/'argparse',/d" setup.py sed -i "/'argparse',/d" acme/setup.py sed -i 's/apache2ctl/apachectl/' certbot-apache/certbot_apache/constants.py -patch -p1 < $CWD/configurator.patch for i in $(grep -ri /apache2 * | cut -d: -f1 | sort -u) do diff --git a/system/letsencrypt/letsencrypt.info b/system/letsencrypt/letsencrypt.info index 844675eb23..592851c66c 100644 --- a/system/letsencrypt/letsencrypt.info +++ b/system/letsencrypt/letsencrypt.info @@ -1,8 +1,8 @@ PRGNAM="letsencrypt" -VERSION="0.26.1" +VERSION="0.27.1" HOMEPAGE="https://letsencrypt.org/" -DOWNLOAD="https://github.com/certbot/certbot/archive/v0.26.1/certbot-0.26.1.tar.gz" -MD5SUM="39bee9564440531c90d3a1011041e645" +DOWNLOAD="https://github.com/certbot/certbot/archive/v0.27.1/certbot-0.27.1.tar.gz" +MD5SUM="4511cda6cee8fd62362cef709809f9b9" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="configobj mock pytz python2-pythondialog zope.component pyrfc3339 psutil python-parsedatetime python-configargparse werkzeug ndg_httpsclient python-augeas pyparsing josepy funcsigs requests-toolbelt" -- cgit v1.2.3