From bed2dc470d8ddd6f45cc916660038f855152723f Mon Sep 17 00:00:00 2001
From: Simon Quigley <tsimonq2@debian.org>
Date: Wed, 26 Jul 2023 13:04:12 -0500
Subject: [PATCH] Add support for the non-free-firmware components in all tools
 already referencing non-free.

---
 debian/changelog       | 7 +++++++
 mk-sbuild              | 2 +-
 pbuilder-dist          | 2 +-
 syncpackage            | 6 +++---
 ubuntutools/archive.py | 2 +-
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c7d2ee4..1a5a25c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ubuntu-dev-tools (0.195) unstable; urgency=medium
+
+  * Add support for the non-free-firmware components in all tools already
+    referencing non-free.
+
+ -- Simon Quigley <tsimonq2@debian.org>  Wed, 26 Jul 2023 13:03:31 -0500
+
 ubuntu-dev-tools (0.194) unstable; urgency=medium
 
   [ Gianfranco Costamagna ]
diff --git a/mk-sbuild b/mk-sbuild
index ae4b2f3..076021c 100755
--- a/mk-sbuild
+++ b/mk-sbuild
@@ -667,7 +667,7 @@ debian)
         DEBOOTSTRAP_MIRROR="http://deb.debian.org/debian"
     fi
     if [ -z "$COMPONENTS" ]; then
-        COMPONENTS="main non-free contrib"
+        COMPONENTS="main non-free non-free-firmware contrib"
     fi
     if [ -z "$SOURCES_PROPOSED_SUITE" ]; then
         SOURCES_PROPOSED_SUITE="RELEASE-proposed-updates"
diff --git a/pbuilder-dist b/pbuilder-dist
index fdca023..27e94ce 100755
--- a/pbuilder-dist
+++ b/pbuilder-dist
@@ -270,7 +270,7 @@ class PbuilderDist:
             mirror = os.environ.get("MIRRORSITE", config.get_value("DEBIAN_MIRROR"))
             components = "main"
             if self.extra_components:
-                components += " contrib non-free"
+                components += " contrib non-free non-free-firmware"
         else:
             mirror = os.environ.get("MIRRORSITE", config.get_value("UBUNTU_MIRROR"))
             if self.build_architecture not in ("amd64", "i386"):
diff --git a/syncpackage b/syncpackage
index ca636f6..f312732 100755
--- a/syncpackage
+++ b/syncpackage
@@ -324,7 +324,7 @@ def fetch_source_pkg(package, dist, version, component, ubuntu_release, mirror):
         if component is None:
             component = debian_srcpkg.getComponent()
 
-    assert component in ("main", "contrib", "non-free")
+    assert component in ("main", "contrib", "non-free", "non-free-firmware")
 
     return DebianSourcePackage(package, version.full_version, component, mirrors=mirrors)
 
@@ -613,10 +613,10 @@ def parse():
     except TypeError:
         parser.error("Invalid bug number(s) specified.")
 
-    if args.component not in (None, "main", "contrib", "non-free"):
+    if args.component not in (None, "main", "contrib", "non-free", "non-free-firmware"):
         parser.error(
             f"{args.component} is not a valid Debian component. "
-            f"It should be one of main, contrib, or non-free."
+            f"It should be one of main, contrib, non-free, or non-free-firmware."
         )
 
     if args.lp and args.uploader_name:
diff --git a/ubuntutools/archive.py b/ubuntutools/archive.py
index 310fdd5..538cf43 100644
--- a/ubuntutools/archive.py
+++ b/ubuntutools/archive.py
@@ -976,7 +976,7 @@ class Madison(_WebJSON):
 # Snapshot API
 # https://anonscm.debian.org/cgit/mirror/snapshot.debian.org.git/plain/API
 class _Snapshot(_WebJSON):
-    DEBIAN_COMPONENTS = ["main", "contrib", "non-free"]
+    DEBIAN_COMPONENTS = ["main", "contrib", "non-free", "non-free-firmware"]
 
     def getHostUrl(self):
         return "http://snapshot.debian.org"