Hello community,
here is the log from the commit of package python-certbot-apache for
openSUSE:Factory checked in at 2018-11-18 23:33:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-certbot-apache (Old)
and /work/SRC/openSUSE:Factory/.python-certbot-apache.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-certbot-apache"
Sun Nov 18 23:33:13 2018 rev:2 rq:649946 version:0.28.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-certbot-apache/python-certbot-apache.changes
2018-09-26 16:10:58.087531312 +0200
+++
/work/SRC/openSUSE:Factory/.python-certbot-apache.new/python-certbot-apache.changes
2018-11-18 23:33:15.477404399 +0100
@@ -1,0 +2,8 @@
+Fri Nov 16 17:29:50 UTC 2018 - Marketa Calabkova <mcalabk...@suse.com>
+
+- update to version 0.28.0
+ * Stop preferring TLS-SNI.
+ * The grammar used by Augeas parser in Apache plugin was updated
+ to fix various parsing errors.
+
+-------------------------------------------------------------------
Old:
----
certbot-apache-0.27.1.tar.gz
New:
----
certbot-apache-0.28.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-certbot-apache.spec ++++++
--- /var/tmp/diff_new_pack.841TGa/_old 2018-11-18 23:33:16.597403054 +0100
+++ /var/tmp/diff_new_pack.841TGa/_new 2018-11-18 23:33:16.597403054 +0100
@@ -18,7 +18,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-certbot-apache
-Version: 0.27.1
+Version: 0.28.0
Release: 0
Summary: Apache plugin for Certbot
License: Apache-2.0
++++++ certbot-apache-0.27.1.tar.gz -> certbot-apache-0.28.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-apache-0.27.1/PKG-INFO
new/certbot-apache-0.28.0/PKG-INFO
--- old/certbot-apache-0.27.1/PKG-INFO 2018-09-07 01:13:39.000000000 +0200
+++ new/certbot-apache-0.28.0/PKG-INFO 2018-11-07 22:15:07.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: certbot-apache
-Version: 0.27.1
+Version: 0.28.0
Summary: Apache plugin for Certbot
Home-page: https://github.com/letsencrypt/letsencrypt
Author: Certbot Project
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-0.27.1/certbot_apache/augeas_lens/httpd.aug
new/certbot-apache-0.28.0/certbot_apache/augeas_lens/httpd.aug
--- old/certbot-apache-0.27.1/certbot_apache/augeas_lens/httpd.aug
2018-09-07 01:13:29.000000000 +0200
+++ new/certbot-apache-0.28.0/certbot_apache/augeas_lens/httpd.aug
2018-11-07 22:14:56.000000000 +0100
@@ -44,67 +44,134 @@
*****************************************************************)
let dels (s:string) = del s s
+(* The continuation sequence that indicates that we should consider the
+ * next line part of the current line *)
+let cont = /\\\\\r?\n/
+
+(* Whitespace within a line: space, tab, and the continuation sequence *)
+let ws = /[ \t]/ | cont
+
+(* Any possible character - '.' does not match \n *)
+let any = /(.|\n)/
+
+(* Any character preceded by a backslash *)
+let esc_any = /\\\\(.|\n)/
+
+(* Newline sequence - both for Unix and DOS newlines *)
+let nl = /\r?\n/
+
+(* Whitespace at the end of a line *)
+let eol = del (ws* . nl) "\n"
+
(* deal with continuation lines *)
-let sep_spc = del /([ \t]+|[ \t]*\\\\\r?\n[ \t]*)+/ " "
-let sep_osp = del /([ \t]*|[ \t]*\\\\\r?\n[ \t]*)*/ ""
-let sep_eq = del /[ \t]*=[ \t]*/ "="
+let sep_spc = del ws+ " "
+let sep_osp = del ws* ""
+let sep_eq = del (ws* . "=" . ws*) "="
let nmtoken = /[a-zA-Z:_][a-zA-Z0-9:_.-]*/
let word = /[a-z][a-z0-9._-]*/i
-let eol = Util.doseol
-let empty = Util.empty_dos
+(* A complete line that is either just whitespace or a comment that only
+ * contains whitespace *)
+let empty = [ del (ws* . /#?/ . ws* . nl) "\n" ]
+
let indent = Util.indent
-let comment_val_re = /([^ \t\r\n](.|\\\\\r?\n)*[^ \\\t\r\n]|[^ \t\r\n])/
-let comment = [ label "#comment" . del /[ \t]*#[ \t]*/ "# "
- . store comment_val_re . eol ]
+(* A comment that is not just whitespace. We define it in terms of the
+ * things that are not allowed as part of such a comment:
+ * 1) Starts with whitespace
+ * 2) Ends with whitespace, a backslash or \r
+ * 3) Unescaped newlines
+ *)
+let comment =
+ let comment_start = del (ws* . "#" . ws* ) "# " in
+ let unesc_eol = /[^\]?/ . nl in
+ let w = /[^\t\n\r \\]/ in
+ let r = /[\r\\]/ in
+ let s = /[\t\r ]/ in
+ (*
+ * we'd like to write
+ * let b = /\\\\/ in
+ * let t = /[\t\n\r ]/ in
+ * let x = b . (t? . (s|w)* ) in
+ * but the definition of b depends on commit 244c0edd in 1.9.0 and
+ * would make the lens unusable with versions before 1.9.0. So we write
+ * x out which works in older versions, too
+ *)
+ let x = /\\\\[\t\n\r ]?[^\n\\]*/ in
+ let line = ((r . s* . w|w|r) . (s|w)* . x*|(r.s* )?).w.(s*.w)* in
+ [ label "#comment" . comment_start . store line . eol ]
(* borrowed from shellvars.aug *)
-let char_arg_dir = /([^\\ '"{\t\r\n]|[^ '"{\t\r\n]+[^\\
\t\r\n])|\\\\"|\\\\'|\\\\ /
let char_arg_sec = /([^\\ '"\t\r\n>]|[^ '"\t\r\n>]+[^\\
\t\r\n>])|\\\\"|\\\\'|\\\\ /
let char_arg_wl = /([^\\ '"},\t\r\n]|[^ '"},\t\r\n]+[^\\ '"},\t\r\n])/
-let cdot = /\\\\./
-let cl = /\\\\\n/
let dquot =
let no_dquot = /[^"\\\r\n]/
- in /"/ . (no_dquot|cdot|cl)* . /"/
+ in /"/ . (no_dquot|esc_any)* . /"/
let dquot_msg =
let no_dquot = /([^ \t"\\\r\n]|[^"\\\r\n]+[^ \t"\\\r\n])/
- in /"/ . (no_dquot|cdot|cl)*
+ in /"/ . (no_dquot|esc_any)* . no_dquot
+
let squot =
let no_squot = /[^'\\\r\n]/
- in /'/ . (no_squot|cdot|cl)* . /'/
+ in /'/ . (no_squot|esc_any)* . /'/
let comp = /[<>=]?=/
(******************************************************************
* Attributes
*****************************************************************)
-let arg_dir = [ label "arg" . store (char_arg_dir+|dquot|squot) ]
+(* The arguments for a directive come in two flavors: quoted with single or
+ * double quotes, or bare. Bare arguments may not start with a single or
+ * double quote; since we also treat "word lists" special, i.e. lists
+ * enclosed in curly braces, bare arguments may not start with those,
+ * either.
+ *
+ * Bare arguments may not contain unescaped spaces, but we allow escaping
+ * with '\\'. Quoted arguments can contain anything, though the quote must
+ * be escaped with '\\'.
+ *)
+let bare = /([^{"' \t\n\r]|\\\\.)([^ \t\n\r]|\\\\.)*[^ \t\n\r\\]|[^{"'
\t\n\r\\]/
+
+let arg_quoted = [ label "arg" . store (dquot|squot) ]
+let arg_bare = [ label "arg" . store bare ]
+
(* message argument starts with " but ends at EOL *)
let arg_dir_msg = [ label "arg" . store dquot_msg ]
-let arg_sec = [ label "arg" . store (char_arg_sec+|comp|dquot|squot) ]
let arg_wl = [ label "arg" . store (char_arg_wl+|dquot|squot) ]
(* comma-separated wordlist as permitted in the SSLRequire directive *)
let arg_wordlist =
- let wl_start = Util.del_str "{" in
- let wl_end = Util.del_str "}" in
+ let wl_start = dels "{" in
+ let wl_end = dels "}" in
let wl_sep = del /[ \t]*,[ \t]*/ ", "
in [ label "wordlist" . wl_start . arg_wl . (wl_sep . arg_wl)* . wl_end ]
let argv (l:lens) = l . (sep_spc . l)*
+(* the arguments of a directive. We use this once we have parsed the name
+ * of the directive, and the space right after it. When dir_args is used,
+ * we also know that we have at least one argument. We need to be careful
+ * with the spacing between arguments: quoted arguments and word lists do
+ * not need to have space between them, but bare arguments do.
+ *
+ * Apache apparently is also happy if the last argument starts with a double
+ * quote, but has no corresponding closing duoble quote, which is what
+ * arg_dir_msg handles
+ *)
+let dir_args =
+ let arg_nospc = arg_quoted|arg_wordlist in
+ (arg_bare . sep_spc | arg_nospc . sep_osp)* .
(arg_bare|arg_nospc|arg_dir_msg)
+
let directive =
- (* arg_dir_msg may be the last or only argument *)
- let dir_args = (argv (arg_dir|arg_wordlist) . (sep_spc . arg_dir_msg)?) |
arg_dir_msg
- in [ indent . label "directive" . store word . (sep_spc . dir_args)? . eol ]
+ [ indent . label "directive" . store word . (sep_spc . dir_args)? . eol ]
+
+let arg_sec = [ label "arg" . store (char_arg_sec+|comp|dquot|squot) ]
let section (body:lens) =
(* opt_eol includes empty lines *)
- let opt_eol = del /([ \t]*#?\r?\n)*/ "\n" in
+ let opt_eol = del /([ \t]*#?[ \t]*\r?\n)*/ "\n" in
let inner = (sep_spc . argv arg_sec)? . sep_osp .
dels ">" . opt_eol . ((body|comment) . (body|empty|comment)*)? .
indent . dels "</" in
@@ -133,6 +200,7 @@
(incl "/etc/httpd/conf.d/*.conf") .
(incl "/etc/httpd/httpd.conf") .
(incl "/etc/httpd/conf/httpd.conf") .
+ (incl "/etc/httpd/conf.modules.d/*.conf") .
Util.stdexcl
let xfm = transform lns filter
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-apache-0.27.1/certbot_apache/configurator.py
new/certbot-apache-0.28.0/certbot_apache/configurator.py
--- old/certbot-apache-0.27.1/certbot_apache/configurator.py 2018-09-07
01:13:29.000000000 +0200
+++ new/certbot-apache-0.28.0/certbot_apache/configurator.py 2018-11-07
22:14:56.000000000 +0100
@@ -2253,7 +2253,7 @@
###########################################################################
def get_chall_pref(self, unused_domain): # pylint: disable=no-self-use
"""Return list of challenge preferences."""
- return [challenges.TLSSNI01, challenges.HTTP01]
+ return [challenges.HTTP01, challenges.TLSSNI01]
def perform(self, achalls):
"""Perform the configuration related challenge.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-0.27.1/certbot_apache.egg-info/PKG-INFO
new/certbot-apache-0.28.0/certbot_apache.egg-info/PKG-INFO
--- old/certbot-apache-0.27.1/certbot_apache.egg-info/PKG-INFO 2018-09-07
01:13:39.000000000 +0200
+++ new/certbot-apache-0.28.0/certbot_apache.egg-info/PKG-INFO 2018-11-07
22:15:07.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: certbot-apache
-Version: 0.27.1
+Version: 0.28.0
Summary: Apache plugin for Certbot
Home-page: https://github.com/letsencrypt/letsencrypt
Author: Certbot Project
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-apache-0.27.1/setup.py
new/certbot-apache-0.28.0/setup.py
--- old/certbot-apache-0.27.1/setup.py 2018-09-07 01:13:30.000000000 +0200
+++ new/certbot-apache-0.28.0/setup.py 2018-11-07 22:14:57.000000000 +0100
@@ -2,7 +2,7 @@
from setuptools import find_packages
-version = '0.27.1'
+version = '0.28.0'
# Remember to update local-oldest-requirements.txt when changing the minimum
# acme/certbot version.
