cscppc: include CWE numbers in the output format

The following upstream commit is needed for this to work: danmar/cppcheck@0ca6ab1a
csutils · Aug 18, 2020 · c4f96b8 · c4f96b8
1 parent 8e6dc71
commit c4f96b8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/cscppc.c b/cscppc.c
@@ -56,7 +56,7 @@ static const char *analyzer_def_arg_list[] = {
 #endif
     "--inline-suppr",
     "--quiet",
-    "--template={file}:{line}: {severity}: {id}: {message}",
+    "--template={file}:{line}: {severity}: {id}(CWE-{cwe}): {message}",
     "--suppressions-list=/usr/share/cscppc/default.supp",
     NULL
 };

diff --git a/make-srpm.sh b/make-srpm.sh
@@ -110,8 +110,11 @@ BuildRequires: valgrind
 BuildRequires: glibc-static
 %endif
 
-# the --include option was introduced in 1.58
-Requires: cppcheck >= 1.58
+# the {cwe} field in --template option is supported since cppcheck-1.85
+Requires: cppcheck >= 1.85
+
+# older versions of csdiff do not read CWE numbers from Cppcheck output
+Conflicts: csdiff < 1.8.0
 
 %description
 This package contains the cscppc compiler wrapper that runs cppcheck in