Release 2.5.32.5.3

16 files changed, 90 insertions, 27 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 34a214a3a..540b50ebf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -205,7 +205,7 @@ endif()
 # Configure some variables like package, version and architecture.
 set(PACKAGE ${PROJECT_NAME})
 set(PACKAGE_MAIL "APT Development Team <deity@lists.debian.org>")
-set(PACKAGE_VERSION "2.5.2")
+set(PACKAGE_VERSION "2.5.3")
 string(REGEX MATCH "^[0-9.]+" PROJECT_VERSION ${PACKAGE_VERSION})
 
 if (NOT DEFINED DPKG_DATADIR)
diff --git a/debian/changelog b/debian/changelog
index db76276a9..907182eac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,34 @@
+apt (2.5.3) unstable; urgency=medium
+
+  [ Povilas Kanapickas ]
+  * doc: Explain that apt-get download ensures package authenticity
+
+  [ David Kalnischkies ]
+  * Keep color disabled if APT::Color was set to false
+  * Don't reuse filename for in-tree builds of apt
+  * Respect users pkg order on `apt install` for resolving
+
+  [ Hideki Yamane ]
+  * Fix typo in Japanese program translation
+
+  [ lancethepants ]
+  * porting (musl):
+    - apt-pkg/contrib/fileutl.h  Explicitly include sys/stat.h
+
+  [ Khem Raj ]
+  * porting (clang15):
+    - typecast time_t and suseconds_t from std::chrono
+    - interactive-helper: Undefine _FORTIFY_SOURCE
+
+  [ Julian Andres Klode ]
+  * edsp: Add support for phased updates (test in LP#1990586)
+  * Check state of dependency, not depender in dependency keep back
+    (LP: #1990684)
+  * full-upgrade: Mark phased upgrades for keep before anything else
+    (LP: #1990586)
+
+ -- Julian Andres Klode <jak@debian.org>  Wed, 28 Sep 2022 17:16:41 +0200
+
 apt (2.5.2) unstable; urgency=medium
 
   [ Julian Andres Klode ]
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index 895f24034..c882de737 100644
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -14,7 +14,7 @@
    &apt-email;
    &apt-product;
    <!-- The last update date -->
-   <date>2021-01-08T00:00:00Z</date>
+   <date>2022-08-06T00:00:00Z</date>
  </refentryinfo>
  
  <refmeta>
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 5be5773ee..e7bbef173 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -274,7 +274,7 @@
 ">
 
 <!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "2.5.2">
+<!ENTITY apt-product-version "2.5.3">
 
 <!-- (Code)names for various things used all over the place -->
 <!ENTITY debian-oldstable-codename "buster">
diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml
index 189fb7d7d..48604b1e4 100644
--- a/doc/apt.conf.5.xml
+++ b/doc/apt.conf.5.xml
@@ -19,7 +19,7 @@
    &apt-email;
    &apt-product;
    <!-- The last update date -->
-   <date>2016-01-02T00:00:00Z</date>
+   <date>2016-01-03T00:00:00Z</date>
  </refentryinfo>
  
  <refmeta>
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index a7aaf799c..c23a6920e 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: apt-doc 2.5.2\n"
+"Project-Id-Version: apt-doc 2.5.3\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2022-07-24 15:59+0000\n"
+"POT-Creation-Date: 2022-09-28 17:34+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1041,7 +1041,7 @@ msgstr ""
 #: apt-get.8.xml
 msgid ""
 "<literal>download</literal> will download the given binary package into the "
-"current directory."
+"current directory. The authenticity of the package data is ensured as usual."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
diff --git a/doc/po/de.po b/doc/po/de.po
index 6ecd459e6..d6c688a2f 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 2.0.1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2022-02-22 20:01+0100\n"
+"POT-Creation-Date: 2022-09-28 17:34+0200\n"
 "PO-Revision-Date: 2020-04-04 08:45+0200\n"
 "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -1414,9 +1414,13 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>download</literal> will download the given binary package into "
+#| "the current directory."
 msgid ""
 "<literal>download</literal> will download the given binary package into the "
-"current directory."
+"current directory. The authenticity of the package data is ensured as usual."
 msgstr ""
 "<literal>download</literal> wird das angegebene Binärpaket in das aktuelle "
 "Verzeichnis herunterladen."
diff --git a/doc/po/es.po b/doc/po/es.po
index 2d992b07e..9536cd5f9 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -38,7 +38,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2022-02-22 20:01+0100\n"
+"POT-Creation-Date: 2022-09-28 17:34+0200\n"
 "PO-Revision-Date: 2014-07-04 01:31+0200\n"
 "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -1414,9 +1414,13 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>download</literal> will download the given binary package into "
+#| "the current directory."
 msgid ""
 "<literal>download</literal> will download the given binary package into the "
-"current directory."
+"current directory. The authenticity of the package data is ensured as usual."
 msgstr ""
 "<literal>download</literal> descarga el paquete binario introducido al "
 "directorio actual."
diff --git a/doc/po/fr.po b/doc/po/fr.po
index 005f5a356..5cae64c72 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.8.0\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2022-02-22 20:01+0100\n"
+"POT-Creation-Date: 2022-09-28 17:34+0200\n"
 "PO-Revision-Date: 2019-05-01 17:00+0100\n"
 "Last-Translator: Jean-Pierre Giraud <jean-pierregiraud@neuf.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -1388,9 +1388,13 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>download</literal> will download the given binary package into "
+#| "the current directory."
 msgid ""
 "<literal>download</literal> will download the given binary package into the "
-"current directory."
+"current directory. The authenticity of the package data is ensured as usual."
 msgstr ""
 "<literal>download</literal> télécharge le fichier binaire indiqué dans le "
 "répertoire courant."
diff --git a/doc/po/it.po b/doc/po/it.po
index 200259f73..c03c76e82 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2022-02-22 20:01+0100\n"
+"POT-Creation-Date: 2022-09-28 17:34+0200\n"
 "PO-Revision-Date: 2017-03-27 19:05+0200\n"
 "Last-Translator: Beatrice Torracca <beatricet@libero.it>\n"
 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
@@ -1432,9 +1432,13 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>download</literal> will download the given binary package into "
+#| "the current directory."
 msgid ""
 "<literal>download</literal> will download the given binary package into the "
-"current directory."
+"current directory. The authenticity of the package data is ensured as usual."
 msgstr ""
 "<literal>download</literal> scarica il pacchetto binario specificato nella "
 "directory corrente."
diff --git a/doc/po/ja.po b/doc/po/ja.po
index 3870299d8..2258161de 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.4\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2022-02-22 20:01+0100\n"
+"POT-Creation-Date: 2022-09-28 17:34+0200\n"
 "PO-Revision-Date: 2017-01-06 04:50+0900\n"
 "Last-Translator: Takuma Yamada <tyamada@takumayamada.com>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -1397,9 +1397,13 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>download</literal> will download the given binary package into "
+#| "the current directory."
 msgid ""
 "<literal>download</literal> will download the given binary package into the "
-"current directory."
+"current directory. The authenticity of the package data is ensured as usual."
 msgstr ""
 "<literal>download</literal> は、与えたバイナリパッケージを、カレントディレク"
 "トリにダウンロードします。"
diff --git a/doc/po/nl.po b/doc/po/nl.po
index 101809fc1..0bffe9c57 100644
--- a/doc/po/nl.po
+++ b/doc/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 2.4.4\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2022-04-24 00:59+0200\n"
+"POT-Creation-Date: 2022-09-28 17:34+0200\n"
 "PO-Revision-Date: 2022-04-09 15:28+0200\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
@@ -1471,9 +1471,13 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>download</literal> will download the given binary package into "
+#| "the current directory."
 msgid ""
 "<literal>download</literal> will download the given binary package into the "
-"current directory."
+"current directory. The authenticity of the package data is ensured as usual."
 msgstr ""
 "<literal>download</literal> zal het opgegeven binaire pakket ophalen en in "
 "de huidige map plaatsen."
diff --git a/doc/po/pl.po b/doc/po/pl.po
index bd678d8af..a6ca97729 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2022-02-22 20:01+0100\n"
+"POT-Creation-Date: 2022-09-28 17:34+0200\n"
 "PO-Revision-Date: 2014-07-04 02:13+0200\n"
 "Last-Translator: Robert Luberda <robert@debian.org>\n"
 "Language-Team: Polish <manpages-pl-list@lists.sourceforge.net>\n"
@@ -1394,9 +1394,13 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>download</literal> will download the given binary package into "
+#| "the current directory."
 msgid ""
 "<literal>download</literal> will download the given binary package into the "
-"current directory."
+"current directory. The authenticity of the package data is ensured as usual."
 msgstr ""
 "<literal>download</literal> pobierze podane pakiety binarne do bieżącego "
 "katalogu. "
diff --git a/doc/po/pt.po b/doc/po/pt.po
index a1ee5d282..8abcf0be8 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 2.4.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2022-05-20 10:28+0200\n"
+"POT-Creation-Date: 2022-09-28 17:34+0200\n"
 "PO-Revision-Date: 2022-05-19 23:40+0100\n"
 "Last-Translator: Américo Monteiro <a_monteiro@gmx.com>\n"
 "Language-Team: Portuguese <>\n"
@@ -1435,9 +1435,13 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>download</literal> will download the given binary package into "
+#| "the current directory."
 msgid ""
 "<literal>download</literal> will download the given binary package into the "
-"current directory."
+"current directory. The authenticity of the package data is ensured as usual."
 msgstr ""
 "<literal>download</literal> irá descarregar o pacote binário dado para o "
 "directório actual."
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index dfc6ca58f..641670f78 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2022-02-22 20:01+0100\n"
+"POT-Creation-Date: 2022-09-28 17:34+0200\n"
 "PO-Revision-Date: 2004-09-20 17:02+0000\n"
 "Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
 "Language-Team: <debian-l10n-portuguese@lists.debian.org>\n"
@@ -1024,7 +1024,7 @@ msgstr ""
 #: apt-get.8.xml
 msgid ""
 "<literal>download</literal> will download the given binary package into the "
-"current directory."
+"current directory. The authenticity of the package data is ensured as usual."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
diff --git a/po/apt-all.pot b/po/apt-all.pot
index d123238b5..400aff68f 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 2.5.2\n"
+"Project-Id-Version: apt 2.5.3\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2022-07-24 15:59+0000\n"
+"POT-Creation-Date: 2022-09-28 17:34+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"