Bug#1021186: bullseye-pu: package debmirror/1:2.35+deb11u1

[Colin Watson <cjwatson@debian.org>]

Package: release.debian.org
Severity: normal
Tags: bullseye
User: release.debian.org@packages.debian.org
Usertags: pu

[ Reason ]
Support mirroring of the new non-free-firmware section.  See
https://lists.debian.org/debian-boot/2022/10/msg00026.html.

[ Impact ]
The non-free-firmware section will be absent from debmirror-managed
mirrors, unless the list of sections is specified explicitly.

[ Tests ]
Nothing useful by way of automated tests, but I've tested manually that
it works for both suites that have the new section and suites that
don't.

[ Risks ]
The patch is pretty small and trivial.

[ Checklist ]
  [X] *all* changes are documented in the d/changelog
  [X] I reviewed all changes and I approve them
  [X] attach debdiff against the package in (old)stable
  [X] the issue is verified as fixed in unstable

[ Changes ]
diff --git a/debian/changelog b/debian/changelog
index 4e7877c..89053f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debmirror (1:2.35+deb11u1) UNRELEASED; urgency=medium
+
+  * Add non-free-firmware to the default sections.
+
+ -- Colin Watson <cjwatson@debian.org>  Mon, 03 Oct 2022 14:00:22 +0100
+
 debmirror (1:2.35) unstable; urgency=medium
 
   [ Kees Cook ]
diff --git a/debmirror b/debmirror
index 4512ad3..bd28250 100755
--- a/debmirror
+++ b/debmirror
@@ -147,7 +147,7 @@ suite in their F<Release> files.
 =item B<-s>, B<--section>=I<foo[,bar,..]>
 
 Specify the section of Debian to mirror. Defaults to
-C<main,contrib,non-free,main/debian-installer>.
+C<main,contrib,non-free,non-free-firmware,main/debian-installer>.
 
 =item B<-a>, B<--arch>=I<foo[,bar,..]>
 
@@ -816,7 +816,7 @@ $remoteroot =~ s%^[:/]%% unless downloads_via_file();
 @dists=split(/,/,join(',',@dists));
 @dists=qw(sid) unless @dists;
 @sections=split(/,/,join(',',@sections));
-@sections=qw(main contrib non-free main/debian-installer) unless @sections;
+@sections=qw(main contrib non-free non-free-firmware main/debian-installer) unless @sections;
 @arches=split(/,/,join(',',@arches));
 @arches=qw(i386) unless @arches;
 @arches=() if (join(',',@arches) eq "none");
diff --git a/examples/debmirror.conf b/examples/debmirror.conf
index d41d338..fc08bb9 100644
--- a/examples/debmirror.conf
+++ b/examples/debmirror.conf
@@ -26,7 +26,7 @@ $passwd="anonymous@";
 $remoteroot="debian";
 $download_method="ftp";
 @dists="sid";
-@sections="main,main/debian-installer,contrib,non-free";
+@sections="main,main/debian-installer,contrib,non-free,non-free-firmware";
 @arches="i386";
 # @ignores="";
 # @excludes="";

Thanks,

-- 
Colin Watson (he/him)                              [cjwatson@debian.org]