Please merge debmirror 2.33 (universe) from Debian testing (main)

Adjusted the changelog for Groovy.

Refreshed the existing patches properly to be based on updated upstream source, without complaints about hunks having been shifted around.

I've sponsored this for hirsute, thanks for working on this and sorry for the delay!

No worries about the delay - happy it's being picked up!

If there is anything I can do/improve on my part, do let me know.

This bug was fixed in the package debmirror - 1:2.33ubuntu1

---------------
debmirror (1:2.33ubuntu1) hirsute; urgency=medium

  * Resynchronise with Debian. (LP: #1892110) Remaining changes:
    - debian/{control,rules}: Add quilt for patch management.
    - Debian bug 455082:
      + default-settings.patch: change rsync defaults.
      + silence-errors.patch: throw away find errors.
      + drop-redundant-rsync.patch: clean up logic in rsync batching.
      + check_file-return.patch: report why a file needs to sync.
    - Debian bug 576576:
      + skip-installer.patch: allow specific releases to be skipped.
    - ubuntu-settings.patch: Changed defaults to download Ubuntu, replaced
      most instances of Debian with Ubuntu in the documentation.

debmirror (1:2.33) unstable; urgency=medium

  * Use debhelper-compat instead of debian/compat.
  * Strip trailing spaces and tabs from the content of clearsigned files
    before verifying the signature, in accordance with RFC 4880 section 7.1
    (closes: #943970).

debmirror (1:2.32) unstable; urgency=medium

  [ Jamie Strandboge ]
  * Support downloading command-not-found metadata (LP: #1821251).

debmirror (1:2.31) unstable; urgency=medium

  [ Ondřej Nový ]
  * d/copyright: Use https protocol in Format field
  * d/changelog: Remove trailing whitespaces

  [ Colin Watson ]
  * Fetch Packages-all and Contents-all if they exist (closes: #904927).
  * Fix mirroring of suites that have InRelease but not Release.gpg.
  * Improve GPG verification: accept a signature file as long as there's at
    least one good signature from a trusted key, and borrow code from APT to
    explicitly verify the structure of InRelease files (closes: #918304).

debmirror (1:2.30) unstable; urgency=medium

  * Make the error message when mkdir fails more helpful.
  * Restart partial HTTP downloads (closes: #629922).
  * Use /usr/share/dpkg/pkg-info.mk rather than equivalent hand-written
    code.
  * Upgrade to debhelper v9.

debmirror (1:2.29) unstable; urgency=medium

  [ Stefan Kisdaroczi ]
  * Add version string and --version option.
  * Add additional trace info (closes: #863194).

  [ Colin Watson ]
  * Automatically update $version at binary package build time.

debmirror (1:2.28) unstable; urgency=medium

  * Change priority to optional, since "Priority: extra" is now deprecated.
  * Move VCS to salsa.debian.org.
  * Fix use of uninitialised value $buf in name_release.
  * Depend on xz-utils (LP: #1614779); xz is needed for all suites that
    publish .xz but not uncompressed index files, or .gz but not .xz without
    --slow-cpu, so I think that's common enough to rise above the level of a
    Recommends.
  * Always use "exists $file_lists{foo}{size}" rather than just "exists
    $file_lists{foo}". The latter can return false positives due to
    autovivification (closes: #868675).

 -- Valters Jansons <email address hidden> Sat, 22 Aug 2020 15:18:46 +0300

@Valters - The debdiffs that you provided were great and made reviewing your work easy. If you want to continue contributing to Ubuntu you might consider preparing an SRU of debmirror for Ubuntu 20.10 and 20.04. You can learn more about the SRU process at https://wiki.ubuntu.com/StableReleaseUpdates.

As an SRU team member I think SRU'ing the same updated version of debmirror to those older releases should be fine that being said I haven't looked at the changes closely.

I see a SRU being worth it for upstream v2.32 changes. Without those commits, the package produces a mirror that is unusable for Ubuntu 20.04 `apt` clients (and newer). For that reason, I am wondering if I should just pick those commits out, and propose a 20.04+20.10 SRU exclusively for that (as 2.27ubuntu2) instead of pulling all the 2.33 changes in.

Any thoughts?

I think an SRU which includes only minimal changes, so a cherry pick, would be ideal.