diff -pruN 2.2.2/CMakeLists.txt 2.2.2ubuntu1/CMakeLists.txt --- 2.2.2/CMakeLists.txt 2021-03-12 08:15:59.000000000 +0000 +++ 2.2.2ubuntu1/CMakeLists.txt 2021-04-06 09:30:32.000000000 +0000 @@ -200,7 +200,7 @@ endif() # Configure some variables like package, version and architecture. set(PACKAGE ${PROJECT_NAME}) set(PACKAGE_MAIL "APT Development Team ") -set(PACKAGE_VERSION "2.2.2") +set(PACKAGE_VERSION "2.2.2ubuntu1") string(REGEX MATCH "^[0-9.]+" PROJECT_VERSION ${PACKAGE_VERSION}) if (NOT DEFINED DPKG_DATADIR) diff -pruN 2.2.2/debian/changelog 2.2.2ubuntu1/debian/changelog --- 2.2.2/debian/changelog 2021-03-12 08:15:59.000000000 +0000 +++ 2.2.2ubuntu1/debian/changelog 2021-04-06 09:30:32.000000000 +0000 @@ -1,3 +1,9 @@ +apt (2.2.2ubuntu1) hirsute; urgency=medium + + * tests: Check for and discard expected warning from MaybeAddAuth + + -- Julian Andres Klode Tue, 06 Apr 2021 11:30:32 +0200 + apt (2.2.2) unstable; urgency=medium [ David Kalnischkies ] @@ -290,6 +296,21 @@ apt (2.1.8) unstable; urgency=medium -- Julian Andres Klode Tue, 04 Aug 2020 12:41:28 +0200 +apt (2.1.7ubuntu1) groovy; urgency=medium + + * Fully deprecate apt-key, schedule removal for Q2/2022 + * apt-key: Allow depending on gpg instead of gnupg + * Use more politically correct terminology where appropriate + * Various http fixes, including, but not limited to: + - http: Always Close() the connection in Die() + - http: Only return false for EOF if we actually did not read anything + - http: Die(): Do not flush the buffer, error out instead + - http: Finish copying data from server to file before sending stuff to server + - http: Always write to the file if there's something to write + (Closes: #959518) + + -- Julian Andres Klode Tue, 04 Aug 2020 12:24:20 +0200 + apt (2.1.7) unstable; urgency=medium [ David Kalnischkies ] @@ -449,6 +470,12 @@ apt (2.0.2) unstable; urgency=medium -- Julian Andres Klode Thu, 09 Apr 2020 12:21:07 +0200 +apt (2.0.1ubuntu1) focal; urgency=medium + + * test/integration/apt.pem: Regenerate with SHA2 hashes + + -- Julian Andres Klode Mon, 06 Apr 2020 10:01:58 +0200 + apt (2.0.1) unstable; urgency=medium [ David Kalnischkies ] @@ -760,6 +787,12 @@ apt (1.8.2) unstable; urgency=medium -- Julian Andres Klode Tue, 28 May 2019 16:40:29 +0200 +apt (1.8.1+19.10) eoan; urgency=medium + + * Upload to eoan + + -- Julian Andres Klode Mon, 06 May 2019 11:25:41 +0200 + apt (1.8.1) unstable; urgency=medium * Add test case for local-only packages pinned to never @@ -936,6 +969,12 @@ apt (1.8.0~alpha3) unstable; urgency=med -- Julian Andres Klode Tue, 18 Dec 2018 15:02:11 +0100 +apt (1.8.0~alpha2ubuntu1) disco; urgency=medium + + * Adjust libapt-pkg Breaks aptitude to << 0.8.9 + + -- Julian Andres Klode Wed, 14 Nov 2018 12:07:59 +0100 + apt (1.8.0~alpha2) unstable; urgency=medium * Revert "http: Fix handling of server connection closure" @@ -996,6 +1035,13 @@ apt (1.7.0) unstable; urgency=medium -- Julian Andres Klode Sun, 07 Oct 2018 07:56:02 +0200 +apt (1.7.0~rc2ubuntu1) cosmic; urgency=medium + + * Fix calculation of elapsed usec in downloads + * pkgCacheFile: Only unlock in destructor if locked before (LP: #1794053) + + -- Julian Andres Klode Mon, 24 Sep 2018 12:18:26 +0200 + apt (1.7.0~rc2) unstable; urgency=medium [ David Kalnischkies ] @@ -1046,6 +1092,22 @@ apt (1.7.0~alpha3) experimental; urgency -- Julian Andres Klode Mon, 20 Aug 2018 17:44:19 +0200 +apt (1.7.0~alpha2ubuntu2) cosmic; urgency=medium + + * Set DPKG_FRONTEND_LOCKED as needed when doing selection changes + + -- Julian Andres Klode Wed, 08 Aug 2018 15:27:20 +0200 + +apt (1.7.0~alpha2ubuntu1) cosmic; urgency=medium + + [ Julian Andres Klode ] + * Add support for dpkg frontend lock (Closes: #869546) + + [ Jean-Ralph Aviles ] + * Add trailing newline to output of edit-sources. + + -- Julian Andres Klode Tue, 07 Aug 2018 16:01:08 +0200 + apt (1.7.0~alpha2) experimental; urgency=medium * Handle JSON hooks that just close the file/exit and fix some other errors @@ -1115,6 +1177,72 @@ apt (1.7.0~alpha1) experimental; urgency -- Julian Andres Klode Mon, 25 Jun 2018 17:12:30 +0200 +apt (1.7.0~alpha0ubuntu2) cosmic; urgency=medium + + [ David Kalnischkies ] + * Add boilerplate plural form to po/apt-all.pot + * don't try SRV requests based on IP addresses + * use 127.0.0.1 instead of localhost as default Tor proxy + * Extend apt build-dep pkg/release to switch dep as needed + * Support release selector for volatile files as well + * Start pkg records for deb files with dpkg output + * Deprectate buggy/incorrect Rls/PkgFile::IsOk methods + * Support --with-source in show & search commands + * Support local files as arguments in show command (Closes: 883206) + * Drop alternative URIs we got a hash-based fail from + * Handle by-hash URI construction more centrally + * Don't force the same mirror for by-hash URIs + * Reword error for timed out read/write on SOCKS proxy (Closes: #898886) + * Don't show acquire warning for "hidden" components (Closes: #879591) + * Use a steady clock source for progress reporting + * Use steady clock source for bandwidth limitation + + [ Filipe Brandenburger ] + * Update .gitignore + * Increase debug verbosity in `apt-get autoremove` + * Extend test-apt-get-autoremove to check debug output + + [ Julian Andres Klode ] + * tests: Do not expect requested-by if sudo was invoked by root + * Run tests on GitLab CI + * Handle a missed case of timed out ip addresses (LP: #1766542) + * Lower default timeout from 120s to 30s + * apt-key: Pass all instead of gpg-agent to gpgconf --kill (LP: #1773992) + * Fix lock counting in debSystem + + [ annadane ] + * Add verb 'be' to NEWS entry for 1.5~beta1 (Closes: 892792) + + [ Алексей Шилин ] + * Russian program translation update (Closes: 898797) + + [ Frans Spiesschaert ] + * Dutch program translation update (Closes: #900589) + * Dutch manpage translation update (Closes: #900602) + + -- Julian Andres Klode Tue, 19 Jun 2018 17:12:51 +0200 + +apt (1.7.0~alpha0ubuntu1) cosmic; urgency=medium + + [ Julian Andres Klode ] + * CMake: Fix builds without zstd + * apt.conf.autoremove: Catch some new Ubuntu module packages + * Fix build with new gtest (Closes: #897149) + + [ David Kalnischkies ] + * move special READMEs into doc/ and format as md + + [ Guillem Jover ] + * Remove obsolete RCS keywords + * Normalize authors through a mailmap file + * po: Fill Project-Id-Version with correct project id and version + * po: Fix translated string not matching format string arguments + * po: Fix Language field to match actual locale + * po: Remove spurious text in Plural-Forms field + * po: Add missing Plural-Forms fields + + -- Julian Andres Klode Wed, 09 May 2018 10:42:38 +0200 + apt (1.7.0~alpha0) experimental; urgency=medium [ David Kalnischkies ] @@ -1831,6 +1959,15 @@ apt (1.3) unstable; urgency=medium -- Julian Andres Klode Tue, 20 Sep 2016 23:53:51 +0200 +apt (1.3~rc4ubuntu1) yakkety; urgency=medium + + * Merge with Debian, remaining changes: + - Hack around Ubuntu rejecting symlink copyright + - Revert "test: Assert multi-arch in the chroot" + - Revert "test: Make sure we always find a dpkg in status file" + + -- Julian Andres Klode Fri, 02 Sep 2016 20:39:36 +0000 + apt (1.3~rc4) unstable; urgency=medium [ Julian Andres Klode ] @@ -1852,6 +1989,23 @@ apt (1.3~rc4) unstable; urgency=medium -- Julian Andres Klode Fri, 02 Sep 2016 20:26:36 +0200 +apt (1.3~rc3ubuntu2) yakkety; urgency=medium + + * test-apt-cdrom: Fix for gnupg 2.1.15 + * Revert "test: Assert multi-arch in the chroot" + * Revert "test: Make sure we always find a dpkg in status file" + + -- Julian Andres Klode Thu, 01 Sep 2016 13:06:14 +0000 + +apt (1.3~rc3ubuntu1) yakkety; urgency=medium + + * Merge with Debian, remaining changes: + - Hack around Ubuntu rejecting symlink copyright + * Cherry pick commit from master to fix random build failures: + - TagFile: Fix off-by-one errors in comment stripping + + -- Julian Andres Klode Wed, 31 Aug 2016 22:55:32 +0000 + apt (1.3~rc3) unstable; urgency=medium [ Julian Andres Klode ] @@ -1906,6 +2060,32 @@ apt (1.3~rc3) unstable; urgency=medium -- Julian Andres Klode Tue, 30 Aug 2016 22:20:28 +0200 +apt (1.3~rc2ubuntu3) yakkety; urgency=medium + + [ David Kalnischkies ] + * do dpkg --configure before --remove/--purge --pending (Closes: 835094) + * prevent C++ locale number formatting in text APIs (try 3) (LP: #1611010) + + [ Julian Andres Klode ] + * CMake: Add Large File Support (Closes: #834767) + * prepare-release: Use equivs and gdebi-core for travis deps + + -- Julian Andres Klode Wed, 24 Aug 2016 08:39:04 +0000 + +apt (1.3~rc2ubuntu2) yakkety; urgency=medium + + * tests/control: Handle the gpg1/gpg2 mess a bit better + + -- Julian Andres Klode Thu, 18 Aug 2016 12:24:10 +0000 + +apt (1.3~rc2ubuntu1) yakkety; urgency=medium + + * Merge with Debian, remaining changes (forgotten to merge upstream): + - debian: Install etc/apt if present (e.g., on Ubuntu) + - Hack around Ubuntu rejecting symlink copyright + + -- Julian Andres Klode Thu, 18 Aug 2016 08:05:39 +0000 + apt (1.3~rc2) unstable; urgency=medium [ Julian Andres Klode ] @@ -1935,6 +2115,22 @@ apt (1.3~rc2) unstable; urgency=medium -- Julian Andres Klode Wed, 17 Aug 2016 23:31:07 +0200 +apt (1.3~rc1ubuntu2) yakkety; urgency=medium + + * Don't build with -O3. See LP: #1473674. + + -- Matthias Klose Fri, 12 Aug 2016 09:44:56 +0200 + +apt (1.3~rc1ubuntu1) yakkety; urgency=medium + + * debian/NEWS: Get rid of 1.3~pre3+cmake1 entry. + Thanks to Axel Beckert for reporting + * CMake: Use COPYONLY instead of @ONLY + * debian: Install etc/apt if present (e.g., on Ubuntu) + * Hack around Ubuntu rejecting symlink copyright + + -- Julian Andres Klode Fri, 12 Aug 2016 00:20:40 +0000 + apt (1.3~rc1) unstable; urgency=medium * Summary: CMake branch merged, socks5h (and tor) support, and fancy diff -pruN 2.2.2/debian/control 2.2.2ubuntu1/debian/control --- 2.2.2/debian/control 2021-03-12 08:15:59.000000000 +0000 +++ 2.2.2ubuntu1/debian/control 2021-04-06 09:30:32.000000000 +0000 @@ -1,7 +1,8 @@ Source: apt Section: admin Priority: important -Maintainer: APT Development Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: APT Development Team Uploaders: Michael Vogt , Julian Andres Klode , David Kalnischkies diff -pruN 2.2.2/doc/apt-key.8.xml 2.2.2ubuntu1/doc/apt-key.8.xml --- 2.2.2/doc/apt-key.8.xml 2021-03-12 08:15:59.000000000 +0000 +++ 2.2.2ubuntu1/doc/apt-key.8.xml 2021-04-06 09:30:32.000000000 +0000 @@ -13,7 +13,7 @@ &apt-email; &apt-product; - 2020-05-06T00:00:00Z + 2021-04-06T00:00:00Z diff -pruN 2.2.2/doc/apt-verbatim.ent 2.2.2ubuntu1/doc/apt-verbatim.ent --- 2.2.2/doc/apt-verbatim.ent 2021-03-12 08:15:59.000000000 +0000 +++ 2.2.2ubuntu1/doc/apt-verbatim.ent 2021-04-06 09:30:32.000000000 +0000 @@ -274,7 +274,7 @@ "> - + diff -pruN 2.2.2/doc/po/apt-doc.pot 2.2.2ubuntu1/doc/po/apt-doc.pot --- 2.2.2/doc/po/apt-doc.pot 2021-03-12 08:15:59.000000000 +0000 +++ 2.2.2ubuntu1/doc/po/apt-doc.pot 2021-04-06 09:30:32.000000000 +0000 @@ -5,9 +5,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apt-doc 2.2.2\n" +"Project-Id-Version: apt-doc 2.2.2ubuntu1\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2021-03-12 09:16+0100\n" +"POT-Creation-Date: 2021-04-06 11:31+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -pruN 2.2.2/po/apt-all.pot 2.2.2ubuntu1/po/apt-all.pot --- 2.2.2/po/apt-all.pot 2021-03-12 08:15:59.000000000 +0000 +++ 2.2.2ubuntu1/po/apt-all.pot 2021-04-06 09:30:32.000000000 +0000 @@ -5,9 +5,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apt 2.2.2\n" +"Project-Id-Version: apt 2.2.2ubuntu1\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2021-03-12 09:16+0100\n" +"POT-Creation-Date: 2021-04-06 11:31+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -pruN 2.2.2/test/libapt/authconf_test.cc 2.2.2ubuntu1/test/libapt/authconf_test.cc --- 2.2.2/test/libapt/authconf_test.cc 2021-03-12 08:15:59.000000000 +0000 +++ 2.2.2ubuntu1/test/libapt/authconf_test.cc 2021-04-06 09:30:32.000000000 +0000 @@ -1,5 +1,6 @@ #include +#include #include #include #include @@ -235,11 +236,15 @@ machine http://http.example login foo1 p EXPECT_EQ("foo1", U.User); EXPECT_EQ("bar", U.Password); + _error->PushToStack(); EXPECT_TRUE(fd.Seek(0)); U = URI("http://https.example/foo"); EXPECT_TRUE(MaybeAddAuth(fd, U)); EXPECT_TRUE(U.User.empty()); EXPECT_TRUE(U.Password.empty()); + EXPECT_FALSE(_error->empty()); + EXPECT_TRUE(U.Password.empty()); + _error->RevertToStack(); EXPECT_TRUE(fd.Seek(0)); U = URI("http://http.example/foo");