Release 2.9.132.9.13

15 files changed, 165 insertions, 16 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9d766c50d..30759926a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -207,7 +207,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.9.12")
+set(PACKAGE_VERSION "2.9.13")
 string(REGEX MATCH "^[0-9.]+" PROJECT_VERSION ${PACKAGE_VERSION})
 
 if (NOT DEFINED DPKG_DATADIR)
diff --git a/debian/changelog b/debian/changelog
index 482f5a056..a6b45afeb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+apt (2.9.13) unstable; urgency=medium
+
+  * Add a --comment option to record Comment: in history
+  * Hardening: Add -Wp,-D_GLIBCXX_ASSERTIONS to CXXFLAGS to enable bounds
+    checking for all STL containers.
+  * patterns: Avoid out-of-bounds std::string_view read.
+    We only pass NUL-terminated strings to the function, and the code expects
+    that but we pass through an interface which doesn't guarantee that, so
+    we trigger an index < size() assertion when accessing the terminating
+    NUL byte when compiled with -Wp,-D_GLIBCXX_ASSERTIONS.
+  * ftparchive: Remove fixed size buffers on trusted inputs (LP: #2087848)
+    - ftparchive: override: Remove fixed-size line buffers in override files
+    - ftparchive: cachedb: Remove 600-byte key (and hence file path) limit
+    - ftparchive: writer: Remove line length limit on file lists
+  * tests: Temporarily disable valgrind-if-available on armhf and ppc64el
+    to avoid having to wait for a new valgrind without those architectures
+
+ -- Julian Andres Klode <jak@debian.org>  Wed, 20 Nov 2024 15:59:46 +0100
+
 apt (2.9.12) unstable; urgency=medium
 
   [ наб ]
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index 7d0ccece7..93f02a5a7 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>2022-02-01T00:00:00Z</date>
+   <date>2024-11-18T00:00:00Z</date>
  </refentryinfo>
  
  <refmeta>
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 150844c79..ee412dca5 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.9.12">
+<!ENTITY apt-product-version "2.9.13">
 
 <!-- (Code)names for various things used all over the place -->
 <!ENTITY debian-oldstable-codename "bullseye">
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 30309040d..6628b5c4d 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.9.12\n"
+"Project-Id-Version: apt-doc 2.9.13\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2024-11-18 14:04+0000\n"
+"POT-Creation-Date: 2024-11-20 15:03+0000\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"
@@ -1322,6 +1322,13 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
+"Add the given value to the <literal>Comment:</literal> field in history.log "
+"Configuration Item: <literal>APT::History::Comment</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
 "This option controls the architecture packages are built for by "
 "<command>apt-get source --compile</command> and how cross-builddependencies "
 "are satisfied. By default is it not set which means that the host "
diff --git a/doc/po/de.po b/doc/po/de.po
index bb3db9032..e0e4aa1b7 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: 2024-10-22 16:47+0000\n"
+"POT-Creation-Date: 2024-11-20 15:03+0000\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"
@@ -1865,6 +1865,21 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
+#, fuzzy
+#| msgid ""
+#| "Select the source override file to use with the <literal>sources</"
+#| "literal> command.  Configuration Item: <literal>APT::FTPArchive::"
+#| "SourceOverride</literal>."
+msgid ""
+"Add the given value to the <literal>Comment:</literal> field in history.log "
+"Configuration Item: <literal>APT::History::Comment</literal>."
+msgstr ""
+"wählt die Quelldatei zum außer Kraft setzen, die mit dem <literal>sources</"
+"literal>-Befehl benutzt wird. Konfigurationselement: <literal>APT::"
+"FTPArchive::SourceOverride</literal>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
 msgid ""
 "This option controls the architecture packages are built for by <command>apt-"
 "get source --compile</command> and how cross-builddependencies are "
diff --git a/doc/po/es.po b/doc/po/es.po
index 49e9b067f..5f47a3866 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: 2024-10-22 16:47+0000\n"
+"POT-Creation-Date: 2024-11-20 15:03+0000\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"
@@ -1872,6 +1872,21 @@ msgstr ""
 #: apt-get.8.xml
 #, fuzzy
 #| msgid ""
+#| "Select the source override file to use with the <literal>sources</"
+#| "literal> command.  Configuration Item: <literal>APT::FTPArchive::"
+#| "SourceOverride</literal>."
+msgid ""
+"Add the given value to the <literal>Comment:</literal> field in history.log "
+"Configuration Item: <literal>APT::History::Comment</literal>."
+msgstr ""
+"Selecciona el fichero de fuentes alternativo a usar con la orden "
+"<literal>sources</literal>. Opción de configuración: <literal>APT::"
+"FTPArchive::SourceOverride</literal>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+#, fuzzy
+#| msgid ""
 #| "This option controls the architecture packages are built for by "
 #| "<command>apt-get source --compile</command> and how cross-"
 #| "builddependencies are satisfied. By default is it not set which means "
diff --git a/doc/po/fr.po b/doc/po/fr.po
index cd8ee56ec..72f91f47d 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: 2024-10-22 16:47+0000\n"
+"POT-Creation-Date: 2024-11-20 15:03+0000\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"
@@ -1835,6 +1835,21 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
+#, fuzzy
+#| msgid ""
+#| "Select the source override file to use with the <literal>sources</"
+#| "literal> command.  Configuration Item: <literal>APT::FTPArchive::"
+#| "SourceOverride</literal>."
+msgid ""
+"Add the given value to the <literal>Comment:</literal> field in history.log "
+"Configuration Item: <literal>APT::History::Comment</literal>."
+msgstr ""
+"Indique le fichier d'« override » à utiliser avec la commande "
+"<literal>sources</literal>. Élément de configuration : <literal>APT::"
+"FTPArchive::SourceOverride</literal>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
 msgid ""
 "This option controls the architecture packages are built for by <command>apt-"
 "get source --compile</command> and how cross-builddependencies are "
diff --git a/doc/po/it.po b/doc/po/it.po
index df4b65a17..47e7fa1bc 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: 2024-10-22 16:47+0000\n"
+"POT-Creation-Date: 2024-11-20 15:03+0000\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"
@@ -1876,6 +1876,21 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
+#, fuzzy
+#| msgid ""
+#| "Select the source override file to use with the <literal>sources</"
+#| "literal> command.  Configuration Item: <literal>APT::FTPArchive::"
+#| "SourceOverride</literal>."
+msgid ""
+"Add the given value to the <literal>Comment:</literal> field in history.log "
+"Configuration Item: <literal>APT::History::Comment</literal>."
+msgstr ""
+"Seleziona il file override sorgente da usare con il comando "
+"<literal>sources</literal>. Voce di configurazione <literal>APT::FTPArchive::"
+"SourceOverride</literal>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
 msgid ""
 "This option controls the architecture packages are built for by <command>apt-"
 "get source --compile</command> and how cross-builddependencies are "
diff --git a/doc/po/ja.po b/doc/po/ja.po
index 5fe37524d..d64d7434a 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: 2024-10-22 16:47+0000\n"
+"POT-Creation-Date: 2024-11-20 15:03+0000\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"
@@ -1826,6 +1826,20 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
+#, fuzzy
+#| msgid ""
+#| "Select the source override file to use with the <literal>sources</"
+#| "literal> command.  Configuration Item: <literal>APT::FTPArchive::"
+#| "SourceOverride</literal>."
+msgid ""
+"Add the given value to the <literal>Comment:</literal> field in history.log "
+"Configuration Item: <literal>APT::History::Comment</literal>."
+msgstr ""
+"<literal>sources</literal> コマンドで使用する、ソースオーバーライドファイルを"
+"選択します。設定項目: <literal>APT::FTPArchive::SourceOverride</literal>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
 msgid ""
 "This option controls the architecture packages are built for by <command>apt-"
 "get source --compile</command> and how cross-builddependencies are "
diff --git a/doc/po/nl.po b/doc/po/nl.po
index d9c5766c9..31108f3ce 100644
--- a/doc/po/nl.po
+++ b/doc/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 2.9.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2024-10-22 16:47+0000\n"
+"POT-Creation-Date: 2024-11-20 15:03+0000\n"
 "PO-Revision-Date: 2024-06-22 20:18+0200\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
@@ -1879,6 +1879,21 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
+#, fuzzy
+#| msgid ""
+#| "Select the source override file to use with the <literal>sources</"
+#| "literal> command.  Configuration Item: <literal>APT::FTPArchive::"
+#| "SourceOverride</literal>."
+msgid ""
+"Add the given value to the <literal>Comment:</literal> field in history.log "
+"Configuration Item: <literal>APT::History::Comment</literal>."
+msgstr ""
+"Het override-bestand voor broncode selecteren om met het commando "
+"<literal>sources</literal> te gebruiken. Configuratie-item: <literal>APT::"
+"FTPArchive::SourceOverride</literal>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
 msgid ""
 "This option controls the architecture packages are built for by <command>apt-"
 "get source --compile</command> and how cross-builddependencies are "
diff --git a/doc/po/pl.po b/doc/po/pl.po
index c2c239344..7756eb170 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: 2024-10-22 16:47+0000\n"
+"POT-Creation-Date: 2024-11-20 15:03+0000\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"
@@ -1857,6 +1857,18 @@ msgstr ""
 "Ponownie instaluje pakiety, których najnowsza wersja już jest zainstalowana "
 "Pozycja w pliku konfiguracyjnym: <literal>APT::Get::ReInstall</literal>."
 
+#
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+#, fuzzy
+msgid ""
+"Add the given value to the <literal>Comment:</literal> field in history.log "
+"Configuration Item: <literal>APT::History::Comment</literal>."
+msgstr ""
+"Ogranicza wyjście poleceń <literal>depends</literal> i <literal>rdepends</"
+"literal> tylko do pakietów, które są obecnie zainstalowane.  Pozycja w pliku "
+"konfiguracyjnym: <literal>APT::Cache::Installed</literal>."
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 #, fuzzy
diff --git a/doc/po/pt.po b/doc/po/pt.po
index aa2019dd2..274b97f72 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 2.9.10\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2024-10-22 16:47+0000\n"
+"POT-Creation-Date: 2024-11-20 15:03+0000\n"
 "PO-Revision-Date: 2024-10-29 23:10+0000\n"
 "Last-Translator: Américo Monteiro <a_monteiro@gmx.com>\n"
 "Language-Team: Portuguese <>\n"
@@ -1835,6 +1835,21 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
+#, fuzzy
+#| msgid ""
+#| "Select the source override file to use with the <literal>sources</"
+#| "literal> command.  Configuration Item: <literal>APT::FTPArchive::"
+#| "SourceOverride</literal>."
+msgid ""
+"Add the given value to the <literal>Comment:</literal> field in history.log "
+"Configuration Item: <literal>APT::History::Comment</literal>."
+msgstr ""
+"Seleciona o ficheiro de sobreposição de fonte a usar com o comando "
+"<literal>sources</literal>. Item de Configuração: <literal>APT::FTPArchive::"
+"SourceOverride</literal>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
 msgid ""
 "This option controls the architecture packages are built for by <command>apt-"
 "get source --compile</command> and how cross-builddependencies are "
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index b07af666f..dc6e610bf 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: 2024-10-22 16:47+0000\n"
+"POT-Creation-Date: 2024-11-20 15:03+0000\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"
@@ -1299,6 +1299,13 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
+"Add the given value to the <literal>Comment:</literal> field in history.log "
+"Configuration Item: <literal>APT::History::Comment</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
 "This option controls the architecture packages are built for by <command>apt-"
 "get source --compile</command> and how cross-builddependencies are "
 "satisfied. By default is it not set which means that the host architecture "
diff --git a/po/apt-all.pot b/po/apt-all.pot
index 11a40ce48..a8bc521d4 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 2.9.12\n"
+"Project-Id-Version: apt 2.9.13\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2024-11-18 14:04+0000\n"
+"POT-Creation-Date: 2024-11-20 15:03+0000\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"