Author: geissert Date: 2010-12-14 19:44:57 +0000 (Tue, 14 Dec 2010) New Revision: 15709 Modified: check-external/lookup.sh Log: Fix a few RESERVED false positives Modified: check-external/lookup.sh ==================================================================--- check-external/lookup.sh 2010-12-14 19:11:25 UTC (rev 15708) +++ check-external/lookup.sh 2010-12-14 19:44:57 UTC (rev 15709) @@ -87,8 +87,19 @@ fi # Permanent exclusions can be added below - o="$(grep -m1 -A1 ^$cve ../data/CVE/list | sed ''1{d;q}'' | - grep -E ''TODO|NOT-FOR-US|RESERVED'')" || continue + o="$(grep -m1 -A2 ^$cve ../data/CVE/list | sed ''1{d;q}'')" || continue + + extra=empty + while read line; do + if [[ $extra = empty ]]; then + [[ $line =~ TODO|NOT-FOR-US|RESERVED ]] || continue 2 + o="$line" + extra+ else + extra="$line" + fi + done <<< "$o" + case $o in *NOT-FOR-US*) tr "[:upper:]" "[:lower:]" <<< "${o#*NOT-FOR-US:}" | @@ -97,9 +108,13 @@ grep -v adobe | grep -v acrobat | grep -vw opera | grep -v ''real player'' >/dev/null && echo "$cve: $o" || : ;; - *TODO:*|*RESERVED*) + *TODO:*) echo "$cve: $o" ;; + *RESERVED*) + [[ $extra ]] && grep -qv ^CVE <<< "$extra" || \ + echo "$cve: $o" + ;; *) echo "Unrecognised match: $o" >&2 ;;