Merge ubuntu-cve-tracker:add-boilerplate-updates-using-scripts into ubuntu-cve-tracker:master

[Nishit Majithia]

Add boilerplate update to scripts

 - update to release-cycle-new-overlay.py to add overlay into all
   boilerplates files
 - update to sync-from-eol.py to mark the boilerplate entry as eol

Testing has been done by going back to the 176dc807 commit (which is before the update to boilerplate code) and following the steps mentioned here: https://wiki.ubuntu.com/SecurityTeam/ReleaseCycle#LTS_Release_goes_to_ESM_status_checklist

It will update all boilerplate CVE files as expected

[Alex Murray (alexmurray)]

LGTM.

review: Approve

[Nishit Majithia (0xnishit)]

Thanks

diff --git a/scripts/release-cycle-new-overlay.py b/scripts/release-cycle-new-overlay.py
index db9108c..d2ed5db 100755
--- a/scripts/release-cycle-new-overlay.py
+++ b/scripts/release-cycle-new-overlay.py
@@ -39,11 +39,16 @@ pkgs = source_map.load()
 cves = glob.glob('%s/CVE-*' % cve_lib.active_dir)
 cves += glob.glob('%s/CVE-*' % cve_lib.retired_dir)
 cves += glob.glob('%s/CVE-*' % cve_lib.ignored_dir)
+cves += glob.glob('%s/*' % cve_lib.boilerplates_dir)
 if os.path.islink(cve_lib.embargoed_dir):
     cves += glob.glob('%s/CVE-*' % cve_lib.embargoed_dir)
     cves += glob.glob('%s/EMB-*' % cve_lib.embargoed_dir)
 
 for filename in cves:
+    # we don't want to edit symlinks as that will cause them to become
+    # unsymlinked
+    if os.path.islink(filename):
+        continue;
     cve = os.path.basename(filename)
     cvedir = os.path.basename(os.path.dirname(filename))
     try:
diff --git a/scripts/sync-from-eol.py b/scripts/sync-from-eol.py
index dd6d9eb..1ca612c 100755
--- a/scripts/sync-from-eol.py
+++ b/scripts/sync-from-eol.py
@@ -47,6 +47,7 @@ if opt.whole:
 pkgs = source_map.load(releases=[opt.release], skip_eol_releases=False)
 
 cves = glob.glob('%s/CVE-*' % cve_lib.active_dir)
+cves += glob.glob('%s/*' % cve_lib.boilerplates_dir)
 
 if os.path.islink('embargoed'):
     cves += glob.glob('embargoed/CVE-*')