From 4a73fd686a882dd9cae0e6a44a0f4e23602d9d6f Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 18 Oct 2021 16:36:14 +0200 Subject: Release 2.3.10 --- CMakeLists.txt | 2 +- debian/changelog | 24 +++++++++++++++++ doc/apt-patterns.7.xml | 2 +- doc/apt-verbatim.ent | 2 +- doc/po/apt-doc.pot | 43 +++++++++++++++++++++++++++--- doc/po/de.po | 72 ++++++++++++++++++++++++++++++++++++++++++++++++-- doc/po/es.po | 42 +++++++++++++++++++++++++++-- doc/po/fr.po | 62 +++++++++++++++++++++++++++++++++++++++++-- doc/po/it.po | 46 ++++++++++++++++++++++++++++++-- doc/po/ja.po | 42 +++++++++++++++++++++++++++-- doc/po/nl.po | 72 ++++++++++++++++++++++++++++++++++++++++++++++++-- doc/po/pl.po | 42 +++++++++++++++++++++++++++-- doc/po/pt.po | 72 ++++++++++++++++++++++++++++++++++++++++++++++++-- doc/po/pt_BR.po | 42 +++++++++++++++++++++++++++-- doc/sources.list.5.xml | 2 +- po/apt-all.pot | 4 +-- 16 files changed, 544 insertions(+), 27 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 25a3e11c7..fd58658ff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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.3.9") +set(PACKAGE_VERSION "2.3.10") string(REGEX MATCH "^[0-9.]+" PROJECT_VERSION ${PACKAGE_VERSION}) if (NOT DEFINED DPKG_DATADIR) diff --git a/debian/changelog b/debian/changelog index 0a10fb52d..40bc69d72 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,27 @@ +apt (2.3.10) unstable; urgency=medium + + [ Julian Andres Klode ] + * basehttp: Turn HaveContent into a TriState + * Set haveContent to FALSE on `Content-Length: 0` (Closes: #990281) + * Add support for embedding PGP keys into Signed-By in deb822 sources + + [ David Kalnischkies ] + * All pkgCaches are MultiArch caches + * Do not strip M-A for native build-dep resolution + * Do not make provides of M-A:allowed implicit M-A:foreign + * Barbarian M-A:allowed don't satisfy :any deps of other archs + * Streamline access to barbarian architecture functionality + * Read and work with canonical file-URIs from sources.lists + * Use https config on https proxies for http servers (Closes: #990555) + * Add AllowRange option to disable HTTP Range usage + * Disable HTTP Range usage if varnish < 6.4 is involved + * Use exact If-Range match in our test webserver + + [ Johannes Schauer Marin Rodrigues ] + * add pattern to select packages by priority (closes: #989558) + + -- Julian Andres Klode Mon, 18 Oct 2021 16:35:21 +0200 + apt (2.3.9) unstable; urgency=medium [ Frans Spiesschaert ] diff --git a/doc/apt-patterns.7.xml b/doc/apt-patterns.7.xml index 817ba9fa9..6b1c0f20b 100644 --- a/doc/apt-patterns.7.xml +++ b/doc/apt-patterns.7.xml @@ -13,7 +13,7 @@ &apt-email; &apt-product; - 2020-12-27T00:00:00Z + 2021-09-07T00:00:00Z diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index 41fdb51be..7d5a53c7e 100644 --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@ -274,7 +274,7 @@ "> - + diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 383e3cd75..886343fb4 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.3.9\n" +"Project-Id-Version: apt-doc 2.3.10\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2021-09-07 17:26+0200\n" +"POT-Creation-Date: 2021-10-18 16:36+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -5779,6 +5779,26 @@ msgid "" "value can't be set explicitly." msgstr "" +#. type: Content of: +#: sources.list.5.xml +#, no-wrap +msgid "" +"Types: deb\n" +"URIs: https://deb.debian.org\n" +"Suites: stable\n" +"Components: main contrib non-free\n" +"Signed-By:\n" +" -----BEGIN PGP PUBLIC KEY BLOCK-----\n" +" .\n" +" mDMEYCQjIxYJKwYBBAHaRw8BAQdAD/P5Nvvnvk66SxBBHDbhRml9ORg1WV5CvzKY\n" +" CuMfoIS0BmFiY2RlZoiQBBMWCgA4FiEErCIG1VhKWMWo2yfAREZd5NfO31cFAmAk\n" +" IyMCGyMFCwkIBwMFFQoJCAsFFgIDAQACHgECF4AACgkQREZd5NfO31fbOwD6ArzS\n" +" dM0Dkd5h2Ujy1b6KcAaVW9FOa5UNfJ9FFBtjLQEBAJ7UyWD3dZzhvlaAwunsk7DG\n" +" 3bHcln8DMpIJVXht78sL\n" +" =IE0r\n" +" -----END PGP PUBLIC KEY BLOCK-----" +msgstr "" + #. type: Content of: #: sources.list.5.xml msgid "" @@ -5799,7 +5819,9 @@ msgid "" "name if set in the previously acquired Release file of " "this repository (only fingerprints can be specified there through). " "Otherwise all keys in the trusted keyrings are considered valid signers for " -"this repository." +"this repository. The option may also be set directly to an embedded GPG " +"public key block. Special care is needed to encode the empty line with " +"leading spaces and \".\": " msgstr "" #. type: Content of: @@ -8323,6 +8345,21 @@ msgid "" "expression." msgstr "" +#. type: Content of: +#: apt-patterns.7.xml +msgid "?priority(NAME)" +msgstr "" + +#. type: Content of: +#: apt-patterns.7.xml +msgid "~pNAME" +msgstr "" + +#. type: Content of: +#: apt-patterns.7.xml +msgid "Selects versions where the Priority string equals the given name." +msgstr "" + #. type: Content of: #: apt-patterns.7.xml msgid "Package relationship patterns" diff --git a/doc/po/de.po b/doc/po/de.po index 47356ff69..05aabe9f4 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: 2021-07-29 17:00+0200\n" +"POT-Creation-Date: 2021-10-18 16:36+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" @@ -8305,8 +8305,48 @@ msgstr "" "Authentifizierungsprüfungen erfolgreich durchläuft. Der Vorgabewert kann " "nicht explizit gesetzt werden." +#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para><literallayout> +#: sources.list.5.xml +#, no-wrap +msgid "" +"Types: deb\n" +"URIs: https://deb.debian.org\n" +"Suites: stable\n" +"Components: main contrib non-free\n" +"Signed-By:\n" +" -----BEGIN PGP PUBLIC KEY BLOCK-----\n" +" .\n" +" mDMEYCQjIxYJKwYBBAHaRw8BAQdAD/P5Nvvnvk66SxBBHDbhRml9ORg1WV5CvzKY\n" +" CuMfoIS0BmFiY2RlZoiQBBMWCgA4FiEErCIG1VhKWMWo2yfAREZd5NfO31cFAmAk\n" +" IyMCGyMFCwkIBwMFFQoJCAsFFgIDAQACHgECF4AACgkQREZd5NfO31fbOwD6ArzS\n" +" dM0Dkd5h2Ujy1b6KcAaVW9FOa5UNfJ9FFBtjLQEBAJ7UyWD3dZzhvlaAwunsk7DG\n" +" 3bHcln8DMpIJVXht78sL\n" +" =IE0r\n" +" -----END PGP PUBLIC KEY BLOCK-----" +msgstr "" + #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> #: sources.list.5.xml +#, fuzzy +#| msgid "" +#| "<option>Signed-By</option> (<option>signed-by</option>) is an option to " +#| "require a repository to pass &apt-secure; verification with a certain set " +#| "of keys rather than all trusted keys apt has configured. It is specified " +#| "as a list of absolute paths to keyring files (have to be accessible and " +#| "readable for the <literal>_apt</literal> system user, so ensure everyone " +#| "has read-permissions on the file) and fingerprints of keys to select from " +#| "these keyrings. If no keyring files are specified the default is the " +#| "<filename>trusted.gpg</filename> keyring and all keyrings in the " +#| "<filename>trusted.gpg.d/</filename> directory (see <command>apt-key " +#| "fingerprint</command>). If no fingerprint is specified all keys in the " +#| "keyrings are selected. A fingerprint will accept also all signatures by a " +#| "subkey of this key, if this isn't desired an exclamation mark (<literal>!" +#| "</literal>) can be appended to the fingerprint to disable this " +#| "behaviour. The option defaults to the value of the option with the same " +#| "name if set in the previously acquired <filename>Release</filename> file " +#| "of this repository (only fingerprints can be specified there through). " +#| "Otherwise all keys in the trusted keyrings are considered valid signers " +#| "for this repository." msgid "" "<option>Signed-By</option> (<option>signed-by</option>) is an option to " "require a repository to pass &apt-secure; verification with a certain set of " @@ -8324,7 +8364,10 @@ msgid "" "option defaults to the value of the option with the same name if set in the " "previously acquired <filename>Release</filename> file of this repository " "(only fingerprints can be specified there through). Otherwise all keys in " -"the trusted keyrings are considered valid signers for this repository." +"the trusted keyrings are considered valid signers for this repository. The " +"option may also be set directly to an embedded GPG public key block. Special " +"care is needed to encode the empty line with leading spaces and \".\": " +"<placeholder type=\"literallayout\" id=\"0\"/>" msgstr "" "<option>Signed-By</option> (<option>signed-by</option>) ist eine Option, die " "erfordert, dass ein Depot die &apt-secure;-Prüfung mit einem bestimmten Satz " @@ -11792,6 +11835,31 @@ msgstr "" "wählt Versionen aus, bei denen die Versionszeichenkette auf den angegebenen " "regulären Ausdruck passt." +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-patterns.7.xml +#, fuzzy +#| msgid "<code>?not(PATTERN)</code>" +msgid "<code>?priority(NAME)</code>" +msgstr "<code>?not(MUSTER)</code>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-patterns.7.xml +#, fuzzy +#| msgid "<code>~E</code>" +msgid "<code>~pNAME</code>" +msgstr "<code>~E</code>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-patterns.7.xml +#, fuzzy +#| msgid "" +#| "Selects versions where the version string matches the specified regular " +#| "expression." +msgid "Selects versions where the Priority string equals the given name." +msgstr "" +"wählt Versionen aus, bei denen die Versionszeichenkette auf den angegebenen " +"regulären Ausdruck passt." + #. type: Content of: <refentry><refsect1><title> #: apt-patterns.7.xml #, fuzzy diff --git a/doc/po/es.po b/doc/po/es.po index 94ebb9360..74a757c10 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: 2021-07-29 17:00+0200\n" +"POT-Creation-Date: 2021-10-18 16:36+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" @@ -8160,6 +8160,26 @@ msgid "" "can't be set explicitly." msgstr "" +#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para><literallayout> +#: sources.list.5.xml +#, no-wrap +msgid "" +"Types: deb\n" +"URIs: https://deb.debian.org\n" +"Suites: stable\n" +"Components: main contrib non-free\n" +"Signed-By:\n" +" -----BEGIN PGP PUBLIC KEY BLOCK-----\n" +" .\n" +" mDMEYCQjIxYJKwYBBAHaRw8BAQdAD/P5Nvvnvk66SxBBHDbhRml9ORg1WV5CvzKY\n" +" CuMfoIS0BmFiY2RlZoiQBBMWCgA4FiEErCIG1VhKWMWo2yfAREZd5NfO31cFAmAk\n" +" IyMCGyMFCwkIBwMFFQoJCAsFFgIDAQACHgECF4AACgkQREZd5NfO31fbOwD6ArzS\n" +" dM0Dkd5h2Ujy1b6KcAaVW9FOa5UNfJ9FFBtjLQEBAJ7UyWD3dZzhvlaAwunsk7DG\n" +" 3bHcln8DMpIJVXht78sL\n" +" =IE0r\n" +" -----END PGP PUBLIC KEY BLOCK-----" +msgstr "" + #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> #: sources.list.5.xml msgid "" @@ -8179,7 +8199,10 @@ msgid "" "option defaults to the value of the option with the same name if set in the " "previously acquired <filename>Release</filename> file of this repository " "(only fingerprints can be specified there through). Otherwise all keys in " -"the trusted keyrings are considered valid signers for this repository." +"the trusted keyrings are considered valid signers for this repository. The " +"option may also be set directly to an embedded GPG public key block. Special " +"care is needed to encode the empty line with leading spaces and \".\": " +"<placeholder type=\"literallayout\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> @@ -11239,6 +11262,21 @@ msgid "" "expression." msgstr "" +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-patterns.7.xml +msgid "<code>?priority(NAME)</code>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-patterns.7.xml +msgid "<code>~pNAME</code>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-patterns.7.xml +msgid "Selects versions where the Priority string equals the given name." +msgstr "" + #. type: Content of: <refentry><refsect1><title> #: apt-patterns.7.xml msgid "Package relationship patterns" diff --git a/doc/po/fr.po b/doc/po/fr.po index b528b1dbb..07fee6795 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: 2021-07-29 17:00+0200\n" +"POT-Creation-Date: 2021-10-18 16:36+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" @@ -8256,8 +8256,48 @@ msgstr "" "comme non sûre, même si les tests d'authentification sont réussis. La valeur " "par défaut ne peut pas être définie explicitement." +#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para><literallayout> +#: sources.list.5.xml +#, no-wrap +msgid "" +"Types: deb\n" +"URIs: https://deb.debian.org\n" +"Suites: stable\n" +"Components: main contrib non-free\n" +"Signed-By:\n" +" -----BEGIN PGP PUBLIC KEY BLOCK-----\n" +" .\n" +" mDMEYCQjIxYJKwYBBAHaRw8BAQdAD/P5Nvvnvk66SxBBHDbhRml9ORg1WV5CvzKY\n" +" CuMfoIS0BmFiY2RlZoiQBBMWCgA4FiEErCIG1VhKWMWo2yfAREZd5NfO31cFAmAk\n" +" IyMCGyMFCwkIBwMFFQoJCAsFFgIDAQACHgECF4AACgkQREZd5NfO31fbOwD6ArzS\n" +" dM0Dkd5h2Ujy1b6KcAaVW9FOa5UNfJ9FFBtjLQEBAJ7UyWD3dZzhvlaAwunsk7DG\n" +" 3bHcln8DMpIJVXht78sL\n" +" =IE0r\n" +" -----END PGP PUBLIC KEY BLOCK-----" +msgstr "" + #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> #: sources.list.5.xml +#, fuzzy +#| msgid "" +#| "<option>Signed-By</option> (<option>signed-by</option>) is an option to " +#| "require a repository to pass &apt-secure; verification with a certain set " +#| "of keys rather than all trusted keys apt has configured. It is specified " +#| "as a list of absolute paths to keyring files (have to be accessible and " +#| "readable for the <literal>_apt</literal> system user, so ensure everyone " +#| "has read-permissions on the file) and fingerprints of keys to select from " +#| "these keyrings. If no keyring files are specified the default is the " +#| "<filename>trusted.gpg</filename> keyring and all keyrings in the " +#| "<filename>trusted.gpg.d/</filename> directory (see <command>apt-key " +#| "fingerprint</command>). If no fingerprint is specified all keys in the " +#| "keyrings are selected. A fingerprint will accept also all signatures by a " +#| "subkey of this key, if this isn't desired an exclamation mark (<literal>!" +#| "</literal>) can be appended to the fingerprint to disable this " +#| "behaviour. The option defaults to the value of the option with the same " +#| "name if set in the previously acquired <filename>Release</filename> file " +#| "of this repository (only fingerprints can be specified there through). " +#| "Otherwise all keys in the trusted keyrings are considered valid signers " +#| "for this repository." msgid "" "<option>Signed-By</option> (<option>signed-by</option>) is an option to " "require a repository to pass &apt-secure; verification with a certain set of " @@ -8275,7 +8315,10 @@ msgid "" "option defaults to the value of the option with the same name if set in the " "previously acquired <filename>Release</filename> file of this repository " "(only fingerprints can be specified there through). Otherwise all keys in " -"the trusted keyrings are considered valid signers for this repository." +"the trusted keyrings are considered valid signers for this repository. The " +"option may also be set directly to an embedded GPG public key block. Special " +"care is needed to encode the empty line with leading spaces and \".\": " +"<placeholder type=\"literallayout\" id=\"0\"/>" msgstr "" "<option>Signed-By</option> (<option>signed-by</option>) est une option pour " "demander la vérification d’un dépot par &apt-secure; avec un certain jeu de " @@ -11684,6 +11727,21 @@ msgid "" "expression." msgstr "" +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-patterns.7.xml +msgid "<code>?priority(NAME)</code>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-patterns.7.xml +msgid "<code>~pNAME</code>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-patterns.7.xml +msgid "Selects versions where the Priority string equals the given name." +msgstr "" + #. type: Content of: <refentry><refsect1><title> #: apt-patterns.7.xml #, fuzzy diff --git a/doc/po/it.po b/doc/po/it.po index f3002aa4e..88c73e117 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: 2021-07-29 17:00+0200\n" +"POT-Creation-Date: 2021-10-18 16:36+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" @@ -8269,6 +8269,26 @@ msgstr "" "superati con successo. Il valore predefinito non può essere impostato " "esplicitamente." +#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para><literallayout> +#: sources.list.5.xml +#, no-wrap +msgid "" +"Types: deb\n" +"URIs: https://deb.debian.org\n" +"Suites: stable\n" +"Components: main contrib non-free\n" +"Signed-By:\n" +" -----BEGIN PGP PUBLIC KEY BLOCK-----\n" +" .\n" +" mDMEYCQjIxYJKwYBBAHaRw8BAQdAD/P5Nvvnvk66SxBBHDbhRml9ORg1WV5CvzKY\n" +" CuMfoIS0BmFiY2RlZoiQBBMWCgA4FiEErCIG1VhKWMWo2yfAREZd5NfO31cFAmAk\n" +" IyMCGyMFCwkIBwMFFQoJCAsFFgIDAQACHgECF4AACgkQREZd5NfO31fbOwD6ArzS\n" +" dM0Dkd5h2Ujy1b6KcAaVW9FOa5UNfJ9FFBtjLQEBAJ7UyWD3dZzhvlaAwunsk7DG\n" +" 3bHcln8DMpIJVXht78sL\n" +" =IE0r\n" +" -----END PGP PUBLIC KEY BLOCK-----" +msgstr "" + #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> #: sources.list.5.xml #, fuzzy @@ -8302,7 +8322,10 @@ msgid "" "option defaults to the value of the option with the same name if set in the " "previously acquired <filename>Release</filename> file of this repository " "(only fingerprints can be specified there through). Otherwise all keys in " -"the trusted keyrings are considered valid signers for this repository." +"the trusted keyrings are considered valid signers for this repository. The " +"option may also be set directly to an embedded GPG public key block. Special " +"care is needed to encode the empty line with leading spaces and \".\": " +"<placeholder type=\"literallayout\" id=\"0\"/>" msgstr "" "<option>Signed-By</option> (<option>signed-by</option>) è un percorso " "assoluto ad un file di portachiavi (deve essere accessibile e leggibile " @@ -11467,6 +11490,25 @@ msgid "" "expression." msgstr "" +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-patterns.7.xml +#, fuzzy +#| msgid "<option>--installed</option>" +msgid "<code>?priority(NAME)</code>" +msgstr "<option>--installed</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-patterns.7.xml +#, fuzzy +#| msgid "<option>--installed</option>" +msgid "<code>~pNAME</code>" +msgstr "<option>--installed</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-patterns.7.xml +msgid "Selects versions where the Priority string equals the given name." +msgstr "" + #. type: Content of: <refentry><refsect1><title> #: apt-patterns.7.xml #, fuzzy diff --git a/doc/po/ja.po b/doc/po/ja.po index 68bcb417a..de678da9a 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: 2021-07-29 17:00+0200\n" +"POT-Creation-Date: 2021-10-18 16:36+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" @@ -7933,6 +7933,26 @@ msgstr "" "literal> は反対のことを行います。認証チェックに合格した場合でも取得元を信頼で" "きないとして扱います。デフォルト値は明示的に設定することはできません。" +#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para><literallayout> +#: sources.list.5.xml +#, no-wrap +msgid "" +"Types: deb\n" +"URIs: https://deb.debian.org\n" +"Suites: stable\n" +"Components: main contrib non-free\n" +"Signed-By:\n" +" -----BEGIN PGP PUBLIC KEY BLOCK-----\n" +" .\n" +" mDMEYCQjIxYJKwYBBAHaRw8BAQdAD/P5Nvvnvk66SxBBHDbhRml9ORg1WV5CvzKY\n" +" CuMfoIS0BmFiY2RlZoiQBBMWCgA4FiEErCIG1VhKWMWo2yfAREZd5NfO31cFAmAk\n" +" IyMCGyMFCwkIBwMFFQoJCAsFFgIDAQACHgECF4AACgkQREZd5NfO31fbOwD6ArzS\n" +" dM0Dkd5h2Ujy1b6KcAaVW9FOa5UNfJ9FFBtjLQEBAJ7UyWD3dZzhvlaAwunsk7DG\n" +" 3bHcln8DMpIJVXht78sL\n" +" =IE0r\n" +" -----END PGP PUBLIC KEY BLOCK-----" +msgstr "" + #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> #: sources.list.5.xml #, fuzzy @@ -7966,7 +7986,10 @@ msgid "" "option defaults to the value of the option with the same name if set in the " "previously acquired <filename>Release</filename> file of this repository " "(only fingerprints can be specified there through). Otherwise all keys in " -"the trusted keyrings are considered valid signers for this repository." +"the trusted keyrings are considered valid signers for this repository. The " +"option may also be set directly to an embedded GPG public key block. Special " +"care is needed to encode the empty line with leading spaces and \".\": " +"<placeholder type=\"literallayout\" id=\"0\"/>" msgstr "" "<option>Signed-By</option> (<option>signed-by</option>) は、(<literal>_apt</" "literal> ユーザがアクセス可能かつ読み取り可能な必要があり、つまりすべてのユー" @@ -11017,6 +11040,21 @@ msgid "" "expression." msgstr "" +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-patterns.7.xml +msgid "<code>?priority(NAME)</code>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-patterns.7.xml +msgid "<code>~pNAME</code>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-patterns.7.xml +msgid "Selects versions where the Priority string equals the given name." +msgstr "" + #. type: Content of: <refentry><refsect1><title> #: apt-patterns.7.xml #, fuzzy diff --git a/doc/po/nl.po b/doc/po/nl.po index 99f235562..b8f4471ef 100644 --- a/doc/po/nl.po +++ b/doc/po/nl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 2.3.8\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2021-08-18 16:23+0200\n" +"POT-Creation-Date: 2021-10-18 16:36+0200\n" "PO-Revision-Date: 2021-08-17 18:22+0200\n" "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n" "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n" @@ -8442,8 +8442,48 @@ msgstr "" "succesvol bij de authenticatietoetsen. De standaardwaarde kan niet expliciet " "ingesteld worden." +#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para><literallayout> +#: sources.list.5.xml +#, no-wrap +msgid "" +"Types: deb\n" +"URIs: https://deb.debian.org\n" +"Suites: stable\n" +"Components: main contrib non-free\n" +"Signed-By:\n" +" -----BEGIN PGP PUBLIC KEY BLOCK-----\n" +" .\n" +" mDMEYCQjIxYJKwYBBAHaRw8BAQdAD/P5Nvvnvk66SxBBHDbhRml9ORg1WV5CvzKY\n" +" CuMfoIS0BmFiY2RlZoiQBBMWCgA4FiEErCIG1VhKWMWo2yfAREZd5NfO31cFAmAk\n" +" IyMCGyMFCwkIBwMFFQoJCAsFFgIDAQACHgECF4AACgkQREZd5NfO31fbOwD6ArzS\n" +" dM0Dkd5h2Ujy1b6KcAaVW9FOa5UNfJ9FFBtjLQEBAJ7UyWD3dZzhvlaAwunsk7DG\n" +" 3bHcln8DMpIJVXht78sL\n" +" =IE0r\n" +" -----END PGP PUBLIC KEY BLOCK-----" +msgstr "" + #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> #: sources.list.5.xml +#, fuzzy +#| msgid "" +#| "<option>Signed-By</option> (<option>signed-by</option>) is an option to " +#| "require a repository to pass &apt-secure; verification with a certain set " +#| "of keys rather than all trusted keys apt has configured. It is specified " +#| "as a list of absolute paths to keyring files (have to be accessible and " +#| "readable for the <literal>_apt</literal> system user, so ensure everyone " +#| "has read-permissions on the file) and fingerprints of keys to select from " +#| "these keyrings. If no keyring files are specified the default is the " +#| "<filename>trusted.gpg</filename> keyring and all keyrings in the " +#| "<filename>trusted.gpg.d/</filename> directory (see <command>apt-key " +#| "fingerprint</command>). If no fingerprint is specified all keys in the " +#| "keyrings are selected. A fingerprint will accept also all signatures by a " +#| "subkey of this key, if this isn't desired an exclamation mark (<literal>!" +#| "</literal>) can be appended to the fingerprint to disable this " +#| "behaviour. The option defaults to the value of the option with the same " +#| "name if set in the previously acquired <filename>Release</filename> file " +#| "of this repository (only fingerprints can be specified there through). " +#| "Otherwise all keys in the trusted keyrings are considered valid signers " +#| "for this repository." msgid "" "<option>Signed-By</option> (<option>signed-by</option>) is an option to " "require a repository to pass &apt-secure; verification with a certain set of " @@ -8461,7 +8501,10 @@ msgid "" "option defaults to the value of the option with the same name if set in the " "previously acquired <filename>Release</filename> file of this repository " "(only fingerprints can be specified there through). Otherwise all keys in " -"the trusted keyrings are considered valid signers for this repository." +"the trusted keyrings are considered valid signers for this repository. The " +"option may also be set directly to an embedded GPG public key block. Special " +"care is needed to encode the empty line with leading spaces and \".\": " +"<placeholder type=\"literallayout\" id=\"0\"/>" msgstr "" "<option>Signed-By</option> (<option>signed-by</option>) is een optie die van " "een pakketbron vereist dat de verificatie door &apt-secure; gebeurt aan de " @@ -11953,6 +11996,31 @@ msgstr "" "Selecteert versies waarvan de versietekenreeks overeenkomt met de opgegeven " "reguliere expressie." +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-patterns.7.xml +#, fuzzy +#| msgid "<code>?not(PATTERN)</code>" +msgid "<code>?priority(NAME)</code>" +msgstr "<code>?not(PATROON)</code>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-patterns.7.xml +#, fuzzy +#| msgid "<code>~E</code>" +msgid "<code>~pNAME</code>" +msgstr "<code>~E</code>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-patterns.7.xml +#, fuzzy +#| msgid "" +#| "Selects versions where the version string matches the specified regular " +#| "expression." +msgid "Selects versions where the Priority string equals the given name." +msgstr "" +"Selecteert versies waarvan de versietekenreeks overeenkomt met de opgegeven " +"reguliere expressie." + #. type: Content of: <refentry><refsect1><title> #: apt-patterns.7.xml msgid "Package relationship patterns" diff --git a/doc/po/pl.po b/doc/po/pl.po index 358a8f4e7..182597bbd 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: 2021-07-29 17:00+0200\n" +"POT-Creation-Date: 2021-10-18 16:36+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" @@ -7592,6 +7592,26 @@ msgid "" "can't be set explicitly." msgstr "" +#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para><literallayout> +#: sources.list.5.xml +#, no-wrap +msgid "" +"Types: deb\n" +"URIs: https://deb.debian.org\n" +"Suites: stable\n" +"Components: main contrib non-free\n" +"Signed-By:\n" +" -----BEGIN PGP PUBLIC KEY BLOCK-----\n" +" .\n" +" mDMEYCQjIxYJKwYBBAHaRw8BAQdAD/P5Nvvnvk66SxBBHDbhRml9ORg1WV5CvzKY\n" +" CuMfoIS0BmFiY2RlZoiQBBMWCgA4FiEErCIG1VhKWMWo2yfAREZd5NfO31cFAmAk\n" +" IyMCGyMFCwkIBwMFFQoJCAsFFgIDAQACHgECF4AACgkQREZd5NfO31fbOwD6ArzS\n" +" dM0Dkd5h2Ujy1b6KcAaVW9FOa5UNfJ9FFBtjLQEBAJ7UyWD3dZzhvlaAwunsk7DG\n" +" 3bHcln8DMpIJVXht78sL\n" +" =IE0r\n" +" -----END PGP PUBLIC KEY BLOCK-----" +msgstr "" + #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> #: sources.list.5.xml msgid "" @@ -7611,7 +7631,10 @@ msgid "" "option defaults to the value of the option with the same name if set in the " "previously acquired <filename>Release</filename> file of this repository " "(only fingerprints can be specified there through). Otherwise all keys in " -"the trusted keyrings are considered valid signers for this repository." +"the trusted keyrings are considered valid signers for this repository. The " +"option may also be set directly to an embedded GPG public key block. Special " +"care is needed to encode the empty line with leading spaces and \".\": " +"<placeholder type=\"literallayout\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> @@ -10383,6 +10406,21 @@ msgid "" "expression." msgstr "" +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-patterns.7.xml +msgid "<code>?priority(NAME)</code>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-patterns.7.xml +msgid "<code>~pNAME</code>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-patterns.7.xml +msgid "Selects versions where the Priority string equals the given name." +msgstr "" + #. type: Content of: <refentry><refsect1><title> #: apt-patterns.7.xml msgid "Package relationship patterns" diff --git a/doc/po/pt.po b/doc/po/pt.po index 5e622a505..673655d52 100644 --- a/doc/po/pt.po +++ b/doc/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 2.1.16\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2021-07-29 17:00+0200\n" +"POT-Creation-Date: 2021-10-18 16:36+0200\n" "PO-Revision-Date: 2021-01-10 19:51+0000\n" "Last-Translator: Américo Monteiro <a_monteiro@gmx.com>\n" "Language-Team: Portuguese <>\n" @@ -8218,8 +8218,48 @@ msgstr "" "verificações de autenticação passem com sucesso. O valor predefinido não " "pode ser regulado explicitamente." +#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para><literallayout> +#: sources.list.5.xml +#, no-wrap +msgid "" +"Types: deb\n" +"URIs: https://deb.debian.org\n" +"Suites: stable\n" +"Components: main contrib non-free\n" +"Signed-By:\n" +" -----BEGIN PGP PUBLIC KEY BLOCK-----\n" +" .\n" +" mDMEYCQjIxYJKwYBBAHaRw8BAQdAD/P5Nvvnvk66SxBBHDbhRml9ORg1WV5CvzKY\n" +" CuMfoIS0BmFiY2RlZoiQBBMWCgA4FiEErCIG1VhKWMWo2yfAREZd5NfO31cFAmAk\n" +" IyMCGyMFCwkIBwMFFQoJCAsFFgIDAQACHgECF4AACgkQREZd5NfO31fbOwD6ArzS\n" +" dM0Dkd5h2Ujy1b6KcAaVW9FOa5UNfJ9FFBtjLQEBAJ7UyWD3dZzhvlaAwunsk7DG\n" +" 3bHcln8DMpIJVXht78sL\n" +" =IE0r\n" +" -----END PGP PUBLIC KEY BLOCK-----" +msgstr "" + #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> #: sources.list.5.xml +#, fuzzy +#| msgid "" +#| "<option>Signed-By</option> (<option>signed-by</option>) is an option to " +#| "require a repository to pass &apt-secure; verification with a certain set " +#| "of keys rather than all trusted keys apt has configured. It is specified " +#| "as a list of absolute paths to keyring files (have to be accessible and " +#| "readable for the <literal>_apt</literal> system user, so ensure everyone " +#| "has read-permissions on the file) and fingerprints of keys to select from " +#| "these keyrings. If no keyring files are specified the default is the " +#| "<filename>trusted.gpg</filename> keyring and all keyrings in the " +#| "<filename>trusted.gpg.d/</filename> directory (see <command>apt-key " +#| "fingerprint</command>). If no fingerprint is specified all keys in the " +#| "keyrings are selected. A fingerprint will accept also all signatures by a " +#| "subkey of this key, if this isn't desired an exclamation mark (<literal>!" +#| "</literal>) can be appended to the fingerprint to disable this " +#| "behaviour. The option defaults to the value of the option with the same " +#| "name if set in the previously acquired <filename>Release</filename> file " +#| "of this repository (only fingerprints can be specified there through). " +#| "Otherwise all keys in the trusted keyrings are considered valid signers " +#| "for this repository." msgid "" "<option>Signed-By</option> (<option>signed-by</option>) is an option to " "require a repository to pass &apt-secure; verification with a certain set of " @@ -8237,7 +8277,10 @@ msgid "" "option defaults to the value of the option with the same name if set in the " "previously acquired <filename>Release</filename> file of this repository " "(only fingerprints can be specified there through). Otherwise all keys in " -"the trusted keyrings are considered valid signers for this repository." +"the trusted keyrings are considered valid signers for this repository. The " +"option may also be set directly to an embedded GPG public key block. Special " +"care is needed to encode the empty line with leading spaces and \".\": " +"<placeholder type=\"literallayout\" id=\"0\"/>" msgstr "" "<option>Signed-By</option> (<option>signed-by</option>) é uma opção para " "requerer a um repositório para passar a verificação &apt-secure; com um " @@ -11649,6 +11692,31 @@ msgstr "" "Seleciona versões onde a string de versão coincide com a expressão regular " "fornecida." +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-patterns.7.xml +#, fuzzy +#| msgid "<code>?not(PATTERN)</code>" +msgid "<code>?priority(NAME)</code>" +msgstr "<code>?not(PATTERN)</code>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-patterns.7.xml +#, fuzzy +#| msgid "<code>~E</code>" +msgid "<code>~pNAME</code>" +msgstr "<code>~E</code>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-patterns.7.xml +#, fuzzy +#| msgid "" +#| "Selects versions where the version string matches the specified regular " +#| "expression." +msgid "Selects versions where the Priority string equals the given name." +msgstr "" +"Seleciona versões onde a string de versão coincide com a expressão regular " +"fornecida." + #. type: Content of: <refentry><refsect1><title> #: apt-patterns.7.xml msgid "Package relationship patterns" diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po index 2b1de4bec..8573a2c75 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: 2021-07-29 17:00+0200\n" +"POT-Creation-Date: 2021-10-18 16:36+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" @@ -6112,6 +6112,26 @@ msgid "" "can't be set explicitly." msgstr "" +#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para><literallayout> +#: sources.list.5.xml +#, no-wrap +msgid "" +"Types: deb\n" +"URIs: https://deb.debian.org\n" +"Suites: stable\n" +"Components: main contrib non-free\n" +"Signed-By:\n" +" -----BEGIN PGP PUBLIC KEY BLOCK-----\n" +" .\n" +" mDMEYCQjIxYJKwYBBAHaRw8BAQdAD/P5Nvvnvk66SxBBHDbhRml9ORg1WV5CvzKY\n" +" CuMfoIS0BmFiY2RlZoiQBBMWCgA4FiEErCIG1VhKWMWo2yfAREZd5NfO31cFAmAk\n" +" IyMCGyMFCwkIBwMFFQoJCAsFFgIDAQACHgECF4AACgkQREZd5NfO31fbOwD6ArzS\n" +" dM0Dkd5h2Ujy1b6KcAaVW9FOa5UNfJ9FFBtjLQEBAJ7UyWD3dZzhvlaAwunsk7DG\n" +" 3bHcln8DMpIJVXht78sL\n" +" =IE0r\n" +" -----END PGP PUBLIC KEY BLOCK-----" +msgstr "" + #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> #: sources.list.5.xml msgid "" @@ -6131,7 +6151,10 @@ msgid "" "option defaults to the value of the option with the same name if set in the " "previously acquired <filename>Release</filename> file of this repository " "(only fingerprints can be specified there through). Otherwise all keys in " -"the trusted keyrings are considered valid signers for this repository." +"the trusted keyrings are considered valid signers for this repository. The " +"option may also be set directly to an embedded GPG public key block. Special " +"care is needed to encode the empty line with leading spaces and \".\": " +"<placeholder type=\"literallayout\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> @@ -8672,6 +8695,21 @@ msgid "" "expression." msgstr "" +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-patterns.7.xml +msgid "<code>?priority(NAME)</code>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-patterns.7.xml +msgid "<code>~pNAME</code>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-patterns.7.xml +msgid "Selects versions where the Priority string equals the given name." +msgstr "" + #. type: Content of: <refentry><refsect1><title> #: apt-patterns.7.xml msgid "Package relationship patterns" diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml index ed99f08f8..261c90656 100644 --- a/doc/sources.list.5.xml +++ b/doc/sources.list.5.xml @@ -14,7 +14,7 @@ &apt-email; &apt-product; <!-- The last update date --> - <date>2019-04-04T00:00:00Z</date> + <date>2021-06-09T00:00:00Z</date> </refentryinfo> <refmeta> diff --git a/po/apt-all.pot b/po/apt-all.pot index 13b9a9bce..a607cce24 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -5,9 +5,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apt 2.3.9\n" +"Project-Id-Version: apt 2.3.10\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2021-09-07 17:26+0200\n" +"POT-Creation-Date: 2021-10-18 16:36+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" -- cgit v1.2.3-18-g5258