doc/Makefile.am | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 install vim addons into correct directory

tests/test-put-mount-augnew.sh | 2 1 + 1 - 0 !
tests/test-put-mount-augsave.sh | 2 1 + 1 - 0 !
tests/test-put-mount.sh | 2 1 + 1 - 0 !
3 files changed, 3 insertions(+), 3 deletions(-)

 skip tests that need root privileges when fakeroot has been detected

lenses/httpd.aug | 9 6 + 3 - 0 !
lenses/tests/test_httpd.aug | 62 62 + 0 - 0 !
2 files changed, 68 insertions(+), 3 deletions(-)

 httpd: allow eol comments after section tags

lenses/httpd.aug | 1 1 + 0 - 0 !
1 file changed, 1 insertion(+)

 httpd: include /etc/apache2/conf-available directory

src/pathx.c | 28 22 + 6 - 0 !
tests/test-xpath.c | 59 59 + 0 - 0 !
2 files changed, 81 insertions(+), 6 deletions(-)

 * src/pathx.c (parse_name): correctly handle trailing whitespace in
 names

When a name ended in whitespace, we incorrectly assumed it was always ok to
trim that whitespace. That is not true if that whitespace is escaped,
i.e. if the path expression is something like '/x\ '. In that case, the
name really needs to be literally 'x ', i.e., we can not trim that
whitespace.

The incorrect behavior led to turning '/x\ ' first into 'x\' and then,
because we assume that '\' is always followed by a character inside the
string, when we removed the escaping '\', we would read beyond the end of
the intermediate string result; if we were lucky, that would lead to a
crash, otherwise we'd continue with junk.

We now make sure that escaped whitespace at the end of a string does not
get stripped, avoiding all these headaches.

Fixes RHBZ https://bugzilla.redhat.com/show_bug.cgi?id=1475621

(Cherry-picked, adapted from 4cca923b732990bec0c699b2e69911c2221b2498)