Merge ~jdstrand/ubuntu-cve-tracker:cve-vim-placeholders into ubuntu-cve-tracker:master

Proposed by Jamie Strandboge
Status: Merged
Merged at revision: 6f41fd3eee97770a430efc93552027dd5c0a7587
Proposed branch: ~jdstrand/ubuntu-cve-tracker:cve-vim-placeholders
Merge into: ubuntu-cve-tracker:master
Diff against target: 113 lines (+21/-16)
4 files modified
active/CVE-2021-25682 (+6/-4)
active/CVE-2021-25683 (+6/-4)
active/CVE-2021-25684 (+6/-4)
scripts/cve.vim (+3/-4)
Reviewer Review Type Date Requested Status
Alex Murray Approve
Review via email: mp+397384@code.launchpad.net

Description of the change

scripts/cve.vim: also support placeholder CVEs

Adjust to accept CVE names in the style of CVE-2021-NNN1 or
CVE-2020-NNNN1234.

To post a comment you must log in.
Revision history for this message
Alex Murray (alexmurray) wrote :

Thanks Jamie, LGTM!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/active/CVE-2021-25682 b/active/CVE-2021-25682
2index f060050..3c727a0 100644
3--- a/active/CVE-2021-25682
4+++ b/active/CVE-2021-25682
5@@ -1,8 +1,10 @@
6+PublicDateAtUSN: 2021-02-02 18:00:00 UTC
7 Candidate: CVE-2021-25682
8 CRD: 2021-02-02 18:00:00 UTC
9 PublicDate: 2021-02-02 18:00:00 UTC
10 References:
11 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-25682
12+ https://usn.ubuntu.com/usn/usn-4720-1
13 Description:
14 error parsing /proc/pid/status
15 Ubuntu-Description:
16@@ -21,8 +23,8 @@ upstream_apport: needs-triage
17 precise/esm_apport: DNE
18 trusty_apport: ignored (out of standard support)
19 trusty/esm_apport: needs-triage
20-xenial_apport: needed
21-bionic_apport: needed
22-focal_apport: needed
23-groovy_apport: needed
24+xenial_apport: released (2.20.1-0ubuntu2.30)
25+bionic_apport: released (2.20.9-0ubuntu7.23)
26+focal_apport: released (2.20.11-0ubuntu27.16)
27+groovy_apport: released (2.20.11-0ubuntu50.5)
28 devel_apport: needed
29diff --git a/active/CVE-2021-25683 b/active/CVE-2021-25683
30index a8aa086..8d935e3 100644
31--- a/active/CVE-2021-25683
32+++ b/active/CVE-2021-25683
33@@ -1,8 +1,10 @@
34+PublicDateAtUSN: 2021-02-02 18:00:00 UTC
35 Candidate: CVE-2021-25683
36 CRD: 2021-02-02 18:00:00 UTC
37 PublicDate: 2021-02-02 18:00:00 UTC
38 References:
39 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-25683
40+ https://usn.ubuntu.com/usn/usn-4720-1
41 Description:
42 error parsing /proc/pid/stat
43 Ubuntu-Description:
44@@ -21,8 +23,8 @@ upstream_apport: needs-triage
45 precise/esm_apport: DNE
46 trusty_apport: ignored (out of standard support)
47 trusty/esm_apport: needs-triage
48-xenial_apport: needed
49-bionic_apport: needed
50-focal_apport: needed
51-groovy_apport: needed
52+xenial_apport: released (2.20.1-0ubuntu2.30)
53+bionic_apport: released (2.20.9-0ubuntu7.23)
54+focal_apport: released (2.20.11-0ubuntu27.16)
55+groovy_apport: released (2.20.11-0ubuntu50.5)
56 devel_apport: needed
57diff --git a/active/CVE-2021-25684 b/active/CVE-2021-25684
58index 8df5057..ab425c9 100644
59--- a/active/CVE-2021-25684
60+++ b/active/CVE-2021-25684
61@@ -1,8 +1,10 @@
62+PublicDateAtUSN: 2021-02-02 18:00:00 UTC
63 Candidate: CVE-2021-25684
64 CRD: 2021-02-02 18:00:00 UTC
65 PublicDate: 2021-02-02 18:00:00 UTC
66 References:
67 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-25684
68+ https://usn.ubuntu.com/usn/usn-4720-1
69 Description:
70 stuck reading fifo
71 Ubuntu-Description:
72@@ -21,8 +23,8 @@ upstream_apport: needs-triage
73 precise/esm_apport: DNE
74 trusty_apport: ignored (out of standard support)
75 trusty/esm_apport: needs-triage
76-xenial_apport: needed
77-bionic_apport: needed
78-focal_apport: needed
79-groovy_apport: needed
80+xenial_apport: released (2.20.1-0ubuntu2.30)
81+bionic_apport: released (2.20.9-0ubuntu7.23)
82+focal_apport: released (2.20.11-0ubuntu27.16)
83+groovy_apport: released (2.20.11-0ubuntu50.5)
84 devel_apport: needed
85diff --git a/scripts/cve.vim b/scripts/cve.vim
86index 51eabd9..7460445 100644
87--- a/scripts/cve.vim
88+++ b/scripts/cve.vim
89@@ -1,13 +1,12 @@
90 " Vim syntax file
91 " Language: UCT CVEs
92-" Maintainer: Jamie Strandboge
93-" Latest Revision: 26 April 2018
94+" Latest Revision: Feb 2021
95 "
96 " To use:
97 " $ mkdir -p ~/.vim/syntax
98 " $ ln -s $UCT/scripts/cve.vim ~/.vim/syntax/cve.vim
99 " Add to ~/.vimrc:
100-" autocmd BufNewFile,BufRead CVE-[0-9][0-9][0-9][0-9]-[0-9]\\\{4,\} set syntax=cve
101+" autocmd BufNewFile,BufRead CVE-[0-9][0-9][0-9][0-9]-[0-9N]\\\{4,\} set syntax=cve
102 " autocmd BufNewFile,BufRead 00boilerplate.* set syntax=cve
103 "
104 " TODO:
105@@ -30,7 +29,7 @@ syn match cveElse "^.*$"
106
107 syn match cveRelease "\(devel\|upstream\|product\|snap\|warty\|hoary\|breezy\|dapper\|edgy\|feisty\|gutsy\|hardy\|intrepid\|jaunty\|karmic\|lucid\|maverick\|natty\|oneiric\|precise\|precise/esm\|quantal\|raring\|saucy\|trusty\|trusty/esm\|utopic\|vivid\|vivid/stable-phone-overlay\|vivid/ubuntu-core\|wily\|xenial\|yakkety\|zesty\|artful\|bionic\|cosmic\|disco\|eoan\|focal\|groovy\)"
108 syn match cveSrcPkg contained "[a-z0-9][a-z0-9+.-]\+"
109-syn match cveId contained "CVE-[0-9][0-9][0-9][0-9]-[0-9]\{4,}"
110+syn match cveId contained "CVE-[0-9][0-9][0-9][0-9]-[0-9N]\{4,}"
111 syn match cveDate contained "[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]\( [0-2][0-9]:[0-5][0-9]:[0-5][0-9] \([A-Z][A-Z][A-Z]\|[+-][01][0-9][0-9][0-9]\)\)\?"
112 syn match cveStatus contained "\(needs\-triage\|needed\|deferred\|pending\|released-esm\|released\|ignored\|not\-affected\|DNE\)"
113 syn match cveStatusExtra contained " (.\+)"

Subscribers

People subscribed via source and target branches