diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-04-04 15:10:13 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-04-04 15:10:13 +0200 |
| commit | c7fa97092e49c5518035fccf9a0e2d8151b33073 (patch) | |
| tree | 1d863f7e4c73b1c53944f4c44d60d30dc36d2123 | |
| parent | 7a31176fab910eb63ee059f77e094993714f1c41 (diff) | |
| download | vulns-c7fa97092e49c5518035fccf9a0e2d8151b33073.tar.gz | |
scripts/cve_update: fix up the grep lines for a diff
We were incorrectly ignoring some changes to the files by masking off
things we wanted to track (i.e. git urls). Fix up the grep lines by
properly ignoring only the email addresses as desired.
This will cause almost all prior mbox files to be regenerated to handle
this properly, but that is just a one-time thing.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rwxr-xr-x | scripts/cve_update | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/cve_update b/scripts/cve_update index 42705db1..e209128e 100755 --- a/scripts/cve_update +++ b/scripts/cve_update @@ -102,7 +102,7 @@ update_cve() # see if the json and/or mbox files actually changed, EXCEPT for the bippy-VERSIONINFO string updated_file="" - diff=$(diff -u "${root}.json" "${tmp_json}" | grep -v "${tmp_json}" | grep -v "${root}.json" | grep -v "bippy-" | grep -v "^@@ " | grep "^[+|-]" | grep -v "kernel.org" | grep -v "linuxfoundation.org") + diff=$(diff -u "${root}.json" "${tmp_json}" | grep -v "${tmp_json}" | grep -v "${root}.json" | grep -v "bippy" | grep -v "^@@ " | grep "^[+|-]" | grep -v "@kernel.org" | grep -v "@linuxfoundation.org") #echo "diff json=${diff}" if [[ "${diff}" != "" ]] ; then mv -f "${tmp_json}" "${root}.json" @@ -112,7 +112,7 @@ update_cve() #echo "diff for json was empty" fi - diff=$(diff -u "${root}.mbox" "${tmp_mbox}" | grep -v "${tmp_mbox}" | grep -v "${root}.mbox" | grep -v "bippy-" | grep -v "^@@ " | grep "^+" | grep -v "kernel.org" | grep -v "linuxfoundation.org") + diff=$(diff -u "${root}.mbox" "${tmp_mbox}" | grep -v "${tmp_mbox}" | grep -v "${root}.mbox" | grep -v "bippy-" | grep -v "^@@ " | grep "^[+|-]" | grep -v "@kernel.org" | grep -v "@linuxfoundation.org") #echo "diff mbox=${diff}" if [[ "${diff}" != "" ]] ; then mv -f "${tmp_mbox}" "${root}.mbox" |