diff -Nru debmirror-2.35/debian/.gitignore debmirror-2.35ubuntu1/debian/.gitignore --- debmirror-2.35/debian/.gitignore 2021-06-03 13:23:33.000000000 +0300 +++ debmirror-2.35ubuntu1/debian/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -/files diff -Nru debmirror-2.35/debian/changelog debmirror-2.35ubuntu1/debian/changelog --- debmirror-2.35/debian/changelog 2021-06-03 13:23:33.000000000 +0300 +++ debmirror-2.35ubuntu1/debian/changelog 2021-06-03 18:13:50.000000000 +0300 @@ -1,3 +1,20 @@ +debmirror (1:2.35ubuntu1) impish; urgency=medium + + * Merge from Debian stable (LP: #1940419). 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. + + -- Valters Jansons Thu, 03 Jun 2021 15:13:50 +0000 + debmirror (1:2.35) unstable; urgency=medium [ Kees Cook ] @@ -6,6 +23,23 @@ -- Colin Watson Thu, 03 Jun 2021 11:23:33 +0100 +debmirror (1:2.34ubuntu1) impish; urgency=medium + + * Merge from Debian testing (LP: #1926120). 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. + + -- Valters Jansons Mon, 26 Apr 2021 15:00:09 +0300 + debmirror (1:2.34) unstable; urgency=medium [ Debian Janitor ] @@ -19,6 +53,22 @@ -- Colin Watson Sat, 06 Feb 2021 17:33:50 +0000 +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. + + -- Valters Jansons Sat, 22 Aug 2020 15:18:46 +0300 + debmirror (1:2.33) unstable; urgency=medium * Use debhelper-compat instead of debian/compat. @@ -86,6 +136,22 @@ -- Colin Watson Tue, 23 Jan 2018 13:32:49 +0000 +debmirror (1:2.27ubuntu1) artful; urgency=medium + + * Resynchronise with Debian. 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. + + -- William Grant Sat, 22 Jul 2017 11:09:37 +1000 + debmirror (1:2.27) unstable; urgency=medium * Fix typo in "Verifying checksums" message (closes: #856163). @@ -106,6 +172,29 @@ -- Colin Watson Fri, 20 Jan 2017 12:54:17 +0000 +debmirror (1:2.25ubuntu2) xenial; urgency=medium + + * Download Translation-*.gz/xz in addition to Translation-*.bz2. Launchpad + replaces bz2 with xz from xenial. (LP: #1565585) + + -- William Grant Tue, 05 Apr 2016 15:17:59 +1000 + +debmirror (1:2.25ubuntu1) xenial; urgency=medium + + * Resynchronise with Debian. 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. + + -- Colin Watson Tue, 29 Mar 2016 14:19:09 +0100 + debmirror (1:2.25) unstable; urgency=medium * Add enough build-dependencies to be able to run the syntax check @@ -113,6 +202,22 @@ -- Colin Watson Tue, 29 Mar 2016 14:16:50 +0100 +debmirror (1:2.24ubuntu1) xenial; urgency=medium + + * Resynchronise with Debian. 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. + + -- Colin Watson Tue, 29 Mar 2016 10:49:13 +0100 + debmirror (1:2.24) unstable; urgency=medium * Fix embarrassing syntax error introduced in 1:2.23 (LP: #1562827). @@ -122,6 +227,22 @@ -- Colin Watson Tue, 29 Mar 2016 10:44:31 +0100 +debmirror (1:2.23ubuntu1) xenial; urgency=medium + + * Resynchronise with Debian. 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. + + -- Colin Watson Sun, 27 Mar 2016 12:19:36 +0100 + debmirror (1:2.23) unstable; urgency=medium * Fix incorrect handling of existing uncompressed index files under .temp @@ -129,6 +250,22 @@ -- Colin Watson Sat, 26 Mar 2016 19:01:20 +0000 +debmirror (1:2.22ubuntu1) xenial; urgency=medium + + * Resynchronise with Debian. 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. + + -- Colin Watson Thu, 17 Mar 2016 13:23:50 +0000 + debmirror (1:2.22) unstable; urgency=medium * Fix regression in 1:2.20 that broke mirroring of suites that have @@ -218,6 +355,27 @@ -- Joey Hess Fri, 07 Nov 2014 17:28:02 -0400 +debmirror (1:2.16ubuntu1) trusty; urgency=low + + * debian/patches/skip-installer.patch: Don't skip -updates when mirroring + debian-installer components, as we publish d-i to updates (LP: #1034679) + * Merge from Debian unstable. 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. + - Debian bug 576577: + + rsync-retries.patch: retry if rsync batch fails connection. + - ubuntu-settings.patch: Changed defaults to download Ubuntu, replaced + most instances of Debian with Ubuntu in the documentation. + * Rebase patches, and drop origin-canonical.patch, included upstream. + + -- Matthew Fischer Tue, 19 Nov 2013 19:31:48 -0700 + debmirror (1:2.16) unstable; urgency=low * Fix confusing output with --precleanup. @@ -228,6 +386,32 @@ -- Joey Hess Mon, 26 Aug 2013 12:41:03 -0400 +debmirror (1:2.15ubuntu2) saucy; urgency=low + + * debian/patches/skip-installer.patch: Don't skip -updates when mirroring + debian-installer components, as we publish d-i to updates (LP: #1034679) + + -- Adam Conrad Fri, 05 Jul 2013 01:32:31 -0600 + +debmirror (1:2.15ubuntu1) saucy; urgency=low + + * Merge from Debian unstable. 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. + - Debian bug 576577: + + rsync-retries.patch: retry if rsync batch fails connection. + - ubuntu-settings.patch: Changed defaults to download Ubuntu, replaced + most instances of Debian with Ubuntu in the documentation. + * Rebase patches, and drop origin-canonical.patch, included upstream. + + -- Adam Conrad Tue, 07 May 2013 16:15:24 -0600 + debmirror (1:2.15) unstable; urgency=low * Improved interface to gpgv. Thanks, Tom Jones. @@ -240,6 +424,33 @@ -- Joey Hess Sat, 04 May 2013 23:44:27 -0400 +debmirror (1:2.14ubuntu1.2) raring; urgency=low + + * origin-canonical.patch: Resolve issue of not being able to mirror apt + archives with the Release file set as "Origin: Canonical", by adding + additional special case. Patch courtesy of Tal Danzig. (LP: #1174797) + + -- David Medberry Tue, 30 Apr 2013 15:55:53 +0000 + +debmirror (1:2.14ubuntu1) quantal; urgency=low + + * Merge from Debian unstable. 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. + - Debian bug 576577: + + rsync-retries.patch: retry if rsync batch fails connection. + - ubuntu-settings.patch: Changed defaults to download Ubuntu, replaced + most instances of Debian with Ubuntu in the documentation. + * Refreshed patches. + + -- Stefano Rivera Sat, 30 Jun 2012 23:01:27 +0200 + debmirror (1:2.14) unstable; urgency=low * Add --config-file option. @@ -258,6 +469,26 @@ -- Joey Hess Tue, 19 Jun 2012 14:33:41 -0400 +debmirror (1:2.12ubuntu1) quantal; urgency=low + + * Merge from Debian testing. 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. + - Debian bug 576577: + + rsync-retries.patch: retry if rsync batch fails connection. + - ubuntu-settings.patch: Changed defaults to download Ubuntu, replaced + most instances of Debian with Ubuntu in the documentation. + * Refreshed patches. + * Updated ubuntu-settings.patch to default to precise. + + -- Stefano Rivera Fri, 04 May 2012 23:52:36 +0200 + debmirror (1:2.12) unstable; urgency=low * Always mirror the English "translations" necessary to have any @@ -279,6 +510,27 @@ -- Joey Hess Mon, 05 Mar 2012 17:05:29 -0400 +debmirror (1:2.10ubuntu1) precise; urgency=low + + * Merge from Debian unstable. 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. + - Debian bug 576577: + + rsync-retries.patch: retry if rsync batch fails connection. + - ubuntu-settings.patch: Changed defaults to download Ubuntu, replaced + most instances of Debian with Ubuntu in the documentation. + * Refreshed patches. + * Slimmed down skip-installer.patch, largely superseded thanks to Debian bug + 636627. + + -- Stefano Rivera Sat, 12 Nov 2011 16:23:21 +0200 + debmirror (1:2.10) unstable; urgency=low * Fix skipping d-i for suites that do not include it. Closes: #636627 @@ -288,6 +540,24 @@ -- Joey Hess Mon, 31 Oct 2011 10:44:07 -0400 +debmirror (1:2.9ubuntu1) oneiric; urgency=low + + * Merge from debian unstable. 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. + - Debian bug 576577: + + rsync-retries.patch: retry if rsync batch fails connection. + - ubuntu-settings.patch: Changed defaults to download Ubuntu, replaced + most instances of Debian with Ubuntu in the documentation. + + -- Stefano Rivera Wed, 10 Aug 2011 17:44:50 +0200 + debmirror (1:2.9) unstable; urgency=low * Use Net::INET6Glue to support making ipv6 connections. Closes: #631302 @@ -297,6 +567,28 @@ -- Joey Hess Thu, 28 Jul 2011 14:57:36 +0200 +debmirror (1:2.8ubuntu1) oneiric; urgency=low + + * Merge from Debian unstable. 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. + - Debian bug 576577: + + rsync-retries.patch: retry if rsync batch fails connection. + - ubuntu-settings.patch: Changed defaults to download Ubuntu, replaced + most instances of Debian with Ubuntu in the documentation. + * Dropped patches: + - no-motd changes from default-settings.patch, superseded in Debian. + - functionalize.patch: Accepted in Debian. + - command-exit-checking.patch: Accepted in Debian. + + -- Stefano Rivera Sun, 05 Jun 2011 22:00:27 +0200 + debmirror (1:2.8) unstable; urgency=low * Avoid trying to get d-i for *-updates suites. Closes: #619146 @@ -351,6 +643,30 @@ -- Joey Hess Sat, 05 Feb 2011 12:40:14 -0400 +debmirror (1:2.4.6ubuntu1) natty; urgency=low + + [ Stefano Rivera ] + * Merge from debian unstable. 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. + - functionalize.patch: prepare for batching of non-deb files. + - drop-redundant-rsync.patch: clean up logic in rsync batching. + - check_file-return.patch: report why a file needs to sync. + - command-exit-checking.patch: check exit codes of commands. + - skip-installer.patch: allow specific releases to be skipped (Debian + bug 576576). + - rsync-retries.patch: retry if rsync batch fails connection (Debian + bug 576577). + + [ Francisco Javier P.L. ] + * ubuntu-settings.patch: Changed defaults to download Ubuntu (LP: #64345), + replaced most instances of Debian with Ubuntu in the documentation. + Changed examples to be more Ubuntu relevent, patch thanks to Karl Goetz. + + -- Stefano Rivera Fri, 05 Nov 2010 22:05:40 +0200 + debmirror (1:2.4.6) unstable; urgency=low * New maintainer. Frans, we'll miss you. @@ -370,6 +686,32 @@ -- Frans Pop Thu, 05 Aug 2010 16:09:13 +0200 +debmirror (1:2.4.4ubuntu2) lucid; urgency=low + + * drop-redundant-rsync.patch: fix index double-increment (LP: #560826) + + -- Steve Beattie Sun, 11 Apr 2010 10:02:11 -0700 + +debmirror (1:2.4.4ubuntu1) lucid; urgency=low + + * Merge from debian unstable (LP: #555967). 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. + - functionalize.patch: prepare for batching of non-deb files. + - drop-redundant-rsync.patch: clean up logic in rsync batching. + - check_file-return.patch: report why a file needs to sync. + - command-exit-checking.patch: check exit codes of commands. + - skip-installer.patch: allow specific releases to be skipped (Debian + bug 576576). + - rsync-retries.patch: retry if rsync batch fails connection (Debian + bug 576577). + * Dropped rsync Release file batching for now, as it makes merging + much more difficult. + + -- Kees Cook Mon, 05 Apr 2010 12:38:24 -0700 + debmirror (1:2.4.4) unstable; urgency=low * Fix typo in mirror_size. Closes: #575352. @@ -553,6 +895,35 @@ -- Frans Pop Fri, 07 Aug 2009 19:24:01 +0200 +debmirror (20070123ubuntu3) jaunty; urgency=low + + * Fix a regression in the estimated download size calculation introduced + by skip-installer.patch. (LP: #34376) + + -- Anders Kaseorg Sun, 15 Feb 2009 16:42:27 -0500 + +debmirror (20070123ubuntu2) jaunty; urgency=low + + * debian/{control,rules}: Added "quilt" to manage Ubuntu set of patches. + * Extracted earlier changes into logical patches: + - gpg-key-documentation.patch (debian bug 451157). + - gzreadline-update.patch (debian bug 451021). + * Add rsync-batching.patch: enable sane rsync batching instead of + one-at-a-time fetches (debian bug 455082). + * Add rsync-retries.patch: retry rsyncs if server connections time out. + * Add skip-installer.patch: handle installer section and skipping, + thanks to Jamie Strandboge. + + -- Kees Cook Fri, 13 Feb 2009 18:18:39 -0800 + +debmirror (20070123ubuntu1) hardy; urgency=low + + * Patched to handle changes to Compress::Zlib gzreadline symantics + (LP: #157362). + * Update documentation to detail the correct keyring to use (LP: #90546). + + -- Kees Cook Mon, 12 Nov 2007 14:10:57 -0800 + debmirror (20070123) unstable; urgency=low * Add dependency for libdigest-sha1-perl (ACK NMU) (Closes: #386707) @@ -856,3 +1227,4 @@ * Initial Debian release -- Joerg Wendland Thu, 25 Oct 2001 17:12:13 +0200 + diff -Nru debmirror-2.35/debian/control debmirror-2.35ubuntu1/debian/control --- debmirror-2.35/debian/control 2021-06-03 13:23:33.000000000 +0300 +++ debmirror-2.35ubuntu1/debian/control 2021-06-03 18:13:49.000000000 +0300 @@ -1,8 +1,9 @@ Source: debmirror Section: net Priority: optional -Maintainer: Colin Watson -Build-Depends: debhelper-compat (= 12), perl (>= 5.10), libnet-perl, libdigest-md5-perl, libdigest-sha-perl, liblockfile-simple-perl, libwww-perl (>= 5.815), perl (>= 5.22) | libnet-inet6glue-perl +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Colin Watson +Build-Depends: debhelper-compat (= 12), perl (>= 5.10), libnet-perl, libdigest-md5-perl, libdigest-sha-perl, liblockfile-simple-perl, libwww-perl (>= 5.815), perl (>= 5.22) | libnet-inet6glue-perl, quilt (>> 0.48-1) Standards-Version: 3.9.8 Vcs-Git: https://salsa.debian.org/debian/debmirror.git Vcs-Browser: https://salsa.debian.org/debian/debmirror diff -Nru debmirror-2.35/debian/patches/check_file-return.patch debmirror-2.35ubuntu1/debian/patches/check_file-return.patch --- debmirror-2.35/debian/patches/check_file-return.patch 1970-01-01 03:00:00.000000000 +0300 +++ debmirror-2.35ubuntu1/debian/patches/check_file-return.patch 2021-04-26 15:00:09.000000000 +0300 @@ -0,0 +1,33 @@ +Description: adjust logic to report on why a file is needed in verbose mode. +Author: Kees Cook +Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=455082 + +Index: b/debmirror +=================================================================== +--- a/debmirror ++++ b/debmirror +@@ -1667,6 +1667,7 @@ + my %params=@_; + my ($filename, $size)=delete @params{qw{filename size}}; + if (! -f $filename) { ++ say("Missing: $filename") if ($verbose); + return 0; + } + my $disksize = -s _; +@@ -1697,11 +1698,16 @@ + $summer->addfile($handle); + close $handle; + return 1 if $checksum eq $summer->hexdigest; ++ say(sprintf("Mismatch '$filename': sum is %s, expected %s", $summer->hexdigest, $checksum)) ++ if ($verbose); + } + else { + return 1; + } + } ++ elsif ($verbose) { ++ say(sprintf("Mismatch '$filename': size is %d, expected %d", $disksize, $size)); ++ } + return 0; + } + diff -Nru debmirror-2.35/debian/patches/default-settings.patch debmirror-2.35ubuntu1/debian/patches/default-settings.patch --- debmirror-2.35/debian/patches/default-settings.patch 1970-01-01 03:00:00.000000000 +0300 +++ debmirror-2.35ubuntu1/debian/patches/default-settings.patch 2020-08-22 15:18:46.000000000 +0300 @@ -0,0 +1,46 @@ +Description: increases rsync batching size, leaves off troublesome -I rsync + flag, auto-flushes. +Author: Kees Cook +Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=455082 + +Index: b/debmirror +=================================================================== +--- a/debmirror ++++ b/debmirror +@@ -327,7 +327,7 @@ + =item B<--rsync-options>=I + + Specify alternative rsync options to be used. Default options are +-"-aIL --partial". Care must be taken when specifying alternative ++"-aL --partial". Care must be taken when specifying alternative + options not to disrupt operations, it's best to only add to those + options. + +@@ -621,7 +621,7 @@ + our $download_method="ftp"; + our $timeout=300; + our $max_batch=0; +-our $rsync_batch=200; ++our $rsync_batch=300; + our $num_errors=0; + our $bytes_to_get=0; + our $bytes_gotten=0; +@@ -634,7 +634,7 @@ + chomp $start_date; + our $dry_run=0; + our $do_dry_run=0; +-our $rsync_options="-aIL --partial"; ++our $rsync_options="-aL --partial"; + our $ignore_small_errors=0; + our $diff_mode="use"; + our $gzip_options="-9 -n --rsyncable"; +@@ -651,6 +651,9 @@ + my $HOME; + ($HOME = $ENV{'HOME'}) or die "HOME not defined in environment!\n"; + ++# Switch to auto-flushing mode for stdout. ++select STDOUT; $|=1; ++ + # Load in config files first so options can override them. + Getopt::Long::Configure qw(pass_through); + GetOptions('config-file=s' => \@config_files); diff -Nru debmirror-2.35/debian/patches/drop-redundant-rsync.patch debmirror-2.35ubuntu1/debian/patches/drop-redundant-rsync.patch --- debmirror-2.35/debian/patches/drop-redundant-rsync.patch 1970-01-01 03:00:00.000000000 +0300 +++ debmirror-2.35ubuntu1/debian/patches/drop-redundant-rsync.patch 2020-08-22 15:18:46.000000000 +0300 @@ -0,0 +1,75 @@ +Description: drop the needless section of rsync code for trailing list. +Author: Kees Cook +Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=455082 + +Index: b/debmirror +=================================================================== +--- a/debmirror ++++ b/debmirror +@@ -1415,12 +1415,16 @@ + my @result; + my $i=0; + my $j=0; ++ my @tofetch; + $opt .= " --progress" if $progress; + $opt .= " -v" if $verbose or $debug; + $opt .= " -n" if $do_dry_run; + $opt .= " --no-motd" unless $verbose; + foreach my $file (sort keys %files) { +- if (!$files{$file}) { ++ push(@tofetch, $file) if (!$files{$file}); ++ } ++ my $last = scalar(@tofetch); ++ foreach my $file (@tofetch) { + my $dirname; + my @dir; + ($dirname) = $file =~ m:(.*/):; +@@ -1429,7 +1433,10 @@ + push (@result, "" . join('/', @dir[0..$_]) . "/"); + } + push (@result, "$file"); +- if (++$j >= $rsync_batch) { ++ $i++; ++ $j++; ++ say("want $file ($i/$last $j/$rsync_batch)") if ($progress || $verbose); ++ if ($j >= $rsync_batch || $i == $last) { + $j = 0; + ($fh, $rsynctempfile) = tempfile(); + if (@result) { +@@ -1472,35 +1479,12 @@ + } + @result = (); + } +- if ($max_batch > 0 && ++$i >= $max_batch) { ++ if ($max_batch > 0 && ($i + 1) >= $max_batch) { + print "Batch limit exceeded, mirror run will be partial\n"; + push (@errlog,"Batch limit exceeded, mirror run was partial\n"); + $num_errors++; + last; + } +- } +- } +- ($fh, $rsynctempfile) = tempfile(); +- if (@result) { +- @result = sort(@result); +- my $prev = "not equal to $result[0]"; +- @result = grep($_ ne $prev && ($prev = $_, 1), @result); +- for (@result) { +- print $fh "$_\n"; +- } +- system ("rsync --timeout=$timeout $opt $rsyncremote --include-from=$rsynctempfile --exclude='*' $mirrordir"); +- close $fh; +- foreach my $dest (@result) { +- if (-f $dest) { +- if (!check_lists($dest)) { +- say("$dest failed checksum verification"); +- $num_errors++; +- } +- } elsif (!-d $dest) { +- say("$dest missing"); +- $num_errors++; +- } +- } + } + return; + } diff -Nru debmirror-2.35/debian/patches/series debmirror-2.35ubuntu1/debian/patches/series --- debmirror-2.35/debian/patches/series 1970-01-01 03:00:00.000000000 +0300 +++ debmirror-2.35ubuntu1/debian/patches/series 2017-07-22 04:09:37.000000000 +0300 @@ -0,0 +1,6 @@ +default-settings.patch +silence-errors.patch +drop-redundant-rsync.patch +check_file-return.patch +skip-installer.patch +ubuntu-settings.patch diff -Nru debmirror-2.35/debian/patches/silence-errors.patch debmirror-2.35ubuntu1/debian/patches/silence-errors.patch --- debmirror-2.35/debian/patches/silence-errors.patch 1970-01-01 03:00:00.000000000 +0300 +++ debmirror-2.35ubuntu1/debian/patches/silence-errors.patch 2021-04-26 15:00:09.000000000 +0300 @@ -0,0 +1,58 @@ +Description: silence any errors from find. +Author: Kees Cook +Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=455082 + +Index: b/debmirror +=================================================================== +--- a/debmirror ++++ b/debmirror +@@ -1516,7 +1516,7 @@ + } + chdir($tempdir) or die "unable to chdir($tempdir): $!\n"; + my $res=0; +-foreach my $file (`find . -type f`) { ++foreach my $file (`find . -type f 2>/dev/null`) { + chomp $file; + $file=~s:^\./::; + # this skips diff files if unwanted +@@ -1606,7 +1606,7 @@ + # makes directories.. Sort so they are removable in bottom-up + # order. + chdir($mirrordir) or die "chdir $mirrordir: $!"; +- system("find . -depth -type d ! -name . ! -name .. -print0 | xargs -0 rmdir 2>/dev/null") if (! $do_dry_run); ++ system("find . -depth -type d ! -name . ! -name .. -print0 2>/dev/null | xargs -0 rmdir 2>/dev/null") if (! $do_dry_run); + } + + if ($res != 0) { +@@ -2945,7 +2945,7 @@ + my $ignore; + $ignore = "(".join("|", @ignores).")" if @ignores; + # Remove all files in the mirror that we don't know about +- foreach my $file (`find . -type f`) { ++ foreach my $file (`find . -type f 2>/dev/null`) { + chomp $file; + $file=~s:^\./::; + next if (@di_dists && $file =~ m:installer-\w(-|\w)*/current/images/:); +@@ -3088,11 +3088,11 @@ + + sub di_cleanup { + # Clean up obsolete files +- foreach my $image_dir (`find dists/ -type d -name images`) { ++ foreach my $image_dir (`find dists/ -type d -name images 2>/dev/null`) { + next unless $image_dir =~ m:/installer-\w(-|\w)*/current/images$:; + chomp $image_dir; + chdir("$image_dir") or die "unable to chdir($image_dir): $!\n"; +- foreach my $file (`find . -type f`) { ++ foreach my $file (`find . -type f 2>/dev/null`) { + chomp $file; + $file=~s:^\./::; + if (! exists $di_files{$image_dir} || ! exists $di_files{$image_dir}{$file}) { +@@ -3108,7 +3108,7 @@ + # Clean up temporary D-I files (silently) + if (-d "$tempdir/d-i") { + chdir("$tempdir/d-i") or die "unable to chdir($tempdir/d-i): $!\n"; +- foreach my $file (`find . -type f`) { ++ foreach my $file (`find . -type f 2>/dev/null`) { + chomp $file; + $file=~s:^\./::; + unlink "$file" or die "unlink $tempdir/d-i/$file: $!\n"; diff -Nru debmirror-2.35/debian/patches/skip-installer.patch debmirror-2.35ubuntu1/debian/patches/skip-installer.patch --- debmirror-2.35/debian/patches/skip-installer.patch 1970-01-01 03:00:00.000000000 +0300 +++ debmirror-2.35ubuntu1/debian/patches/skip-installer.patch 2021-04-26 15:00:09.000000000 +0300 @@ -0,0 +1,64 @@ +Description: allow releases to be skipped when fetching installer files. +Author: Jamie Strandboge , Kees Cook +Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=576576 + +Index: b/debmirror +=================================================================== +--- a/debmirror ++++ b/debmirror +@@ -85,6 +85,10 @@ + F<./.temp> working directory, but won't replace the old meta files, won't + download debs and source files and only simulates cleanup. + ++=item B<--skip-installer>=I ++ ++Don't download debian-installer files for the specified distribution. ++ + =item B<--help> + + Display a usage summary. +@@ -604,7 +608,7 @@ + our @config_files; + our ($debug, $progress, $verbose, $passive, $skippackages, $getcontents, $i18n); + our ($ua, $proxy, $ftp); +-our (@dists, @sections, @arches, @ignores, @excludes, @includes, @keyrings); ++our (@dists, @sections, @arches, @ignores, @excludes, @includes, @keyrings, @skip_installer); + our (@excludes_deb_section, @limit_priority); + our (%excludes_field, %includes_field); + our (@di_dists, @di_arches, @rsync_extra); +@@ -743,6 +747,7 @@ + 'postcleanup' => \$post_cleanup, + 'nocleanup' => \$no_cleanup, + 'ignore=s' => \@ignores, ++ 'skip-installer=s' => \@skip_installer, + 'exclude=s' => \@excludes, + 'exclude-deb-section=s' => \@excludes_deb_section, + 'limit-priority=s' => \@limit_priority, +@@ -844,6 +849,8 @@ + $post_cleanup=0 if ($no_cleanup); + $post_cleanup=0 if ($pre_cleanup); + $post_cleanup=0 if ($debmarshal); ++@skip_installer=split(/,/,join(',',@skip_installer)); ++@skip_installer=() unless @skip_installer; + + # Display configuration. + $|=1 if $debug; +@@ -2953,11 +2960,15 @@ + di_cleanup() if @di_dists; + } + ++# Figure out whether debian-installer should be skipped for a given dist. ++my %skip_installer=("woody" => 1, "experimental" => 1); ++foreach my $skipped_dist (@skip_installer) { ++ $skip_installer{$skipped_dist} = 1; ++} ++ + sub di_skip_dist { + my $dist=shift; +- if ( $dist eq "woody" || +- $dist eq "experimental" || +- $dist =~ /.*-updates/ ) { ++ if ( defined($skip_installer{$dist}) ) { + return 1; + } + return 0; diff -Nru debmirror-2.35/debian/patches/ubuntu-settings.patch debmirror-2.35ubuntu1/debian/patches/ubuntu-settings.patch --- debmirror-2.35/debian/patches/ubuntu-settings.patch 1970-01-01 03:00:00.000000000 +0300 +++ debmirror-2.35ubuntu1/debian/patches/ubuntu-settings.patch 2021-04-26 15:00:09.000000000 +0300 @@ -0,0 +1,157 @@ +Index: b/debmirror +=================================================================== +--- a/debmirror ++++ b/debmirror +@@ -11,7 +11,7 @@ + + =head1 DESCRIPTION + +-This program downloads and maintains a partial local Debian mirror. It can ++This program downloads and maintains a partial local Ubuntu mirror. It can + mirror any combination of architectures, distributions, and sections. Files + are transferred by ftp, and package pools are fully supported. It also does + locking and updates trace files. +@@ -26,7 +26,7 @@ + + =item 1. download Packages and Sources files + +-First it downloads all Packages and Sources files for the subset of Debian it ++First it downloads all Packages and Sources files for the subset of Ubuntu it + was instructed to get. + + =item 2. download everything else +@@ -65,7 +65,7 @@ + This required (unless defined in a configuration file) parameter specifies + where the local mirror directory is. If the directory does not exist, it will + be created. Be careful; telling this program that your home directory is the +-mirrordir is guaranteed to replace your home directory with a Debian mirror! ++mirrordir is guaranteed to replace your home directory with an Ubuntu mirror! + + =item B<-p>, B<--progress> + +@@ -99,13 +99,13 @@ + + =item B<-h>, B<--host>=I + +-Specify the remote host to mirror from. Defaults to I, ++Specify the remote host to mirror from. Defaults to I, + you are strongly encouraged to find a closer mirror. + + =item B<-r>, B<--root>=I + +-Specifies the directory on the remote host that is the root of the Debian +-archive. Defaults to F, which will work for most mirrors. The root ++Specifies the directory on the remote host that is the root of the Ubuntu ++archive. Defaults to F, which will work for most mirrors. The root + directory has a F subdirectory. + + =item B<--method>=I +@@ -134,7 +134,7 @@ + + =item B<-d>, B<--dist>=I + +-Specify the distribution (etch, lenny, squeeze, sid) of Debian to ++Specify the distribution (bionic, focal, impish) of Ubuntu to + mirror. This switch may be used multiple times, and multiple + distributions may be specified at once, separated by commas. + +@@ -150,7 +150,7 @@ + + =item B<-s>, B<--section>=I + +-Specify the section of Debian to mirror. Defaults to ++Specify the section of Ubuntu to mirror. Defaults to + C. + + =item B<-a>, B<--arch>=I +@@ -538,11 +538,11 @@ + + debmirror /srv/mirror/debian + +-Make a mirror of i386 and sparc binaries, main only, and include both unstable +-and testing versions of Debian; download from 'ftp.nl.debian.org': ++Make a mirror of i386 and amd64 binaries, main and universe only, and include ++both LTS and latest versions of Ubuntu; download from 'archive.ubuntu.com': + +- debmirror -a i386,sparc -d sid -d etch -s main --nosource \ +- -h ftp.nl.debian.org --progress $HOME/mirror/debian ++ debmirror -a i386,amd64 -d focal -d impish -s main,universe --nosource \ ++ -h archive.ubuntu.com --progress $HOME/mirror/debian + + Make a mirror using rsync (rsync server is 'ftp.debian.org::debian'), + excluding the section 'debug' and the package 'foo-doc': +@@ -569,15 +569,15 @@ + with debmirror's --keyring option -- see above). + + To add the right key to this keyring you can import it from the +- debian keyring (in case of the debian archive) using: ++ ubuntu keyring (in case of the Ubuntu archive) using: + +- gpg --keyring /usr/share/keyrings/debian-archive-keyring.gpg --export \ ++ gpg --keyring /usr/share/keyrings/ubuntu-archive-keyring.gpg --export \ + | gpg --no-default-keyring --keyring trustedkeys.gpg --import + + or download the key from a keyserver: + + gpg --no-default-keyring --keyring trustedkeys.gpg \ +- --keyserver keyring.debian.org --recv-keys ++ --keyserver keyserver.ubuntu.com --recv-keys + + The can be found in the gpgv error message in debmirror: + gpgv: Signature made Tue Jan 23 09:07:53 2007 CET using DSA key ID 2D230C5F +@@ -618,10 +618,10 @@ + our $post_cleanup=1; + our $no_cleanup=0; + our $do_source=1; +-our $host="ftp.debian.org"; ++our $host="archive.ubuntu.com"; + our $user="anonymous"; + our $passwd="anonymous@"; +-our $remoteroot="debian"; ++our $remoteroot="ubuntu"; + our $download_method="ftp"; + our $timeout=300; + our $max_batch=0; +@@ -822,9 +822,9 @@ + # Post-process arrays. Allow commas to separate values the user entered. + # If the user entered nothing, provide defaults. + @dists=split(/,/,join(',',@dists)); +-@dists=qw(sid) unless @dists; ++@dists=qw(impish) unless @dists; + @sections=split(/,/,join(',',@sections)); +-@sections=qw(main contrib non-free main/debian-installer) unless @sections; ++@sections=qw(main main/debian-installer universe restricted multiverse) unless @sections; + @arches=split(/,/,join(',',@arches)); + @arches=qw(i386) unless @arches; + @arches=() if (join(',',@arches) eq "none"); +@@ -3313,7 +3313,7 @@ + by Colin Watson . + + The author disclaims any responsibility for any mangling of your system, +-unexpected bandwidth usage bills, meltdown of the Debian mirror network, ++unexpected bandwidth usage bills, meltdown of the Debian/Ubuntu mirror network, + etc, that this script may cause. See NO WARRANTY section of GPL. + + =head1 AUTHOR +Index: b/examples/debmirror.conf +=================================================================== +--- a/examples/debmirror.conf ++++ b/examples/debmirror.conf +@@ -20,13 +20,13 @@ + $debug=0; + + # Download options +-$host="ftp.debian.org"; ++$host="archive.ubuntu.com"; + $user="anonymous"; + $passwd="anonymous@"; +-$remoteroot="debian"; ++$remoteroot="ubuntu"; + $download_method="ftp"; +-@dists="sid"; +-@sections="main,main/debian-installer,contrib,non-free"; ++@dists="impish"; ++@sections="main,main/debian-installer,universe,restricted,multiverse"; + @arches="i386"; + # @ignores=""; + # @excludes=""; diff -Nru debmirror-2.35/debian/rules debmirror-2.35ubuntu1/debian/rules --- debmirror-2.35/debian/rules 2021-06-03 13:23:33.000000000 +0300 +++ debmirror-2.35ubuntu1/debian/rules 2021-06-03 18:13:49.000000000 +0300 @@ -3,7 +3,7 @@ include /usr/share/dpkg/pkg-info.mk %: - dh $@ + dh $@ --with quilt override_dh_install: dh_install