[lintian] 01/01: c/watch-file: Fix whitespace handling in v4 watch files
This is an automated email from the git hooks/post-receive script.
nthykier pushed a commit to branch master
in repository lintian.
commit 148ec1ce57d9e4a2880ce78898f220ec0b0de0ec
Author: Alexander Kulak <sa-dev@rainbow.by>
Date: Sat Jun 17 14:15:49 2017 +0000
c/watch-file: Fix whitespace handling in v4 watch files
Signed-off-by: Niels Thykier <niels@thykier.net>
---
checks/watch-file.pm | 2 +-
debian/changelog | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/checks/watch-file.pm b/checks/watch-file.pm
index 53016aa..bfa5d92 100644
--- a/checks/watch-file.pm
+++ b/checks/watch-file.pm
@@ -100,7 +100,7 @@ sub run {
if ( s/^opt(?:ion)?s=\"([^\"]+)\"\s+//
|| s/^opt(?:ion)?s=(\S+)\s+//) {
$opts = $1;
- @opts = split(',', $opts);
+ @opts = split($watchver >= 4 ? '\s*,\s*' : ',', $opts);
for (@opts) {
$repack_mangle = 1
if defined $repack
diff --git a/debian/changelog b/debian/changelog
index 94b79c3..93261b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -89,6 +89,9 @@ lintian (2.5.51) UNRELEASED; urgency=medium
* checks/upstream-metadata.pm:
+ [JW, NT] Disable YAML parsing of upstream metadata file as the YAML
parser executes code. (Closes: #861958, CVE-2017-8829)
+ * checks/watch-file.pm:
+ + [NT] Apply patch from Alexander Kulak to handle whitespace correctly
+ in the options in v4 watch files. (Closes: #861599)
* coll/debian-readme{,desc}:
+ [NT] Remove. Merge what little functionality it offers into the
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: