Merge ~alexmurray/ubuntu-cve-tracker:die-partner-die into ubuntu-cve-tracker:master

[Alex Murray]

The partner mirror hasn't been used or supported for a very long time so let's not try and pretend anymore. Remove all references to it from UCT. Hopefully this fixes CI too since it seems the partner mirror is not available on the internal archive mirror either anymore for bionic since it went into ESM.

[Marc Deslauriers (mdeslaur)]

The only thing that sticks out is this:

+ global esm_warned

The rest LGTM. Thanks!

[Alex Murray (alexmurray)]

the global esm_warned was to fix pyflakes3 complaining about this variable - since I touched check-syntax pyflakes3 gets run against it in the pre-commit hook - this is needed to indicate we are using the global variable inside this function.

[Marc Deslauriers (mdeslaur)]

> the global esm_warned was to fix pyflakes3 complaining about this variable -
> since I touched check-syntax pyflakes3 gets run against it in the pre-commit
> hook - this is needed to indicate we are using the global variable inside this
> function.

Ah! Great :)

review: Approve

[Seth Arnold (seth-arnold)]

awesome :) thanks for tackling this!

[Steve Beattie (sbeattie)]

Thanks! I also removed the setup for partner in the ubuntu-security-tools:build-tools/build-sources-list script (though there's more cleanup that needs to be done there).

This also fixes the current lpci check-syntax breakage, so yay!

review: Approve

diff --git a/.launchpad.yaml b/.launchpad.yaml
index cf00cb8..b2962f9 100644
--- a/.launchpad.yaml
+++ b/.launchpad.yaml
@@ -59,9 +59,7 @@ jobs:
       # for source_map
       echo plb_authentication=/dev/null > ~/.ubuntu-cve-tracker.conf
       echo "packages_mirror=$HOME/mirrors/ubuntu/" >> ~/.ubuntu-cve-tracker.conf
-      for mirror in debian partner; do
-        echo "${mirror}_mirror=$HOME/mirrors/${mirror}/" >> ~/.ubuntu-cve-tracker.conf
-      done
+      echo "debian_mirror=$HOME/mirrors/debian/" >> ~/.ubuntu-cve-tracker.conf
       echo "Setting up packages-mirror..."
       # use wget for packages-mirror since rsync is not accessible in lp
       # builders - also invoke with -v since this seems to make downloading more
diff --git a/README b/README
index fc18a69..6603d53 100644
--- a/README
+++ b/README
@@ -64,7 +64,6 @@ The following values need to be configured in ~/.ubuntu-cve-tracker.conf:
   database (sis-generate-usn).
 - usn_db_copy: path to copy of master USN database, used when creating
   a template for a USN where "N" != 1 (sis-generate-usn).
-- partner_mirror: same as packages_mirror, but for the partner repo.
 - debian_mirror: same as packages_mirror, but for Debian testing repo.
 - mitre_loc: where to download the MITRE CVE database
 - nvd_loc: where to download the NVD database
@@ -441,9 +440,6 @@ Show all active CVEs for supported (main) packages:
 Number of active CVEs that are in main:
 ./scripts/ubuntu-table --supported 2>/dev/null | grep SUPPORTED | wc -l
 
-Show all active CVEs for partner packages:
-./scripts/ubuntu-table --supported 2>/dev/null | grep PARTNER
-
 Show all out-of-sync CVEs for the devel release:
 ./scripts/ubuntu-table --supported | grep 'out of sync' | awk '{if ($8 == "needed*" || $8 == "needs-triage*") { print $0 }}'
 
@@ -477,7 +473,7 @@ See all bugs with priority of medium or higher:
 See a listing of packages with number of CVEs attached to them, weighted by
 CVE priority:
 ./scripts/cve_packages
-./scripts/cve_packages -m       (just supported (main, restricted and partner))
+./scripts/cve_packages -m       (just supported (main and restricted))
 ./scripts/cve_packages -u       (just unsupported (universe and multiverse))
 ./scripts/cve_packages -t	(just totals)
 ./scripts/cve_packages -a	(with assignees)
diff --git a/scripts/check-syntax b/scripts/check-syntax
index 92c3606..9d701e3 100755
--- a/scripts/check-syntax
+++ b/scripts/check-syntax
@@ -589,10 +589,6 @@ def check_cve(cve):
             # Skip DNE's
             if state == "DNE":
                 if pkg in source[rel]:
-                    # TODO: remove this when partner archive is back in sync
-                    # sigh, partner archive mirrors are out of date since removing sun-java6
-                    if pkg == "sun-java6" and source[rel][pkg]["section"] == "partner":
-                        continue
                     print(
                         "%s: %d: package '%s' DOES exist in '%s'"
                         % (filename, linenum, pkg, rel),
@@ -685,6 +681,7 @@ def check_cve(cve):
                         released = details[1]
                         # XXX 'version' existence check should not be needed
                         if "version" not in source[rel][pkg]:
+                            global esm_warned
                             if not esm_warned:
                                 print(
                                     "%s: %d: unable to lookup source version for %s in %s"
diff --git a/scripts/cve-alert.sh b/scripts/cve-alert.sh
index 417bc4c..84d761e 100755
--- a/scripts/cve-alert.sh
+++ b/scripts/cve-alert.sh
@@ -9,7 +9,7 @@ set -e
 alert_threshold=10
 alert_high_threshold=0
 alert_community_threshold=0
-alert_ignore="[[:blank:]]linux:|linux-lts-|linux-hwe|linux-ti-|linux-raspi|linux-snapdragon|linux-azure|linux-aws|linux-bluefield|linux-dell|linux-gcp|linux-gke|linux-ibm|linux-intel|linux-iot|linux-lowlatency|linux-kvm|linux-oem|linux-oracle|linux-riscv|linux-xilinx-zynqmp|qtwebkit-source|qtwebkit-opensource-src|webkit:|webkitgtk|oxide-qt|PARTNER"
+alert_ignore="[[:blank:]]linux:|linux-lts-|linux-hwe|linux-ti-|linux-raspi|linux-snapdragon|linux-azure|linux-aws|linux-bluefield|linux-dell|linux-gcp|linux-gke|linux-ibm|linux-intel|linux-iot|linux-lowlatency|linux-kvm|linux-oem|linux-oracle|linux-riscv|linux-xilinx-zynqmp|qtwebkit-source|qtwebkit-opensource-src|webkit:|webkitgtk|oxide-qt"
 alert_high_ignore="linux-hwe-edge:|linux-gcp-edge:|linux-azure-edge:"
 # important universe packages that we'd like to have up to date
 alert_community="adobe-flashplugin|chromium-browser|docker\.io|flashplugin-nonfree"
diff --git a/scripts/cve_lib.py b/scripts/cve_lib.py
index 00d6075..4f5f7b8 100755
--- a/scripts/cve_lib.py
+++ b/scripts/cve_lib.py
@@ -277,7 +277,7 @@ subprojects = {
     },
     "ubuntu/warty": {
         "eol": True,
-        "components": ["main", "restricted", "universe", "multiverse", "partner"],
+        "components": ["main", "restricted", "universe", "multiverse"],
         "name": "Ubuntu 4.10",
         "version": 4.10,
         "codename": "Warty Warthog",
@@ -287,7 +287,7 @@ subprojects = {
     },
     "ubuntu/hoary": {
         "eol": True,
-        "components": ["main", "restricted", "universe", "multiverse", "partner"],
+        "components": ["main", "restricted", "universe", "multiverse"],
         "name": "Ubuntu 5.04",
         "version": 5.04,
         "codename": "Hoary Hedgehog",
@@ -297,7 +297,7 @@ subprojects = {
     },
     "ubuntu/breezy": {
         "eol": True,
-        "components": ["main", "restricted", "universe", "multiverse", "partner"],
+        "components": ["main", "restricted", "universe", "multiverse"],
         "name": "Ubuntu 5.10",
         "version": 5.10,
         "codename": "Breezy Badger",
@@ -307,7 +307,7 @@ subprojects = {
     },
     "ubuntu/dapper": {
         "eol": True,
-        "components": ["main", "restricted", "universe", "multiverse", "partner"],
+        "components": ["main", "restricted", "universe", "multiverse"],
         "name": "Ubuntu 6.06 LTS",
         "version": 6.06,
         "codename": "Dapper Drake",
@@ -317,7 +317,7 @@ subprojects = {
     },
     "ubuntu/edgy": {
         "eol": True,
-        "components": ["main", "restricted", "universe", "multiverse", "partner"],
+        "components": ["main", "restricted", "universe", "multiverse"],
         "name": "Ubuntu 6.10",
         "version": 6.10,
         "codename": "Edgy Eft",
@@ -327,7 +327,7 @@ subprojects = {
     },
     "ubuntu/feisty": {
         "eol": True,
-        "components": ["main", "restricted", "universe", "multiverse", "partner"],
+        "components": ["main", "restricted", "universe", "multiverse"],
         "name": "Ubuntu 7.04",
         "version": 7.04,
         "codename": "Feisty Fawn",
@@ -337,7 +337,7 @@ subprojects = {
     },
     "ubuntu/gutsy": {
         "eol": True,
-        "components": ["main", "restricted", "universe", "multiverse", "partner"],
+        "components": ["main", "restricted", "universe", "multiverse"],
         "name": "Ubuntu 7.10",
         "version": 7.10,
         "codename": "Gutsy Gibbon",
@@ -347,7 +347,7 @@ subprojects = {
     },
     "ubuntu/hardy": {
         "eol": True,
-        "components": ["main", "restricted", "universe", "multiverse", "partner"],
+        "components": ["main", "restricted", "universe", "multiverse"],
         "name": "Ubuntu 8.04 LTS",
         "version": 8.04,
         "codename": "Hardy Heron",
@@ -357,7 +357,7 @@ subprojects = {
     },
     "ubuntu/intrepid": {
         "eol": True,
-        "components": ["main", "restricted", "universe", "multiverse", "partner"],
+        "components": ["main", "restricted", "universe", "multiverse"],
         "name": "Ubuntu 8.10",
         "version": 8.10,
         "codename": "Intrepid Ibex",
@@ -367,7 +367,7 @@ subprojects = {
     },
     "ubuntu/jaunty": {
         "eol": True,
-        "components": ["main", "restricted", "universe", "multiverse", "partner"],
+        "components": ["main", "restricted", "universe", "multiverse"],
         "name": "Ubuntu 9.04",
         "version": 9.04,
         "codename": "Jaunty Jackalope",
@@ -377,7 +377,7 @@ subprojects = {
     },
     "ubuntu/karmic": {
         "eol": True,
-        "components": ["main", "restricted", "universe", "multiverse", "partner"],
+        "components": ["main", "restricted", "universe", "multiverse"],
         "name": "Ubuntu 9.10",
         "version": 9.10,
         "codename": "Karmic Koala",
@@ -387,7 +387,7 @@ subprojects = {
     },
     "ubuntu/lucid": {
         "eol": True,
-        "components": ["main", "restricted", "universe", "multiverse", "partner"],
+        "components": ["main", "restricted", "universe", "multiverse"],
         "name": "Ubuntu 10.04 LTS",
         "version": 10.04,
         "codename": "Lucid Lynx",
@@ -397,7 +397,7 @@ subprojects = {
     },
     "ubuntu/maverick": {
         "eol": True,
-        "components": ["main", "restricted", "universe", "multiverse", "partner"],
+        "components": ["main", "restricted", "universe", "multiverse"],
         "name": "Ubuntu 10.10",
         "version": 10.10,
         "codename": "Maverick Meerkat",
@@ -407,7 +407,7 @@ subprojects = {
     },
     "ubuntu/natty": {
         "eol": True,
-        "components": ["main", "restricted", "universe", "multiverse", "partner"],
+        "components": ["main", "restricted", "universe", "multiverse"],
         "name": "Ubuntu 11.04",
         "version": 11.04,
         "codename": "Natty Narwhal",
@@ -417,7 +417,7 @@ subprojects = {
     },
     "ubuntu/oneiric": {
         "eol": True,
-        "components": ["main", "restricted", "universe", "multiverse", "partner"],
+        "components": ["main", "restricted", "universe", "multiverse"],
         "name": "Ubuntu 11.10",
         "version": 11.10,
         "codename": "Oneiric Ocelot",
@@ -427,7 +427,7 @@ subprojects = {
     },
     "ubuntu/precise": {
         "eol": True,
-        "components": ["main", "restricted", "universe", "multiverse", "partner"],
+        "components": ["main", "restricted", "universe", "multiverse"],
         "name": "Ubuntu 12.04 LTS",
         "version": 12.04,
         "codename": "Precise Pangolin",
@@ -437,7 +437,7 @@ subprojects = {
     },
     "ubuntu/quantal": {
         "eol": True,
-        "components": ["main", "restricted", "universe", "multiverse", "partner"],
+        "components": ["main", "restricted", "universe", "multiverse"],
         "name": "Ubuntu 12.10",
         "version": 12.10,
         "codename": "Quantal Quetzal",
@@ -447,7 +447,7 @@ subprojects = {
     },
     "ubuntu/raring": {
         "eol": True,
-        "components": ["main", "restricted", "universe", "multiverse", "partner"],
+        "components": ["main", "restricted", "universe", "multiverse"],
         "name": "Ubuntu 13.04",
         "version": 13.04,
         "codename": "Raring Ringtail",
@@ -457,7 +457,7 @@ subprojects = {
     },
     "ubuntu/saucy": {
         "eol": True,
-        "components": ["main", "restricted", "universe", "multiverse", "partner"],
+        "components": ["main", "restricted", "universe", "multiverse"],
         "name": "Ubuntu 13.10",
         "version": 13.10,
         "codename": "Saucy Salamander",
@@ -467,7 +467,7 @@ subprojects = {
     },
     "ubuntu/trusty": {
         "eol": True,
-        "components": ["main", "restricted", "universe", "multiverse", "partner"],
+        "components": ["main", "restricted", "universe", "multiverse"],
         "name": "Ubuntu 14.04 LTS",
         "version": 14.04,
         "codename": "Trusty Tahr",
@@ -477,7 +477,7 @@ subprojects = {
     },
     "ubuntu/utopic": {
         "eol": True,
-        "components": ["main", "restricted", "universe", "multiverse", "partner"],
+        "components": ["main", "restricted", "universe", "multiverse"],
         "name": "Ubuntu 14.10",
         "version": 14.10,
         "codename": "Utopic Unicorn",
@@ -487,7 +487,7 @@ subprojects = {
     },
     "ubuntu/vivid": {
         "eol": True,
-        "components": ["main", "restricted", "universe", "multiverse", "partner"],
+        "components": ["main", "restricted", "universe", "multiverse"],
         "name": "Ubuntu 15.04",
         "version": 15.04,
         "codename": "Vivid Vervet",
@@ -497,7 +497,7 @@ subprojects = {
     },
     "ubuntu/wily": {
         "eol": True,
-        "components": ["main", "restricted", "universe", "multiverse", "partner"],
+        "components": ["main", "restricted", "universe", "multiverse"],
         "name": "Ubuntu 15.10",
         "version": 15.10,
         "codename": "Wily Werewolf",
@@ -507,7 +507,7 @@ subprojects = {
     },
     "ubuntu/xenial": {
         "eol": True,
-        "components": ["main", "restricted", "universe", "multiverse", "partner"],
+        "components": ["main", "restricted", "universe", "multiverse"],
         "name": "Ubuntu 16.04 LTS",
         "version": 16.04,
         "codename": "Xenial Xerus",
@@ -517,7 +517,7 @@ subprojects = {
     },
     "ubuntu/yakkety": {
         "eol": True,
-        "components": ["main", "restricted", "universe", "multiverse", "partner"],
+        "components": ["main", "restricted", "universe", "multiverse"],
         "name": "Ubuntu 16.10",
         "version": 16.10,
         "codename": "Yakkety Yak",
@@ -527,7 +527,7 @@ subprojects = {
     },
     "ubuntu/zesty": {
         "eol": True,
-        "components": ["main", "restricted", "universe", "multiverse", "partner"],
+        "components": ["main", "restricted", "universe", "multiverse"],
         "name": "Ubuntu 17.04",
         "version": 17.04,
         "codename": "Zesty Zapus",
@@ -537,7 +537,7 @@ subprojects = {
     },
     "ubuntu/artful": {
         "eol": True,
-        "components": ["main", "restricted", "universe", "multiverse", "partner"],
+        "components": ["main", "restricted", "universe", "multiverse"],
         "name": "Ubuntu 17.10",
         "version": 17.10,
         "codename": "Artful Aardvark",
@@ -548,7 +548,7 @@ subprojects = {
     "ubuntu/bionic": {
         "eol": True,
         "oval": True,
-        "components": ["main", "restricted", "universe", "multiverse", "partner"],
+        "components": ["main", "restricted", "universe", "multiverse"],
         "name": "Ubuntu 18.04 LTS",
         "version": 18.04,
         "codename": "Bionic Beaver",
@@ -558,7 +558,7 @@ subprojects = {
     },
     "ubuntu/cosmic": {
         "eol": True,
-        "components": ["main", "restricted", "universe", "multiverse", "partner"],
+        "components": ["main", "restricted", "universe", "multiverse"],
         "name": "Ubuntu 18.10",
         "version": 18.10,
         "codename": "Cosmic Cuttlefish",
@@ -568,7 +568,7 @@ subprojects = {
     },
     "ubuntu/disco": {
         "eol": True,
-        "components": ["main", "restricted", "universe", "multiverse", "partner"],
+        "components": ["main", "restricted", "universe", "multiverse"],
         "name": "Ubuntu 19.04",
         "version": 19.04,
         "codename": "Disco Dingo",
@@ -578,7 +578,7 @@ subprojects = {
     },
     "ubuntu/eoan": {
         "eol": True,
-        "components": ["main", "restricted", "universe", "multiverse", "partner"],
+        "components": ["main", "restricted", "universe", "multiverse"],
         "name": "Ubuntu 19.10",
         "version": 19.10,
         "codename": "Eoan Ermine",
@@ -589,7 +589,7 @@ subprojects = {
     "ubuntu/focal": {
         "eol": False,
         "oval": True,
-        "components": ["main", "restricted", "universe", "multiverse", "partner"],
+        "components": ["main", "restricted", "universe", "multiverse"],
         "name": "Ubuntu 20.04 LTS",
         "version": 20.04,
         "codename": "Focal Fossa",
@@ -599,7 +599,7 @@ subprojects = {
     },
     "ubuntu/groovy": {
         "eol": True,
-        "components": ["main", "restricted", "universe", "multiverse", "partner"],
+        "components": ["main", "restricted", "universe", "multiverse"],
         "name": "Ubuntu 20.10",
         "version": 20.10,
         "codename": "Groovy Gorilla",
@@ -609,7 +609,7 @@ subprojects = {
     },
     "ubuntu/hirsute": {
         "eol": True,
-        "components": ["main", "restricted", "universe", "multiverse", "partner"],
+        "components": ["main", "restricted", "universe", "multiverse"],
         "name": "Ubuntu 21.04",
         "version": 21.04,
         "codename": "Hirsute Hippo",
@@ -619,7 +619,7 @@ subprojects = {
     },
     "ubuntu/impish": {
         "eol": True,
-        "components": ["main", "restricted", "universe", "multiverse", "partner"],
+        "components": ["main", "restricted", "universe", "multiverse"],
         "name": "Ubuntu 21.10",
         "version": 21.10,
         "codename": "Impish Indri",
@@ -630,7 +630,7 @@ subprojects = {
     "ubuntu/jammy": {
         "eol": False,
         "oval": True,
-        "components": ["main", "restricted", "universe", "multiverse", "partner"],
+        "components": ["main", "restricted", "universe", "multiverse"],
         "name": "Ubuntu 22.04 LTS",
         "version": 22.04,
         "codename": "Jammy Jellyfish",
@@ -2572,21 +2572,8 @@ def any_supported(map, pkg, releases, cvedata):
     return False
 
 
-def is_partner(map, pkg, rel):
-    if rel in map and pkg in map[rel] and map[rel][pkg]['section'] == 'partner':
-        return True
-    return False
-
-
-def any_partner(map, pkg, releases):
-    for rel in releases:
-        if is_partner(map, pkg, rel):
-            return True
-    return False
-
-
 def is_universe(map, pkg, rel, cvedata):
-    if is_supported(map, pkg, rel, cvedata) or is_partner(map, pkg, rel):
+    if is_supported(map, pkg, rel, cvedata):
         return False
     return True
 
@@ -2598,14 +2585,6 @@ def any_universe(map, pkg, releases, cvedata):
     return False
 
 
-def release_has_partner(rel):
-    try:
-        _,_,_,details = get_subproject_details(rel)
-        return "partner" in details["components"]
-    except (ValueError, KeyError):
-        return False
-
-
 def in_universe(map, pkg, rel, cve, cvedata):
     if pkg in map[rel] and map[rel][pkg]['section'] == 'universe':
         return True
@@ -3008,7 +2987,7 @@ def git_delete_branch(branch, debug=False):
 # cve_lib.check_mirror_timestamp(config)
 # cve_lib.check_mirror_timestamp(config, mirror='packages_mirror')
 def check_mirror_timestamp(config, mirror=None):
-    mirrors = ['packages_mirror', 'partner_mirror']
+    mirrors = ['packages_mirror']
     if mirror is not None:
         mirrors = [mirror]
     for m in mirrors:
@@ -3017,8 +2996,6 @@ def check_mirror_timestamp(config, mirror=None):
         a = config[m]
 
         secs = 86400
-        if m == 'partner_mirror':
-            secs = secs * 7
 
         if os.path.exists(a + ".timestamp") and time.mktime(time.localtime()) - os.stat(a + ".timestamp").st_mtime > secs:
             print("WARNING: '%s' is %1.1f days older than %1.1f day(s). Please run '$UCT/scripts/packages-mirror -t'." %
diff --git a/scripts/cve_packages b/scripts/cve_packages
index d301464..da038c4 100755
--- a/scripts/cve_packages
+++ b/scripts/cve_packages
@@ -86,7 +86,6 @@ deferred_packages = dict()
 popularity = dict()
 pockets = { 'supported' : dict(),
             'universe' : dict(),
-            'partner' : dict(),
             'only_in_supported_overlay' : dict() }
 
 points = { 'negligible' : 0,
@@ -175,7 +174,6 @@ for cve in sorted(cves):
             continue
 
         supported = False
-        partner = False
         universe = False
         found = False
         overlay = False
@@ -219,18 +217,16 @@ for cve in sorted(cves):
                     found = True
                     if cve_lib.is_supported(map, namemap[pkg][r], r, cveinfo[cve]):
                         supported = True
-                    if cve_lib.is_partner(map, namemap[pkg][r], r):
-                        partner = True
                     if cve_lib.is_universe(map, namemap[pkg][r], r, cveinfo[cve]):
                         universe = True
 
         if not found:
             continue
 
-        if opt.only_supported and not supported and not partner:
+        if opt.only_supported and not supported:
             continue
 
-        if opt.not_supported and (supported or partner):
+        if opt.not_supported and supported:
             continue
 
         if supported:
@@ -245,11 +241,6 @@ for cve in sorted(cves):
                 else:
                     pockets['only_in_supported_overlay'][pkg] = 1
 
-        if partner:
-            if pkg in pockets['partner']:
-                pockets['partner'][pkg] += 1
-            else:
-                pockets['partner'][pkg] = 1
         if universe:
             if pkg in pockets['universe']:
                 pockets['universe'][pkg] += 1
@@ -409,9 +400,7 @@ else:
                     sys.stdout.write(", %s %s" % (str(priorities[p][pkg]), p))
 
         extra_info = []
-        if pkg in pockets['partner']:
-            extra_info.append('PARTNER')
-        elif pkg in pockets['supported']:
+        if pkg in pockets['supported']:
             if pkg in pockets['only_in_supported_overlay']:
                 extra_info.append('SUPPORTED-ONLY-OVERLAY')
             else:
diff --git a/scripts/html-report b/scripts/html-report
index 63a15a5..70ea75c 100755
--- a/scripts/html-report
+++ b/scripts/html-report
@@ -80,14 +80,11 @@ header() {
     show="$2"
     main_active=""
     universe_active=""
-    partner_active=""
 
     if [ "$show" = "main" ]; then
         main_active="active ";
     elif [ "$show" = "universe" ]; then
         universe_active="active ";
-    elif [ "$show" = "partner" ]; then
-        partner_active="active ";
     fi
 
     cat > "$outfile" <<EOM
@@ -129,7 +126,6 @@ header() {
         <li class="nav-item"><a class="nav-link" href=".">Home</a></li>
         <li class="nav-item"><a class="${main_active}nav-link" href="main.html">Main</a></li>
         <li class="nav-item"><a class="${universe_active}nav-link" href="universe.html">Universe</a></li>
-        <li class="nav-item"><a class="${partner_active}nav-link" href="partner.html">Partner</a></li>
       </ul>
     </div><!--/.nav-collapse -->
 </nav>
@@ -152,7 +148,6 @@ This report is divided into the following sections:</p>
 <ul class="style-none text-left">
   <li><a href="main${suffix}.html">Main</a> (supported by Canonical Ltd)</li>
   <li><a href="universe${suffix}.html">Universe</a> (supported by the Ubuntu community)</li>
-  <li><a href="partner${suffix}.html">Partner</a> (supported by upstream vendor)</li>
 </ul>
 
 <p class="text-left">See <a href="priority.html">Priority Color Key</a> for information about the significance of the colors on this page.</p>
@@ -210,8 +205,8 @@ EOM
 }
 
 OUTPUT=$($ubuntu_table_exe --html --supported --no-retired $table_args)
-#for show in main universe partner index
-for show in main universe partner
+#for show in main universe index
+for show in main universe
 do
     outfile="${tmpdir}/${show}${suffix}.html"
     header "$outfile" "$show"
@@ -224,11 +219,8 @@ do
         echo "<p class='note text-right'>* supported by Canonical Ltd</p>" >> "$outfile"
     elif [ "$show" = "universe" ]; then
         echo "<h3 class=\"text-center\">Universe</h3>" >> "$outfile"
-        echo "$OUTPUT" | egrep '(<table id="cves".*>|</table>|<thead.*>|</thead>|<tbody>|<tbody>|<th>|UNIVERSE)' | egrep -v 'PARTNER' | egrep -v "$embargoed" | sed -r 's#<td>[[:space:]]+(<p>[[:space:]]*[a-zA-Z0-9\-]*[[:space:]]*</p>[[:space:]]+)+</td>[[:space:]]+</tr>$#</tr>#' | sed -r 's#<th>Notes</th></tr>$#</tr>#' >> "$outfile"
+        echo "$OUTPUT" | egrep '(<table id="cves".*>|</table>|<thead.*>|</thead>|<tbody>|<tbody>|<th>|UNIVERSE)' | egrep -v "$embargoed" | sed -r 's#<td>[[:space:]]+(<p>[[:space:]]*[a-zA-Z0-9\-]*[[:space:]]*</p>[[:space:]]+)+</td>[[:space:]]+</tr>$#</tr>#' | sed -r 's#<th>Notes</th></tr>$#</tr>#' >> "$outfile"
         echo "<p class='note text-right'>* supported by Canonical Ltd</p>" >> "$outfile"
-    elif [ "$show" = "partner" ]; then
-        echo "<h3 class=\"text-center\">Partner</h3>" >> "$outfile"
-        echo "$OUTPUT" | egrep '(<table id="cves".*>|</table>|<thead.*>|</thead>|<tbody>|<tbody>|<th>|PARTNER)' | egrep -v "$embargoed"| sed -r 's#<td>[[:space:]]+(<p>[[:space:]]*[a-zA-Z0-9\-]*[[:space:]]*</p>[[:space:]]+)+</td>[[:space:]]+</tr>$#</tr>#' | sed -r 's#<th>Notes</th></tr>$#</tr>#' >> "$outfile"
     fi
 
     footer "$outfile"
diff --git a/scripts/html/top/index.html b/scripts/html/top/index.html
index 34047fd..e68dea1 100644
--- a/scripts/html/top/index.html
+++ b/scripts/html/top/index.html
@@ -53,7 +53,6 @@
         <li class="nav-item"><a class="active nav-link" href=".">Home</a></li>
         <li class="nav-item"><a class="nav-link" href="main.html">Main</a></li>
         <li class="nav-item"><a class="nav-link" href="universe.html">Universe</a></li>
-        <li class="nav-item"><a class="nav-link" href="partner.html">Partner</a></li>
       </ul>
     </div><!--/.nav-collapse -->
 </nav>
@@ -66,7 +65,6 @@
 
 <div>
     <p />Open <a href="main.html">CVEs in Main</a> archive (and <a href="main-released.html">without devel release</a>)
-    <p />Open <a href="partner.html">CVEs in Partner</a> archive (and <a href="partner-released.html">without devel release</a>)
     <p />Open <a href="universe.html">CVEs in Universe</a> archive (and <a href="universe-released.html">without devel release</a>)
     <p />&nbsp;
     <p />Search for a specific CVE in Ubuntu (CVE-YYYY-NNNN): <form method="GET"><input name="cve" type="text" /></form>
diff --git a/scripts/html/top/priority.html b/scripts/html/top/priority.html
index d339e9f..4fa80b7 100644
--- a/scripts/html/top/priority.html
+++ b/scripts/html/top/priority.html
@@ -33,7 +33,6 @@
         <li class="nav-item"><a class="nav-link" href=".">Home</a></li>
         <li class="nav-item"><a class="nav-link" href="main.html">Main</a></li>
         <li class="nav-item"><a class="nav-link" href="universe.html">Universe</a></li>
-        <li class="nav-item"><a class="nav-link" href="partner.html">Partner</a></li>
       </ul>
     </div><!--/.nav-collapse -->
 </nav>
diff --git a/scripts/html_export.py b/scripts/html_export.py
index c009a3a..1dc8e29 100755
--- a/scripts/html_export.py
+++ b/scripts/html_export.py
@@ -67,7 +67,6 @@ def html_header(title, description, outfd):
         <li class="nav-item"><a class="nav-link" href="..">Home</a></li>
         <li class="nav-item"><a class="nav-link" href="../main.html">Main</a></li>
         <li class="nav-item"><a class="nav-link" href="../universe.html">Universe</a></li>
-        <li class="nav-item"><a class="nav-link" href="../partner.html">Partner</a></li>
       </ul>
     </div><!--/.nav-collapse -->
 </nav>
diff --git a/scripts/monthly-report b/scripts/monthly-report
index 37757d6..939d483 100755
--- a/scripts/monthly-report
+++ b/scripts/monthly-report
@@ -19,9 +19,6 @@
 #  For all the supported packages in Ubuntu, there are 67 medium-priority
 #  issues and 206 low issues that need to be fixed in 142 packages.
 #
-#  For all partner packages in Ubuntu, there is 1 medium-priority issue
-#  that needs to be fixed in 1 package.
-#
 #  For all community-supported packages in Ubuntu, there are 7 high-priority
 #  issues, 721 medium-priority, and 1005 low-priority issues that need to be
 #  fixed in 686 packages.
diff --git a/scripts/packages-mirror b/scripts/packages-mirror
index 71413a6..f053ff0 100755
--- a/scripts/packages-mirror
+++ b/scripts/packages-mirror
@@ -26,7 +26,6 @@ Usage: packages_mirror [OPTIONS]
   -V               even more verbose output
   -r RELEASE       only update Ubuntu release
   -A               pull only release pocket for the devel release
-  -p               pull only partner
   -u               pull only ubuntu archive
 EOM
 }
@@ -42,7 +41,6 @@ verbosity_args="-q"
 only_release=
 devel_quick_pockets=
 very_verbose=""
-only_partner="no"
 only_ubuntu="no"
 
 while getopts "AwhftvVpur:" opt
@@ -56,7 +54,6 @@ do
            very_verbose="yes";;
         A) devel_quick_pockets="yes";;
         r) only_release="$OPTARG";;
-        p) only_partner="yes";;
         u) only_ubuntu="yes";;
         h) help ; exit 0;;
         ?) help;;
@@ -73,7 +70,7 @@ debian=${debian:-ftp.debian.org}
 # shellcheck disable=SC1091
 . "$HOME"/.ubuntu-cve-tracker.conf
 
-for var in packages_mirror debian_mirror partner_mirror; do
+for var in packages_mirror debian_mirror; do
   if [ -z "${!var}" ]; then
     echo "'$var' not defined in ~/.ubuntu-cve-tracker.conf" >&2
     exit 1
@@ -87,23 +84,6 @@ mkdir -p "$outPath"
 debianPath=$debian_mirror
 mkdir -p "$debianPath"
 
-# shellcheck disable=SC2154
-partnerPath=$partner_mirror
-mkdir -p "$partnerPath"
-
-partner_dir_excludes=$(PYTHONPATH="${PYTHONPATH:+$PYTHONPATH:}$(dirname "$0")" python3 -c '#
-import cve_lib, sys
-s = ""
-for r in cve_lib.eol_releases + ["breezy", "warty", "hoary"]:
-  if r in ["dapper", "breezy", "warty", "hoary"]: # http://archive.canonical.com/dists/ does not have these any more
-    continue
-  # Dont exclude ESM releases
-  if r in ["trusty", "xenial"]:
-      continue
-  s += "dists/%s*/," % r
-sys.stdout.write(s.rstrip(","))
-')
-
 function compressed_ext()
 {
     rel="$1"
@@ -286,56 +266,54 @@ function do_use_timestamp() {
     return 1
 }
 
-if [ "$only_partner" = "no" ]; then
-    timestamp="${outPath}.timestamp"
-    if [ ! -e "${outPath}/dists" ] || do_use_timestamp "$timestamp" ; then
-        pull=$(mktemp -t packages-XXXXXX)
-        # shellcheck disable=SC2064
-        trap "rm -f $pull" EXIT HUP INT QUIT TERM
+timestamp="${outPath}.timestamp"
+if [ ! -e "${outPath}/dists" ] || do_use_timestamp "$timestamp" ; then
+    pull=$(mktemp -t packages-XXXXXX)
+    # shellcheck disable=SC2064
+    trap "rm -f $pull" EXIT HUP INT QUIT TERM
 
-        # Sync Packages for non-ports supported arches
-        if [ "$verbosity_args" != "-q" ]; then
-            echo "Generating arch lists"
-        fi
-        # shellcheck disable=SC2129
-        gen_packages trusty   "amd64 i386"               >> "$pull"
-        gen_packages xenial   "amd64 i386"               >> "$pull"
-        gen_packages bionic   "amd64 i386"               >> "$pull"
-        gen_packages focal    "amd64 i386"               >> "$pull"
-        gen_packages jammy    "amd64 i386"               >> "$pull"
-        gen_packages kinetic  "amd64 i386"               >> "$pull"
-        gen_packages lunar    "amd64 i386"               >> "$pull"
-        gen_packages mantic   "amd64 i386"               >> "$pull"
-
-        # don't bother to pull duplicates
-        sort -u "$pull" > "$pull.sorted" && mv "$pull.sorted" "$pull"; rm -f "$pull.sorted"
-        pull_packages "$pull" "$server/ubuntu" || echo "FAIL: supported architectures" >&2
-        cat /dev/null > "$pull"
-
-        # Sync Packages for ports arches
-        if [ "$verbosity_args" != "-q" ]; then
-            echo "Generating ports arch lists"
-        fi
-        # shellcheck disable=SC2129
-        gen_packages trusty   "powerpc ppc64el armhf arm64"       >> "$pull"
-        gen_packages xenial   "powerpc ppc64el armhf arm64 s390x" >> "$pull"
-        gen_packages bionic   "ppc64el armhf arm64 s390x"         >> "$pull"
-        gen_packages focal    "ppc64el armhf arm64 s390x riscv64" >> "$pull"
-        gen_packages jammy    "ppc64el armhf arm64 s390x riscv64" >> "$pull"
-        gen_packages kinetic  "ppc64el armhf arm64 s390x riscv64" >> "$pull"
-        gen_packages lunar    "ppc64el armhf arm64 s390x riscv64" >> "$pull"
-        gen_packages mantic   "ppc64el armhf arm64 s390x riscv64" >> "$pull"
-
-        # don't bother to pull duplicates
-        sort -u "$pull" > "$pull.sorted" && mv "$pull.sorted" "$pull"; rm -f "$pull.sorted"
-        pull_packages "$pull" "$ports/ubuntu-ports" || echo "FAIL: ports architectures" >&2
-        cat /dev/null > "$pull"
-
-        if [ "$use_timestamp" = "yes" ]; then
-            touch "$timestamp"
-        else
-            rm -f "$timestamp"
-        fi
+    # Sync Packages for non-ports supported arches
+    if [ "$verbosity_args" != "-q" ]; then
+        echo "Generating arch lists"
+    fi
+    # shellcheck disable=SC2129
+    gen_packages trusty   "amd64 i386"               >> "$pull"
+    gen_packages xenial   "amd64 i386"               >> "$pull"
+    gen_packages bionic   "amd64 i386"               >> "$pull"
+    gen_packages focal    "amd64 i386"               >> "$pull"
+    gen_packages jammy    "amd64 i386"               >> "$pull"
+    gen_packages kinetic  "amd64 i386"               >> "$pull"
+    gen_packages lunar    "amd64 i386"               >> "$pull"
+    gen_packages mantic   "amd64 i386"               >> "$pull"
+
+    # don't bother to pull duplicates
+    sort -u "$pull" > "$pull.sorted" && mv "$pull.sorted" "$pull"; rm -f "$pull.sorted"
+    pull_packages "$pull" "$server/ubuntu" || echo "FAIL: supported architectures" >&2
+    cat /dev/null > "$pull"
+
+    # Sync Packages for ports arches
+    if [ "$verbosity_args" != "-q" ]; then
+        echo "Generating ports arch lists"
+    fi
+    # shellcheck disable=SC2129
+    gen_packages trusty   "powerpc ppc64el armhf arm64"       >> "$pull"
+    gen_packages xenial   "powerpc ppc64el armhf arm64 s390x" >> "$pull"
+    gen_packages bionic   "ppc64el armhf arm64 s390x"         >> "$pull"
+    gen_packages focal    "ppc64el armhf arm64 s390x riscv64" >> "$pull"
+    gen_packages jammy    "ppc64el armhf arm64 s390x riscv64" >> "$pull"
+    gen_packages kinetic  "ppc64el armhf arm64 s390x riscv64" >> "$pull"
+    gen_packages lunar    "ppc64el armhf arm64 s390x riscv64" >> "$pull"
+    gen_packages mantic   "ppc64el armhf arm64 s390x riscv64" >> "$pull"
+
+    # don't bother to pull duplicates
+    sort -u "$pull" > "$pull.sorted" && mv "$pull.sorted" "$pull"; rm -f "$pull.sorted"
+    pull_packages "$pull" "$ports/ubuntu-ports" || echo "FAIL: ports architectures" >&2
+    cat /dev/null > "$pull"
+
+    if [ "$use_timestamp" = "yes" ]; then
+        touch "$timestamp"
+    else
+        rm -f "$timestamp"
     fi
 fi
 
@@ -348,7 +326,7 @@ if [ "$only_ubuntu" = "no" ]; then
     fi
 
     # TODO: add Debian support for -r
-    if [ -z "$only_release" ] && [ "$only_partner" = "no" ]; then
+    if [ -z "$only_release" ]; then
         # Sync Sources from Debian testing
         timestamp="${debianPath}.timestamp"
         if [ ! -e "${debianPath}/dists" ] || do_use_timestamp "$timestamp" 6 ; then
@@ -368,37 +346,9 @@ if [ "$only_ubuntu" = "no" ]; then
             fi
         fi
     fi
-
-    if [ -z "$only_release" ] || [ "$only_partner" = "yes" ]; then
-        # Sync Canonical Partner Repo
-        timestamp="${partnerPath}.timestamp"
-        if [ ! -e "${partnerPath}/dists" ] || do_use_timestamp "$timestamp" 6 ; then
-            cd "$partnerPath"
-            misc_partner_excludes="robots.txt,misc/,project/,icons/,ls-lR.gz"
-            wget $verbosity_args -N -R '*=*' -R 'Contents*' -X "${misc_partner_excludes},${partner_dir_excludes}" -np -r http://archive.canonical.com/dists/
-
-            ln -sf archive.canonical.com/dists dists
-            # remove dangling symlink
-            rm -f archive.canonical.com/dists/dists || true
-
-            # remove dists.[0-9] files
-            rm -f archive.canonical.com/dists.[0-9]*
-
-            if [ "$use_timestamp" = "yes" ]; then
-                touch "$timestamp"
-            else
-                rm -f "$timestamp"
-            fi
-            has_sources=$(find archive.canonical.com/dists -name Sources$)
-            if [ -n "$has_sources" ]; then
-                echo ""
-                echo "WARNING: $partnerPath has Sources files! These should be removed now that -partner uses Sources.gz"
-            fi
-        fi
-    fi
 fi
 
 # generate source package lists for umt grep
-for path in "$outPath" "$debianPath" "$partnerPath"; do
+for path in "$outPath" "$debianPath"; do
   find "$path" -name Sources.gz -exec zgrep '^Package: .*' {} \; | cut -c10- | sort -u > "$path/sources"
 done
diff --git a/scripts/report-todo-numbers b/scripts/report-todo-numbers
index 32b7d1f..502b5b1 100755
--- a/scripts/report-todo-numbers
+++ b/scripts/report-todo-numbers
@@ -45,7 +45,7 @@ only_packages = []
 if opt.only_packages:
     only_packages = re.split(',', opt.only_packages)
 
-for category in ['supported','partner','universe']:
+for category in ['supported','universe']:
     item[category] = dict()
     srcpkg_item[category] = dict()
 
@@ -63,9 +63,6 @@ for category in ['supported','partner','universe']:
             if 'SUPPORTED' in line:
                 if category != 'supported':
                     continue
-            elif 'PARTNER' in line:
-                if category != 'partner':
-                    continue
             elif category != 'universe':
                 continue
 
@@ -131,8 +128,6 @@ for category in ['supported','partner','universe']:
     else:
         if category == 'supported':
             print " * For all the supported packages in Ubuntu, there",
-        elif category == 'partner':
-            print " * For all partner packages in Ubuntu, there",
         elif category == 'universe':
             print " * For all community-supported packages in Ubuntu, there",
         if opt.show_unique_sources:
diff --git a/scripts/report-todo-plot b/scripts/report-todo-plot
index e5faa4a..d59014f 100755
--- a/scripts/report-todo-plot
+++ b/scripts/report-todo-plot
@@ -13,7 +13,7 @@ TABLE=$(./scripts/ubuntu-table -s "$@")
 for category in ${CATEGORY:-SUPPORTED}
 do
   if [ "x$category" = "xuniverse" ]; then
-    filter="-v '(SUPPORTED|PARTNER)'"
+    filter="-v 'SUPPORTED'"
   else
     filter=$category
   fi
diff --git a/scripts/source_map.py b/scripts/source_map.py
index 4ff605e..05e258b 100755
--- a/scripts/source_map.py
+++ b/scripts/source_map.py
@@ -48,10 +48,9 @@ def read_config_file(config_file):
 
 def _find_sources(pockets=None, releases=None, skip_eol_releases=True, arch='amd64'):
     config = read_config_file(os.path.expanduser("~/.ubuntu-cve-tracker.conf"))
-    if 'packages_mirror' in config and 'partner_mirror' in config:
+    if 'packages_mirror' in config:
         cve_lib.check_mirror_timestamp(config)
         return _find_from_mirror(config['packages_mirror'],
-                                 config['partner_mirror'],
                                  'sources',
                                  pockets=pockets,
                                  releases=releases,
@@ -63,10 +62,9 @@ def _find_sources(pockets=None, releases=None, skip_eol_releases=True, arch='amd
 
 def _find_packages(pockets=None, releases=None, skip_eol_releases=True, arch='amd64'):
     config = read_config_file(os.path.expanduser("~/.ubuntu-cve-tracker.conf"))
-    if 'packages_mirror' in config and 'partner_mirror' in config:
+    if 'packages_mirror' in config:
         cve_lib.check_mirror_timestamp(config)
         return _find_from_mirror(config['packages_mirror'],
-                                 config['partner_mirror'],
                                  'packages',
                                  pockets=pockets,
                                  releases=releases,
@@ -102,7 +100,7 @@ def load_debian(basedir, data_type='sources'):
     return debian_sources
 
 
-def _find_from_mirror(ubuntu, canonical, data_type, arch='amd64', pockets=None, releases=None, skip_eol_releases=True):
+def _find_from_mirror(ubuntu, data_type, arch='amd64', pockets=None, releases=None, skip_eol_releases=True):
     if data_type not in ['sources', 'packages']:
         raise ValueError("'data_type' should be either 'sources' or 'packages'")
 
@@ -138,9 +136,6 @@ def _find_from_mirror(ubuntu, canonical, data_type, arch='amd64', pockets=None, 
         # free
         for pocket in pockets:
             for section in sections:
-                if section == 'partner':
-                    # handled separately below
-                    continue
                 if data_type == 'sources':
                     fn = os.path.join(ubuntu, 'dists', series + pocket, section,
                                       'source', 'Sources')
@@ -162,40 +157,6 @@ def _find_from_mirror(ubuntu, canonical, data_type, arch='amd64', pockets=None, 
                     name = ''
 
                 collection += [(fn, rel, name, section)]
-        # partner
-        pocket = ''
-        section = 'partner'
-
-        if data_type == 'sources':
-            fn = os.path.join(canonical, 'dists', series + pocket, section,
-                              'source', 'Sources')
-        else:
-            fn = os.path.join(canonical, 'dists', series + pocket, section,
-                              'binary-%s' % arch, 'Packages')
-
-        found, fn_path = _find_path_with_ext(fn)
-        if not found:
-            # Only warn about missing partner for devel release
-            # FIXME: 2020-04-29: disabled partner warning for dev for now
-            # FIXME: 2021-04-24: disabling for both devel and hirsute;
-            # looks like mirroring on people.c.c stopped?
-            if rel == cve_lib.devel_release or rel in ['hirsute', 'impish', 'jammy', 'kinetic', 'lunar']:
-                prefreeze = os.path.join(canonical, 'dists', '%s-series' % rel[0])
-                prefreeze
-                #if not os.path.isdir(prefreeze):
-                #    print(sys.stderr, "WARNING: missing partner mirror element: %s" % (fn), file=sys.stderr)
-                # else:
-                #    print("WARNING: found prefreeze element: %s" % (prefreeze), file=sys.stderr)
-            else:
-                missing += " %s\n" % (fn)
-                errors = True
-            continue
-        else:
-            fn = fn_path
-
-        if section not in sections:
-            continue
-        collection += [(fn, rel, pocket, section)]
 
     if errors:
         raise NameError("Missing mirror elements:\n" + missing)
@@ -244,12 +205,6 @@ def _find_sources_from_apt(pockets=None, releases=None):
                    not (rel == cve_lib.devel_release and pocket in ['-updates', '-security']):
                     missing += " deb-src http://archive.ubuntu.com/ubuntu %s%s %s\n" % (rel, pocket, ' '.join(cve_lib.components))
                     errors = True
-        for component in ['partner']:
-            # partner doesn't get the devel release treatment until late in
-            # the cycle
-            if '%s_%s' % (rel, component) not in saw and not (rel == cve_lib.devel_release) and not cve_lib.release_has_partner(rel):
-                missing += " deb-src http://archive.canonical.com/ubuntu %s %s\n" % (rel, component)
-                errors = True
     if errors:
         raise NameError("Missing /etc/apt/sources.list lines:\n%s" % (missing))
 
diff --git a/scripts/ubuntu-table b/scripts/ubuntu-table
index eeb633c..b1651c0 100755
--- a/scripts/ubuntu-table
+++ b/scripts/ubuntu-table
@@ -232,7 +232,6 @@ for cve in sorted(cves):
         action_needed = False   # A package in any release needs updating
         released = False        # A package in any release has been fixed
         supported = False       # A package in any release is supported and needs to be fixed
-        partner = False         # A package in any release is partner-supplied
         universe = False        # A package in any release is in universe and needs to be fixed
 
         mark = dict()
@@ -272,10 +271,6 @@ for cve in sorted(cves):
                 if pkg_rel_supported:
                     supported = True
 
-            # A partner issue?
-            if cve_lib.is_partner(map, pkg, rel):
-                partner = True
-
             if opt.debug:
                 print("%s: %s: %s (%s, released:%d)" % (cve, pkg, table[cve][pkg][rel], rel, released), file=sys.stderr)
 
@@ -317,9 +312,7 @@ for cve in sorted(cves):
                 print('<td style="font-size: small;"><a href="https://cve.mitre.org/cgi-bin/cvename.cgi?name=%s">Mitre</a> <a href="https://launchpad.net/bugs/cve/%s">LP</a> <a href="http://security-tracker.debian.org/tracker/%s">Debian</a></td>' % (quote(cve), quote(cve), quote(cve)), end=' ')
                 print('<td>', end=' ')
                 if opt.supported:
-                    if partner:
-                        print('<p>PARTNER</p>', end=' ')
-                    elif supported:
+                    if supported:
                         print('<p>SUPPORTED</p>', end=' ')
                     if universe:
                         print('<p>UNIVERSE</p>', end=' ')
@@ -348,9 +341,7 @@ for cve in sorted(cves):
                 if action_needed and released:
                     print('[out of sync]', end=' ')
                 if opt.supported:
-                    if partner:
-                        print('PARTNER', end=' ')
-                    elif supported:
+                    if supported:
                         print('SUPPORTED', end=' ')
                     if universe:
                         print('UNIVERSE', end=' ')