Release 2.9.52.9.5

15 files changed, 110 insertions, 53 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 50d7884e7..a457110a9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -206,7 +206,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.4")
+set(PACKAGE_VERSION "2.9.5")
 string(REGEX MATCH "^[0-9.]+" PROJECT_VERSION ${PACKAGE_VERSION})
 
 if (NOT DEFINED DPKG_DATADIR)
diff --git a/debian/changelog b/debian/changelog
index c58a96d94..35b62bcd0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,26 @@
+apt (2.9.5) unstable; urgency=medium
+
+  [ Julian Andres Klode ]
+  * CI: Set /bin/sh shell for travis user, so flock -c works
+  * Fix test cases for non-amd64 architectures
+  * edsp: Parse source version from the Source-Version field
+  * Check gpgv --dump-options for --assert-pubkey-algo support.
+    Thanks to Justus Winter for the idea
+  * Make the failure mode for non-executable tests stronger
+  * solver3: Do not dump sizes that are clearly pointers
+  * solver3: Group work items
+  * solver3: Remove no longer necessary comparisons
+  * solver3: Order obsolete choices last
+
+  [ Noah Meyerhans ]
+  * Fix spelling of @SNAPSHOTID@ in apt.conf.5.xml (Closes: #1072189)
+
+  [ Frans Spiesschaert ]
+  * Dutch program translation update (Closes: #1072493)
+  * Dutch manpages translation update (Closes: #1072494)
+
+ -- Julian Andres Klode <jak@debian.org>  Thu, 13 Jun 2024 21:04:40 +0200
+
 apt (2.9.4) unstable; urgency=medium
 
   [ David Kalnischkies ]
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index c462ecdc0..f849c0c69 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.4">
+<!ENTITY apt-product-version "2.9.5">
 
 <!-- (Code)names for various things used all over the place -->
 <!ENTITY debian-oldstable-codename "bullseye">
diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml
index ced2c2064..702a71c78 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>2024-04-19T00:00:00Z</date>
+   <date>2024-05-30T00:00:00Z</date>
  </refentryinfo>
  
  <refmeta>
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index aab31f740..979992b28 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.4\n"
+"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-05-25 09:01+0000\n"
+"POT-Creation-Date: 2024-06-13 19:06+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"
@@ -4016,7 +4016,7 @@ msgid ""
 "or "
 "<literal>Acquire::Snapshots::URI::Override::Origin::<replaceable>ORIGIN</replaceable></literal>.  "
 "The value should be a normal URI to a directory, except that the snapshot ID "
-"replaced with the placeholder <literal>@SNAPSHOTID</literal>.  The special "
+"replaced with the placeholder <literal>@SNAPSHOTID@</literal>.  The special "
 "value '<literal>no</literal>' is available for this option indicating that "
 "this source cannot be used to acquire snapshots from. Another source will be "
 "tried if available in this case."
diff --git a/doc/po/de.po b/doc/po/de.po
index 4675d1258..ab028354d 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-04-22 17:38+0000\n"
+"POT-Creation-Date: 2024-06-13 19:06+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"
@@ -5773,10 +5773,10 @@ msgid ""
 "replaceable></literal> or <literal>Acquire::Snapshots::URI::Override::"
 "Origin::<replaceable>ORIGIN</replaceable></literal>.  The value should be a "
 "normal URI to a directory, except that the snapshot ID replaced with the "
-"placeholder <literal>@SNAPSHOTID</literal>.  The special value '<literal>no</"
-"literal>' is available for this option indicating that this source cannot be "
-"used to acquire snapshots from. Another source will be tried if available in "
-"this case."
+"placeholder <literal>@SNAPSHOTID@</literal>.  The special value "
+"'<literal>no</literal>' is available for this option indicating that this "
+"source cannot be used to acquire snapshots from. Another source will be "
+"tried if available in this case."
 msgstr ""
 "Changelogs können nur beschafft werden, falls ein URI bekannt ist, von dem "
 "sie geholt werden können. Vorzugsweise gibt die Release-Datei ihn in einem "
diff --git a/doc/po/es.po b/doc/po/es.po
index c3c606774..5e2dc9276 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-04-22 17:38+0000\n"
+"POT-Creation-Date: 2024-06-13 19:06+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"
@@ -5674,10 +5674,10 @@ msgid ""
 "replaceable></literal> or <literal>Acquire::Snapshots::URI::Override::"
 "Origin::<replaceable>ORIGIN</replaceable></literal>.  The value should be a "
 "normal URI to a directory, except that the snapshot ID replaced with the "
-"placeholder <literal>@SNAPSHOTID</literal>.  The special value '<literal>no</"
-"literal>' is available for this option indicating that this source cannot be "
-"used to acquire snapshots from. Another source will be tried if available in "
-"this case."
+"placeholder <literal>@SNAPSHOTID@</literal>.  The special value "
+"'<literal>no</literal>' is available for this option indicating that this "
+"source cannot be used to acquire snapshots from. Another source will be "
+"tried if available in this case."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
diff --git a/doc/po/fr.po b/doc/po/fr.po
index d0419ecbe..d2166e3f2 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-04-22 17:38+0000\n"
+"POT-Creation-Date: 2024-06-13 19:06+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"
@@ -5752,10 +5752,10 @@ msgid ""
 "replaceable></literal> or <literal>Acquire::Snapshots::URI::Override::"
 "Origin::<replaceable>ORIGIN</replaceable></literal>.  The value should be a "
 "normal URI to a directory, except that the snapshot ID replaced with the "
-"placeholder <literal>@SNAPSHOTID</literal>.  The special value '<literal>no</"
-"literal>' is available for this option indicating that this source cannot be "
-"used to acquire snapshots from. Another source will be tried if available in "
-"this case."
+"placeholder <literal>@SNAPSHOTID@</literal>.  The special value "
+"'<literal>no</literal>' is available for this option indicating that this "
+"source cannot be used to acquire snapshots from. Another source will be "
+"tried if available in this case."
 msgstr ""
 "La récupération des journaux des modifications n'est possible que si l'URI "
 "où les télécharger est connu. De préférence, le fichier Release l'indique "
diff --git a/doc/po/it.po b/doc/po/it.po
index 120fd9fad..20af323ba 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-04-22 17:38+0000\n"
+"POT-Creation-Date: 2024-06-13 19:06+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"
@@ -5743,10 +5743,10 @@ msgid ""
 "replaceable></literal> or <literal>Acquire::Snapshots::URI::Override::"
 "Origin::<replaceable>ORIGIN</replaceable></literal>.  The value should be a "
 "normal URI to a directory, except that the snapshot ID replaced with the "
-"placeholder <literal>@SNAPSHOTID</literal>.  The special value '<literal>no</"
-"literal>' is available for this option indicating that this source cannot be "
-"used to acquire snapshots from. Another source will be tried if available in "
-"this case."
+"placeholder <literal>@SNAPSHOTID@</literal>.  The special value "
+"'<literal>no</literal>' is available for this option indicating that this "
+"source cannot be used to acquire snapshots from. Another source will be "
+"tried if available in this case."
 msgstr ""
 "L'acquisizione di changelog è possibile solamente se è noto un URI da cui "
 "ottenerli. Il file Release indica questa informazione preferibilmente in un "
diff --git a/doc/po/ja.po b/doc/po/ja.po
index ad96ef548..822c41ca5 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-04-22 17:38+0000\n"
+"POT-Creation-Date: 2024-06-13 19:06+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"
@@ -5535,10 +5535,10 @@ msgid ""
 "replaceable></literal> or <literal>Acquire::Snapshots::URI::Override::"
 "Origin::<replaceable>ORIGIN</replaceable></literal>.  The value should be a "
 "normal URI to a directory, except that the snapshot ID replaced with the "
-"placeholder <literal>@SNAPSHOTID</literal>.  The special value '<literal>no</"
-"literal>' is available for this option indicating that this source cannot be "
-"used to acquire snapshots from. Another source will be tried if available in "
-"this case."
+"placeholder <literal>@SNAPSHOTID@</literal>.  The special value "
+"'<literal>no</literal>' is available for this option indicating that this "
+"source cannot be used to acquire snapshots from. Another source will be "
+"tried if available in this case."
 msgstr ""
 "URI は、それらを取得する場所から知られている場合は、変更履歴の取得のみ行うこ"
 "とができます。好ましいリリースファイルは、「変更履歴」フィールドでこのことを"
diff --git a/doc/po/nl.po b/doc/po/nl.po
index b014c144a..f31bbcca5 100644
--- a/doc/po/nl.po
+++ b/doc/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 2.9.3\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2024-06-11 12:58+0000\n"
+"POT-Creation-Date: 2024-06-13 19:06+0000\n"
 "PO-Revision-Date: 2024-05-21 23:41+0200\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
@@ -5864,6 +5864,23 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
+#, fuzzy
+#| msgid ""
+#| "Like changelogs, snapshots can only be acquired if an URI is known from "
+#| "where to get them.  Preferable the Release file indicates this in a "
+#| "'Snapshots' field. If this isn't available the Label/Origin field of the "
+#| "Release file is used to check if a <literal>Acquire::Snapshots::URI::"
+#| "Label::<replaceable>LABEL</replaceable></literal> or <literal>Acquire::"
+#| "Snapshots::URI::Origin::<replaceable>ORIGIN</replaceable></literal> "
+#| "option exists and if so this value is taken. The value in the Release "
+#| "file can be overridden with <literal>Acquire::Snapshots::URI::Override::"
+#| "Label::<replaceable>LABEL</replaceable></literal> or <literal>Acquire::"
+#| "Snapshots::URI::Override::Origin::<replaceable>ORIGIN</replaceable></"
+#| "literal>.  The value should be a normal URI to a directory, except that "
+#| "the snapshot ID replaced with the placeholder <literal>@SNAPSHOTID</"
+#| "literal>.  The special value '<literal>no</literal>' is available for "
+#| "this option indicating that this source cannot be used to acquire "
+#| "snapshots from. Another source will be tried if available in this case."
 msgid ""
 "Like changelogs, snapshots can only be acquired if an URI is known from "
 "where to get them.  Preferable the Release file indicates this in a "
@@ -5876,10 +5893,10 @@ msgid ""
 "replaceable></literal> or <literal>Acquire::Snapshots::URI::Override::"
 "Origin::<replaceable>ORIGIN</replaceable></literal>.  The value should be a "
 "normal URI to a directory, except that the snapshot ID replaced with the "
-"placeholder <literal>@SNAPSHOTID</literal>.  The special value '<literal>no</"
-"literal>' is available for this option indicating that this source cannot be "
-"used to acquire snapshots from. Another source will be tried if available in "
-"this case."
+"placeholder <literal>@SNAPSHOTID@</literal>.  The special value "
+"'<literal>no</literal>' is available for this option indicating that this "
+"source cannot be used to acquire snapshots from. Another source will be "
+"tried if available in this case."
 msgstr ""
 "Zoals changelogs (bestanden met de registratie van aangebrachte wijzigingen) "
 "kunnen momentopnames enkel verkregen worden als er een URI gekend is waar ze "
diff --git a/doc/po/pl.po b/doc/po/pl.po
index c3ef57e97..92574fd53 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-04-22 17:38+0000\n"
+"POT-Creation-Date: 2024-06-13 19:06+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"
@@ -5328,10 +5328,10 @@ msgid ""
 "replaceable></literal> or <literal>Acquire::Snapshots::URI::Override::"
 "Origin::<replaceable>ORIGIN</replaceable></literal>.  The value should be a "
 "normal URI to a directory, except that the snapshot ID replaced with the "
-"placeholder <literal>@SNAPSHOTID</literal>.  The special value '<literal>no</"
-"literal>' is available for this option indicating that this source cannot be "
-"used to acquire snapshots from. Another source will be tried if available in "
-"this case."
+"placeholder <literal>@SNAPSHOTID@</literal>.  The special value "
+"'<literal>no</literal>' is available for this option indicating that this "
+"source cannot be used to acquire snapshots from. Another source will be "
+"tried if available in this case."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
diff --git a/doc/po/pt.po b/doc/po/pt.po
index 67a70d9bc..715f80ca1 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 2.7.3\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2024-04-22 17:38+0000\n"
+"POT-Creation-Date: 2024-06-13 19:06+0000\n"
 "PO-Revision-Date: 2023-09-11 20:47+0100\n"
 "Last-Translator: Américo Monteiro <a_monteiro@gmx.com>\n"
 "Language-Team: Portuguese <>\n"
@@ -5708,6 +5708,23 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
+#, fuzzy
+#| msgid ""
+#| "Like changelogs, snapshots can only be acquired if an URI is known from "
+#| "where to get them.  Preferable the Release file indicates this in a "
+#| "'Snapshots' field. If this isn't available the Label/Origin field of the "
+#| "Release file is used to check if a <literal>Acquire::Snapshots::URI::"
+#| "Label::<replaceable>LABEL</replaceable></literal> or <literal>Acquire::"
+#| "Snapshots::URI::Origin::<replaceable>ORIGIN</replaceable></literal> "
+#| "option exists and if so this value is taken. The value in the Release "
+#| "file can be overridden with <literal>Acquire::Snapshots::URI::Override::"
+#| "Label::<replaceable>LABEL</replaceable></literal> or <literal>Acquire::"
+#| "Snapshots::URI::Override::Origin::<replaceable>ORIGIN</replaceable></"
+#| "literal>.  The value should be a normal URI to a directory, except that "
+#| "the snapshot ID replaced with the placeholder <literal>@SNAPSHOTID</"
+#| "literal>.  The special value '<literal>no</literal>' is available for "
+#| "this option indicating that this source cannot be used to acquire "
+#| "snapshots from. Another source will be tried if available in this case."
 msgid ""
 "Like changelogs, snapshots can only be acquired if an URI is known from "
 "where to get them.  Preferable the Release file indicates this in a "
@@ -5720,10 +5737,10 @@ msgid ""
 "replaceable></literal> or <literal>Acquire::Snapshots::URI::Override::"
 "Origin::<replaceable>ORIGIN</replaceable></literal>.  The value should be a "
 "normal URI to a directory, except that the snapshot ID replaced with the "
-"placeholder <literal>@SNAPSHOTID</literal>.  The special value '<literal>no</"
-"literal>' is available for this option indicating that this source cannot be "
-"used to acquire snapshots from. Another source will be tried if available in "
-"this case."
+"placeholder <literal>@SNAPSHOTID@</literal>.  The special value "
+"'<literal>no</literal>' is available for this option indicating that this "
+"source cannot be used to acquire snapshots from. Another source will be "
+"tried if available in this case."
 msgstr ""
 "Tal como changelogs, os instantâneos só podem ser adquiridos se for "
 "conhecido um URI de onde os obter. Preferencialmente o ficheiro Release "
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index 313bfaf9d..86fb1171e 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-04-22 17:38+0000\n"
+"POT-Creation-Date: 2024-06-13 19:06+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"
@@ -3960,10 +3960,10 @@ msgid ""
 "replaceable></literal> or <literal>Acquire::Snapshots::URI::Override::"
 "Origin::<replaceable>ORIGIN</replaceable></literal>.  The value should be a "
 "normal URI to a directory, except that the snapshot ID replaced with the "
-"placeholder <literal>@SNAPSHOTID</literal>.  The special value '<literal>no</"
-"literal>' is available for this option indicating that this source cannot be "
-"used to acquire snapshots from. Another source will be tried if available in "
-"this case."
+"placeholder <literal>@SNAPSHOTID@</literal>.  The special value "
+"'<literal>no</literal>' is available for this option indicating that this "
+"source cannot be used to acquire snapshots from. Another source will be "
+"tried if available in this case."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
diff --git a/po/apt-all.pot b/po/apt-all.pot
index bafe73e05..51f7bf3e8 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 2.9.4\n"
+"Project-Id-Version: apt 2.9.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2024-05-25 09:01+0000\n"
+"POT-Creation-Date: 2024-06-13 19:06+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"