From fedf85d612de15c1c1390ea36a1f5f72f142f166 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 13 Apr 2024 12:16:21 +0200 Subject: Merging upstream version 2.7.13. Signed-off-by: Daniel Baumann --- CMakeLists.txt | 2 +- apt-pkg/init.cc | 1 + cmdline/apt-key.in | 21 ++++++++-- doc/apt-verbatim.ent | 4 +- doc/examples/configure-index | 1 + doc/po/apt-doc.pot | 4 +- methods/gpgv.cc | 56 ++++++++++++++++++++++---- po/apt-all.pot | 6 +-- po/ar.po | 4 +- po/ast.po | 4 +- po/bg.po | 4 +- po/bs.po | 4 +- po/ca.po | 7 ++-- po/cs.po | 7 ++-- po/cy.po | 4 +- po/da.po | 7 ++-- po/de.po | 7 ++-- po/dz.po | 4 +- po/el.po | 4 +- po/es.po | 4 +- po/eu.po | 4 +- po/fi.po | 4 +- po/fr.po | 7 ++-- po/gl.po | 4 +- po/hu.po | 7 ++-- po/it.po | 7 ++-- po/ja.po | 7 ++-- po/km.po | 4 +- po/ko.po | 4 +- po/ku.po | 4 +- po/lt.po | 4 +- po/mr.po | 4 +- po/nb.po | 7 ++-- po/ne.po | 4 +- po/nl.po | 7 ++-- po/nn.po | 4 +- po/pl.po | 4 +- po/pt.po | 4 +- po/pt_BR.po | 4 +- po/ro.po | 7 ++-- po/ru.po | 7 ++-- po/sk.po | 4 +- po/sl.po | 4 +- po/sv.po | 4 +- po/th.po | 4 +- po/tl.po | 4 +- po/tr.po | 7 ++-- po/uk.po | 4 +- po/vi.po | 4 +- po/zh_CN.po | 9 +++-- po/zh_TW.po | 4 +- prepare-release | 11 ++--- test/integration/test-apt-cdrom | 20 ++++++++- test/integration/test-method-gpgv | 28 ++++++++++--- test/integration/test-releasefile-verification | 2 +- 55 files changed, 240 insertions(+), 132 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 797a17b..9036b3d 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 ") -set(PACKAGE_VERSION "2.7.12") +set(PACKAGE_VERSION "2.7.13") string(REGEX MATCH "^[0-9.]+" PROJECT_VERSION ${PACKAGE_VERSION}) if (NOT DEFINED DPKG_DATADIR) diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc index f1742c0..7593540 100644 --- a/apt-pkg/init.cc +++ b/apt-pkg/init.cc @@ -131,6 +131,7 @@ bool pkgInitConfig(Configuration &Cnf) Cnf.Set("APT::Build-Essential::", "build-essential"); Cnf.CndSet("APT::Install-Recommends", true); Cnf.CndSet("APT::Install-Suggests", false); + Cnf.CndSet("APT::Key::Assert-Pubkey-Algo", ">=rsa2048,ed25519,ed448"); Cnf.CndSet("Dir","/"); // State diff --git a/cmdline/apt-key.in b/cmdline/apt-key.in index 4f3e9c8..0752272 100644 --- a/cmdline/apt-key.in +++ b/cmdline/apt-key.in @@ -800,7 +800,8 @@ case "$command" in ;; verify) GPGV='' - eval $(apt-config shell GPGV Apt::Key::gpgvcommand) + ASSERT_PUBKEY_ALGO='' + eval $(apt-config shell GPGV Apt::Key::gpgvcommand ASSERT_PUBKEY_ALGO Apt::Key::assert-pubkey-algo) if [ -n "$GPGV" ] && command_available "$GPGV"; then true; elif command_available 'gpgv'; then GPGV='gpgv'; elif command_available 'gpgv2'; then GPGV='gpgv2'; @@ -809,6 +810,20 @@ case "$command" in apt_error 'gpgv, gpgv2 or gpgv1 required for verification, but neither seems installed' exit 29 fi + GPGV_ARGS="" + if [ "$ASSERT_PUBKEY_ALGO" ]; then + test="$(LC_ALL=C.UTF-8 "$GPGV" --assert-pubkey-algo 2>&1 || :)" + case "$test" in + *"missing argument"*) + GPGV_ARGS="--assert-pubkey-algo=$ASSERT_PUBKEY_ALGO" + ;; + *[Ii]"nvalid option"*"assert-pubkey-algo"*) + ;; + *) + apt_warn "Unknown response from gpgv to --assert-pubkey-algo check: $test" + ;; + esac + fi # for a forced keyid we need gpg --export, so full wrapping required if [ -n "$FORCED_KEYID" ]; then prepare_gpg_home @@ -817,9 +832,9 @@ case "$command" in fi setup_merged_keyring if [ -n "$FORCED_KEYRING" ]; then - "$GPGV" --homedir "${GPGHOMEDIR}" --keyring "$(dearmor_filename "${FORCED_KEYRING}")" --ignore-time-conflict "$@" + "$GPGV" $GPGV_ARGS --homedir "${GPGHOMEDIR}" --keyring "$(dearmor_filename "${FORCED_KEYRING}")" --ignore-time-conflict "$@" else - "$GPGV" --homedir "${GPGHOMEDIR}" --keyring "${GPGHOMEDIR}/pubring.gpg" --ignore-time-conflict "$@" + "$GPGV" $GPGV_ARGS --homedir "${GPGHOMEDIR}" --keyring "${GPGHOMEDIR}/pubring.gpg" --ignore-time-conflict "$@" fi ;; help) diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index e2be283..1dabbe7 100644 --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@ -3,7 +3,7 @@ -&docdir;examples/configure-index.gz"> +&docdir;examples/configure-index"> /etc/apt.conf"> @@ -274,7 +274,7 @@ "> - + diff --git a/doc/examples/configure-index b/doc/examples/configure-index index f37b769..da4998b 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -762,6 +762,7 @@ apt::key::gpgcommand ""; apt::key::masterkeyring ""; apt::key::archivekeyringuri ""; apt::key::net-update-enabled ""; +apt::key::assert-pubkey-algo ""; apt::ftparchive::release::patterns ""; apt::ftparchive::release::validtime ""; diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 17d7e4b..68bb766 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.7.12\n" +"Project-Id-Version: apt-doc 2.7.13\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2024-02-20 18:39+0000\n" +"POT-Creation-Date: 2024-02-28 18:50+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/methods/gpgv.cc b/methods/gpgv.cc index f89aa8d..e465c35 100644 --- a/methods/gpgv.cc +++ b/methods/gpgv.cc @@ -40,6 +40,9 @@ using std::vector; #define GNUPGEXPSIG "[GNUPG:] EXPSIG" #define GNUPGREVKEYSIG "[GNUPG:] REVKEYSIG" #define GNUPGNODATA "[GNUPG:] NODATA" +#define GNUPGWARNING "[GNUPG:] WARNING" +#define GNUPGERROR "[GNUPG:] ERROR" +#define GNUPGASSERT_PUBKEY_ALGO "[GNUPG:] ASSERT_PUBKEY_ALGO" #define APTKEYWARNING "[APTKEY:] WARNING" #define APTKEYERROR "[APTKEY:] ERROR" @@ -106,7 +109,7 @@ static bool IsTheSameKey(std::string const &validsig, std::string const &goodsig struct APT_HIDDEN SignersStorage { std::vector Good; std::vector Bad; - std::vector Worthless; + std::vector Worthless; // a worthless signature is a expired or revoked one std::vector SoonWorthless; std::vector NoPubKey; @@ -158,6 +161,16 @@ static void PushEntryWithUID(std::vector &Signers, char * const buf std::clog << "Got " << msg << " !" << std::endl; Signers.push_back(msg); } +static void PushEntryWithUID(std::vector &Signers, char * const buffer, bool const Debug) +{ + std::string msg = buffer + sizeof(GNUPGPREFIX); + auto const nuke = msg.find_last_not_of("\n\t\r"); + if (nuke != std::string::npos) + msg.erase(nuke + 1); + if (Debug == true) + std::clog << "Got " << msg << " !" << std::endl; + Signers.push_back({msg, ""}); +} static void implodeVector(std::vector const &vec, std::ostream &out, char const * const sep) { if (vec.empty()) @@ -230,6 +243,18 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, PushEntryWithUID(Signers.Worthless, buffer, Debug); else if (strncmp(buffer, GNUPGREVKEYSIG, sizeof(GNUPGREVKEYSIG)-1) == 0) PushEntryWithUID(Signers.Worthless, buffer, Debug); + else if (strncmp(buffer, GNUPGASSERT_PUBKEY_ALGO, sizeof(GNUPGASSERT_PUBKEY_ALGO) - 1) == 0) + { + std::istringstream iss(buffer + sizeof(GNUPGASSERT_PUBKEY_ALGO)); + vector tokens{std::istream_iterator{iss}, + std::istream_iterator{}}; + + auto const fpr = tokens[0]; + auto const asserted = atoi(tokens[1].c_str()); + auto const pkstr = tokens[2]; + if (not asserted) + Signers.SoonWorthless.push_back({fpr, pkstr}); + } else if (strncmp(buffer, GNUPGGOODSIG, sizeof(GNUPGGOODSIG)-1) == 0) PushEntryWithKeyID(Signers.Good, buffer, Debug); else if (strncmp(buffer, GNUPGVALIDSIG, sizeof(GNUPGVALIDSIG)-1) == 0) @@ -251,7 +276,11 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, case Digest::State::Untrusted: // Treat them like an expired key: For that a message about expiry // is emitted, a VALIDSIG, but no GOODSIG. - Signers.Worthless.push_back(sig); + { + std::string note; + strprintf(note, "untrusted digest algorithm: %s", digest.name); + Signers.Worthless.push_back({sig, note}); + } Signers.Good.erase(std::remove_if(Signers.Good.begin(), Signers.Good.end(), [&](std::string const &goodsig) { return IsTheSameKey(sig, goodsig); }), Signers.Good.end()); if (Debug == true) @@ -269,6 +298,13 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, if (tokens.size() > 9 && sig != tokens[9]) SubKeyMapping[tokens[9]].emplace_back(sig); } + else if (strncmp(buffer, GNUPGWARNING, sizeof(GNUPGWARNING)-1) == 0) { + std::string warning; + strprintf(warning, "GPG: %s", buffer + sizeof(GNUPGWARNING)); + Warning(std::move(warning)); + } + else if (strncmp(buffer, GNUPGERROR, sizeof(GNUPGERROR)-1) == 0) + _error->Error("GPG: %s", buffer + sizeof(GNUPGERROR)); else if (strncmp(buffer, APTKEYWARNING, sizeof(APTKEYWARNING)-1) == 0) Warning(buffer + sizeof(APTKEYWARNING)); else if (strncmp(buffer, APTKEYERROR, sizeof(APTKEYERROR)-1) == 0) @@ -276,7 +312,9 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, } fclose(pipein); free(buffer); - std::move(ErrSigners.begin(), ErrSigners.end(), std::back_inserter(Signers.Worthless)); + + for (auto errSigner : ErrSigners) + Signers.Worthless.push_back({errSigner, ""}); // apt-key has a --keyid parameter, but this requires gpg, so we call it without it // and instead check after the fact which keyids where used for verification @@ -372,7 +410,7 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, std::cerr << "\n Bad: "; implodeVector(Signers.Bad, std::cerr, ", "); std::cerr << "\n Worthless: "; - implodeVector(Signers.Worthless, std::cerr, ", "); + std::for_each(Signers.Worthless.begin(), Signers.Worthless.end(), [](Signer const &sig) { std::cerr << sig.key << ", "; }); std::cerr << "\n SoonWorthless: "; std::for_each(Signers.SoonWorthless.begin(), Signers.SoonWorthless.end(), [](Signer const &sig) { std::cerr << sig.key << ", "; }); std::cerr << "\n NoPubKey: "; @@ -517,7 +555,7 @@ bool GPGVMethod::URIAcquire(std::string const &Message, FetchItem *Itm) { std::string msg; // TRANSLATORS: The second %s is the reason and is untranslated for repository owners. - strprintf(msg, _("Signature by key %s uses weak digest algorithm (%s)"), Signer.key.c_str(), Signer.note.c_str()); + strprintf(msg, _("Signature by key %s uses weak algorithm (%s)"), Signer.key.c_str(), Signer.note.c_str()); Warning(std::move(msg)); } } @@ -540,8 +578,12 @@ bool GPGVMethod::URIAcquire(std::string const &Message, FetchItem *Itm) if (!Signers.Worthless.empty()) { errmsg += _("The following signatures were invalid:\n"); - for (auto const &I : Signers.Worthless) - errmsg.append(I).append("\n"); + for (auto const &[key, reason] : Signers.Worthless) { + errmsg.append(key); + if (not reason.empty()) + errmsg.append(" (").append(reason).append(")"); + errmsg.append("\n"); + } } if (!Signers.NoPubKey.empty()) { diff --git a/po/apt-all.pot b/po/apt-all.pot index 6cb14ba..cb86b76 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -5,9 +5,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apt 2.7.12\n" +"Project-Id-Version: apt 2.7.13\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2024-02-20 18:39+0000\n" +"POT-Creation-Date: 2024-02-28 18:50+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -3556,7 +3556,7 @@ msgstr "" #. TRANSLATORS: The second %s is the reason and is untranslated for repository owners. #: methods/gpgv.cc #, c-format -msgid "Signature by key %s uses weak digest algorithm (%s)" +msgid "Signature by key %s uses weak algorithm (%s)" msgstr "" #: methods/gpgv.cc diff --git a/po/ar.po b/po/ar.po index 73948db..6328b24 100644 --- a/po/ar.po +++ b/po/ar.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2024-02-13 16:31+0100\n" +"POT-Creation-Date: 2024-02-28 18:50+0000\n" "PO-Revision-Date: 2006-10-20 21:28+0300\n" "Last-Translator: Ossama M. Khayat \n" "Language-Team: Arabic \n" @@ -3632,7 +3632,7 @@ msgstr "" #. TRANSLATORS: The second %s is the reason and is untranslated for repository owners. #: methods/gpgv.cc #, c-format -msgid "Signature by key %s uses weak digest algorithm (%s)" +msgid "Signature by key %s uses weak algorithm (%s)" msgstr "" #: methods/gpgv.cc diff --git a/po/ast.po b/po/ast.po index 93b5a49..deb8830 100644 --- a/po/ast.po +++ b/po/ast.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.18\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2024-02-13 16:31+0100\n" +"POT-Creation-Date: 2024-02-28 18:50+0000\n" "PO-Revision-Date: 2010-10-02 23:35+0100\n" "Last-Translator: Iñigo Varela \n" "Language-Team: Asturian (ast)\n" @@ -3807,7 +3807,7 @@ msgstr "" #. TRANSLATORS: The second %s is the reason and is untranslated for repository owners. #: methods/gpgv.cc #, c-format -msgid "Signature by key %s uses weak digest algorithm (%s)" +msgid "Signature by key %s uses weak algorithm (%s)" msgstr "" #: methods/gpgv.cc diff --git a/po/bg.po b/po/bg.po index e8fb45b..c5f53df 100644 --- a/po/bg.po +++ b/po/bg.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.21\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2024-02-13 16:31+0100\n" +"POT-Creation-Date: 2024-02-28 18:50+0000\n" "PO-Revision-Date: 2012-06-25 17:23+0300\n" "Last-Translator: Damyan Ivanov \n" "Language-Team: Bulgarian \n" @@ -3863,7 +3863,7 @@ msgstr "" #. TRANSLATORS: The second %s is the reason and is untranslated for repository owners. #: methods/gpgv.cc #, c-format -msgid "Signature by key %s uses weak digest algorithm (%s)" +msgid "Signature by key %s uses weak algorithm (%s)" msgstr "" #: methods/gpgv.cc diff --git a/po/bs.po b/po/bs.po index 6813776..05d164d 100644 --- a/po/bs.po +++ b/po/bs.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2024-02-13 16:31+0100\n" +"POT-Creation-Date: 2024-02-28 18:50+0000\n" "PO-Revision-Date: 2004-05-06 15:25+0100\n" "Last-Translator: Safir Šećerović \n" "Language-Team: Bosnian \n" @@ -3617,7 +3617,7 @@ msgstr "" #. TRANSLATORS: The second %s is the reason and is untranslated for repository owners. #: methods/gpgv.cc #, c-format -msgid "Signature by key %s uses weak digest algorithm (%s)" +msgid "Signature by key %s uses weak algorithm (%s)" msgstr "" #: methods/gpgv.cc diff --git a/po/ca.po b/po/ca.po index be1a2cf..f232392 100644 --- a/po/ca.po +++ b/po/ca.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.4~beta1\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2024-02-13 16:31+0100\n" +"POT-Creation-Date: 2024-02-28 18:50+0000\n" "PO-Revision-Date: 2020-08-09 22:43+0200\n" "Last-Translator: Aleix Vidal i Gaya \n" "Language-Team: Catalan \n" @@ -3943,8 +3943,9 @@ msgstr "" #. TRANSLATORS: The second %s is the reason and is untranslated for repository owners. #: methods/gpgv.cc -#, c-format -msgid "Signature by key %s uses weak digest algorithm (%s)" +#, fuzzy, c-format +#| msgid "Signature by key %s uses weak digest algorithm (%s)" +msgid "Signature by key %s uses weak algorithm (%s)" msgstr "" "La signatura per la clau %s usa un algoritme de resum «hash» dèbil (%s)" diff --git a/po/cs.po b/po/cs.po index 177b3c4..866ea5b 100644 --- a/po/cs.po +++ b/po/cs.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 2.5.6\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2024-02-13 16:31+0100\n" +"POT-Creation-Date: 2024-02-28 18:50+0000\n" "PO-Revision-Date: 2023-02-10 12:58+0100\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@ -3833,8 +3833,9 @@ msgstr "" #. TRANSLATORS: The second %s is the reason and is untranslated for repository owners. #: methods/gpgv.cc -#, c-format -msgid "Signature by key %s uses weak digest algorithm (%s)" +#, fuzzy, c-format +#| msgid "Signature by key %s uses weak digest algorithm (%s)" +msgid "Signature by key %s uses weak algorithm (%s)" msgstr "Podpis klíčem %s používá slabý algoritmus (%s)" #: methods/gpgv.cc diff --git a/po/cy.po b/po/cy.po index 35fcc95..1311e11 100644 --- a/po/cy.po +++ b/po/cy.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2024-02-13 16:31+0100\n" +"POT-Creation-Date: 2024-02-28 18:50+0000\n" "PO-Revision-Date: 2005-06-06 13:46+0100\n" "Last-Translator: Dafydd Harries \n" "Language-Team: Welsh \n" @@ -3827,7 +3827,7 @@ msgstr "" #. TRANSLATORS: The second %s is the reason and is untranslated for repository owners. #: methods/gpgv.cc #, c-format -msgid "Signature by key %s uses weak digest algorithm (%s)" +msgid "Signature by key %s uses weak algorithm (%s)" msgstr "" #: methods/gpgv.cc diff --git a/po/da.po b/po/da.po index 3c64303..f71a669 100644 --- a/po/da.po +++ b/po/da.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.4~rc2\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2024-02-13 16:31+0100\n" +"POT-Creation-Date: 2024-02-28 18:50+0000\n" "PO-Revision-Date: 2017-03-02 23:51+0200\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" @@ -3889,8 +3889,9 @@ msgstr "" #. TRANSLATORS: The second %s is the reason and is untranslated for repository owners. #: methods/gpgv.cc -#, c-format -msgid "Signature by key %s uses weak digest algorithm (%s)" +#, fuzzy, c-format +#| msgid "Signature by key %s uses weak digest algorithm (%s)" +msgid "Signature by key %s uses weak algorithm (%s)" msgstr "Signaturen med nøglen %s bruger en svag sammendragsalgoritme (%s)" #: methods/gpgv.cc diff --git a/po/de.po b/po/de.po index dda07ab..3528e60 100644 --- a/po/de.po +++ b/po/de.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 2.7.2\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2024-02-13 16:31+0100\n" +"POT-Creation-Date: 2024-02-28 18:50+0000\n" "PO-Revision-Date: 2023-07-17 19:13+0200\n" "Last-Translator: Helge Kreutzmann \n" "Language-Team: German \n" @@ -4024,8 +4024,9 @@ msgstr "" #. TRANSLATORS: The second %s is the reason and is untranslated for repository owners. #: methods/gpgv.cc -#, c-format -msgid "Signature by key %s uses weak digest algorithm (%s)" +#, fuzzy, c-format +#| msgid "Signature by key %s uses weak digest algorithm (%s)" +msgid "Signature by key %s uses weak algorithm (%s)" msgstr "" "Signatur von Schlüssel %s verwendet einen schwachen Hash-Algorithmus (%s)" diff --git a/po/dz.po b/po/dz.po index 1b3acfa..d870f76 100644 --- a/po/dz.po +++ b/po/dz.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2024-02-13 16:31+0100\n" +"POT-Creation-Date: 2024-02-28 18:50+0000\n" "PO-Revision-Date: 2006-09-19 09:49+0530\n" "Last-Translator: Kinley Tshering \n" "Language-Team: Dzongkha \n" @@ -3775,7 +3775,7 @@ msgstr "" #. TRANSLATORS: The second %s is the reason and is untranslated for repository owners. #: methods/gpgv.cc #, c-format -msgid "Signature by key %s uses weak digest algorithm (%s)" +msgid "Signature by key %s uses weak algorithm (%s)" msgstr "" #: methods/gpgv.cc diff --git a/po/el.po b/po/el.po index 55a6d9a..f4b273a 100644 --- a/po/el.po +++ b/po/el.po @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2024-02-13 16:31+0100\n" +"POT-Creation-Date: 2024-02-28 18:50+0000\n" "PO-Revision-Date: 2020-12-30 12:20+0200\n" "Last-Translator: Vangelis Skarmoutsos \n" "Language-Team: Greek \n" @@ -3761,7 +3761,7 @@ msgstr "" #. TRANSLATORS: The second %s is the reason and is untranslated for repository owners. #: methods/gpgv.cc #, c-format -msgid "Signature by key %s uses weak digest algorithm (%s)" +msgid "Signature by key %s uses weak algorithm (%s)" msgstr "" #: methods/gpgv.cc diff --git a/po/es.po b/po/es.po index 1b5a40b..64ade00 100644 --- a/po/es.po +++ b/po/es.po @@ -37,7 +37,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.8.10\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2024-02-13 16:31+0100\n" +"POT-Creation-Date: 2024-02-28 18:50+0000\n" "PO-Revision-Date: 2016-01-26 01:51+0100\n" "Last-Translator: Manuel \"Venturi\" Porras Peralta \n" @@ -4015,7 +4015,7 @@ msgstr "" #. TRANSLATORS: The second %s is the reason and is untranslated for repository owners. #: methods/gpgv.cc #, c-format -msgid "Signature by key %s uses weak digest algorithm (%s)" +msgid "Signature by key %s uses weak algorithm (%s)" msgstr "" #: methods/gpgv.cc diff --git a/po/eu.po b/po/eu.po index 93f28ad..8e40ba4 100644 --- a/po/eu.po +++ b/po/eu.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2024-02-13 16:31+0100\n" +"POT-Creation-Date: 2024-02-28 18:50+0000\n" "PO-Revision-Date: 2009-05-17 00:41+0200\n" "Last-Translator: Piarres Beobide \n" "Language-Team: Euskara \n" @@ -3770,7 +3770,7 @@ msgstr "" #. TRANSLATORS: The second %s is the reason and is untranslated for repository owners. #: methods/gpgv.cc #, c-format -msgid "Signature by key %s uses weak digest algorithm (%s)" +msgid "Signature by key %s uses weak algorithm (%s)" msgstr "" #: methods/gpgv.cc diff --git a/po/fi.po b/po/fi.po index eb98bcd..c3e9952 100644 --- a/po/fi.po +++ b/po/fi.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2024-02-13 16:31+0100\n" +"POT-Creation-Date: 2024-02-28 18:50+0000\n" "PO-Revision-Date: 2008-12-11 14:52+0200\n" "Last-Translator: Tapio Lehtonen \n" "Language-Team: Finnish \n" @@ -3763,7 +3763,7 @@ msgstr "" #. TRANSLATORS: The second %s is the reason and is untranslated for repository owners. #: methods/gpgv.cc #, c-format -msgid "Signature by key %s uses weak digest algorithm (%s)" +msgid "Signature by key %s uses weak algorithm (%s)" msgstr "" #: methods/gpgv.cc diff --git a/po/fr.po b/po/fr.po index d8e0d1d..c3d297b 100644 --- a/po/fr.po +++ b/po/fr.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2024-02-13 16:31+0100\n" +"POT-Creation-Date: 2024-02-28 18:50+0000\n" "PO-Revision-Date: 2019-01-21 09:19+0100\n" "Last-Translator: Julien Patriarca \n" "Language-Team: French \n" @@ -4032,8 +4032,9 @@ msgstr "" #. TRANSLATORS: The second %s is the reason and is untranslated for repository owners. #: methods/gpgv.cc -#, c-format -msgid "Signature by key %s uses weak digest algorithm (%s)" +#, fuzzy, c-format +#| msgid "Signature by key %s uses weak digest algorithm (%s)" +msgid "Signature by key %s uses weak algorithm (%s)" msgstr "" "la signature par la clé %s utilise des algorithmes « digest » faibles (%s)" diff --git a/po/gl.po b/po/gl.po index 162ebbb..b16711f 100644 --- a/po/gl.po +++ b/po/gl.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2024-02-13 16:31+0100\n" +"POT-Creation-Date: 2024-02-28 18:50+0000\n" "PO-Revision-Date: 2011-05-12 15:28+0100\n" "Last-Translator: Miguel Anxo Bouzada \n" "Language-Team: galician \n" @@ -3844,7 +3844,7 @@ msgstr "" #. TRANSLATORS: The second %s is the reason and is untranslated for repository owners. #: methods/gpgv.cc #, c-format -msgid "Signature by key %s uses weak digest algorithm (%s)" +msgid "Signature by key %s uses weak algorithm (%s)" msgstr "" #: methods/gpgv.cc diff --git a/po/hu.po b/po/hu.po index f5de0a5..dc28057 100644 --- a/po/hu.po +++ b/po/hu.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2024-02-13 16:31+0100\n" +"POT-Creation-Date: 2024-02-28 18:50+0000\n" "PO-Revision-Date: 2016-04-10 19:46+0200\n" "Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" @@ -3912,8 +3912,9 @@ msgstr "" #. TRANSLATORS: The second %s is the reason and is untranslated for repository owners. #: methods/gpgv.cc -#, c-format -msgid "Signature by key %s uses weak digest algorithm (%s)" +#, fuzzy, c-format +#| msgid "Signature by key %s uses weak digest algorithm (%s)" +msgid "Signature by key %s uses weak algorithm (%s)" msgstr "%s kulcs aláírása gyenge kivonatoló algoritmust használ (%s)" #: methods/gpgv.cc diff --git a/po/it.po b/po/it.po index e98c6db..a980962 100644 --- a/po/it.po +++ b/po/it.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2024-02-13 16:31+0100\n" +"POT-Creation-Date: 2024-02-28 18:50+0000\n" "PO-Revision-Date: 2019-03-04 11:05+0100\n" "Last-Translator: Milo Casagrande \n" "Language-Team: Italian \n" @@ -3980,8 +3980,9 @@ msgstr "" #. TRANSLATORS: The second %s is the reason and is untranslated for repository owners. #: methods/gpgv.cc -#, c-format -msgid "Signature by key %s uses weak digest algorithm (%s)" +#, fuzzy, c-format +#| msgid "Signature by key %s uses weak digest algorithm (%s)" +msgid "Signature by key %s uses weak algorithm (%s)" msgstr "La firma con chiave %s utilizza un algoritmo di digest debole (%s)" #: methods/gpgv.cc diff --git a/po/ja.po b/po/ja.po index 419298a..cbc4f19 100644 --- a/po/ja.po +++ b/po/ja.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 2.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2024-02-13 16:31+0100\n" +"POT-Creation-Date: 2024-02-28 18:50+0000\n" "PO-Revision-Date: 2022-08-14 14:30+0900\n" "Last-Translator: Hideki Yamane \n" "Language-Team: Japanese \n" @@ -3898,8 +3898,9 @@ msgstr "" #. TRANSLATORS: The second %s is the reason and is untranslated for repository owners. #: methods/gpgv.cc -#, c-format -msgid "Signature by key %s uses weak digest algorithm (%s)" +#, fuzzy, c-format +#| msgid "Signature by key %s uses weak digest algorithm (%s)" +msgid "Signature by key %s uses weak algorithm (%s)" msgstr "鍵 %s による署名は弱い digest アルゴリズム (%s) を使用しています" #: methods/gpgv.cc diff --git a/po/km.po b/po/km.po index 42832a6..b208c7d 100644 --- a/po/km.po +++ b/po/km.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2024-02-13 16:31+0100\n" +"POT-Creation-Date: 2024-02-28 18:50+0000\n" "PO-Revision-Date: 2006-10-10 09:48+0700\n" "Last-Translator: Khoem Sokhem \n" "Language-Team: Khmer \n" @@ -3747,7 +3747,7 @@ msgstr "" #. TRANSLATORS: The second %s is the reason and is untranslated for repository owners. #: methods/gpgv.cc #, c-format -msgid "Signature by key %s uses weak digest algorithm (%s)" +msgid "Signature by key %s uses weak algorithm (%s)" msgstr "" #: methods/gpgv.cc diff --git a/po/ko.po b/po/ko.po index 60411f5..3647748 100644 --- a/po/ko.po +++ b/po/ko.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2024-02-13 16:31+0100\n" +"POT-Creation-Date: 2024-02-28 18:50+0000\n" "PO-Revision-Date: 2010-08-30 02:31+0900\n" "Last-Translator: Changwoo Ryu \n" "Language-Team: Korean \n" @@ -3766,7 +3766,7 @@ msgstr "" #. TRANSLATORS: The second %s is the reason and is untranslated for repository owners. #: methods/gpgv.cc #, c-format -msgid "Signature by key %s uses weak digest algorithm (%s)" +msgid "Signature by key %s uses weak algorithm (%s)" msgstr "" #: methods/gpgv.cc diff --git a/po/ku.po b/po/ku.po index 3b03f84..88fb6eb 100644 --- a/po/ku.po +++ b/po/ku.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2024-02-13 16:31+0100\n" +"POT-Creation-Date: 2024-02-28 18:50+0000\n" "PO-Revision-Date: 2008-05-08 12:48+0200\n" "Last-Translator: Erdal Ronahi \n" "Language-Team: ku \n" @@ -3631,7 +3631,7 @@ msgstr "" #. TRANSLATORS: The second %s is the reason and is untranslated for repository owners. #: methods/gpgv.cc #, c-format -msgid "Signature by key %s uses weak digest algorithm (%s)" +msgid "Signature by key %s uses weak algorithm (%s)" msgstr "" #: methods/gpgv.cc diff --git a/po/lt.po b/po/lt.po index 832b2b0..d4a9845 100644 --- a/po/lt.po +++ b/po/lt.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2024-02-13 16:31+0100\n" +"POT-Creation-Date: 2024-02-28 18:50+0000\n" "PO-Revision-Date: 2008-08-02 01:47-0400\n" "Last-Translator: Gintautas Miliauskas \n" "Language-Team: Lithuanian \n" @@ -3736,7 +3736,7 @@ msgstr "" #. TRANSLATORS: The second %s is the reason and is untranslated for repository owners. #: methods/gpgv.cc #, c-format -msgid "Signature by key %s uses weak digest algorithm (%s)" +msgid "Signature by key %s uses weak algorithm (%s)" msgstr "" #: methods/gpgv.cc diff --git a/po/mr.po b/po/mr.po index a0bd93e..7844808 100644 --- a/po/mr.po +++ b/po/mr.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2024-02-13 16:31+0100\n" +"POT-Creation-Date: 2024-02-28 18:50+0000\n" "PO-Revision-Date: 2008-11-20 23:27+0530\n" "Last-Translator: Sampada \n" "Language-Team: Marathi, janabhaaratii, C-DAC, Mumbai, India " @@ -3747,7 +3747,7 @@ msgstr "" #. TRANSLATORS: The second %s is the reason and is untranslated for repository owners. #: methods/gpgv.cc #, c-format -msgid "Signature by key %s uses weak digest algorithm (%s)" +msgid "Signature by key %s uses weak algorithm (%s)" msgstr "" #: methods/gpgv.cc diff --git a/po/nb.po b/po/nb.po index 76ae29e..d679d5d 100644 --- a/po/nb.po +++ b/po/nb.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2024-02-13 16:31+0100\n" +"POT-Creation-Date: 2024-02-28 18:50+0000\n" "PO-Revision-Date: 2018-10-30 20:53+0100\n" "Last-Translator: Petter Reinholdtsen \n" "Language-Team: Norwegian Bokmål \n" @@ -3835,8 +3835,9 @@ msgstr "" #. TRANSLATORS: The second %s is the reason and is untranslated for repository owners. #: methods/gpgv.cc -#, c-format -msgid "Signature by key %s uses weak digest algorithm (%s)" +#, fuzzy, c-format +#| msgid "Signature by key %s uses weak digest algorithm (%s)" +msgid "Signature by key %s uses weak algorithm (%s)" msgstr "Signatur med nøkkel %s bruker svak oppsummeringsalgoritme (%s)" #: methods/gpgv.cc diff --git a/po/ne.po b/po/ne.po index a66310f..d11edb5 100644 --- a/po/ne.po +++ b/po/ne.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2024-02-13 16:31+0100\n" +"POT-Creation-Date: 2024-02-28 18:50+0000\n" "PO-Revision-Date: 2006-06-12 14:35+0545\n" "Last-Translator: Shiva Pokharel \n" "Language-Team: Nepali \n" @@ -3745,7 +3745,7 @@ msgstr "" #. TRANSLATORS: The second %s is the reason and is untranslated for repository owners. #: methods/gpgv.cc #, c-format -msgid "Signature by key %s uses weak digest algorithm (%s)" +msgid "Signature by key %s uses weak algorithm (%s)" msgstr "" #: methods/gpgv.cc diff --git a/po/nl.po b/po/nl.po index af20ac2..ec1b702 100644 --- a/po/nl.po +++ b/po/nl.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 2.7.6\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2024-02-13 16:31+0100\n" +"POT-Creation-Date: 2024-02-28 18:50+0000\n" "PO-Revision-Date: 2023-10-13 11:36+0200\n" "Last-Translator: Frans Spiesschaert \n" "Language-Team: Debian Dutch l10n Team \n" @@ -3963,8 +3963,9 @@ msgstr "" #. TRANSLATORS: The second %s is the reason and is untranslated for repository owners. #: methods/gpgv.cc -#, c-format -msgid "Signature by key %s uses weak digest algorithm (%s)" +#, fuzzy, c-format +#| msgid "Signature by key %s uses weak digest algorithm (%s)" +msgid "Signature by key %s uses weak algorithm (%s)" msgstr "" "De ondertekening door sleutel %s maakt gebruik van een zwak hash-algoritme " "(%s)" diff --git a/po/nn.po b/po/nn.po index 208c3be..7233dd2 100644 --- a/po/nn.po +++ b/po/nn.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2024-02-13 16:31+0100\n" +"POT-Creation-Date: 2024-02-28 18:50+0000\n" "PO-Revision-Date: 2005-02-14 23:30+0100\n" "Last-Translator: Havard Korsvoll \n" "Language-Team: Norwegian nynorsk \n" @@ -3759,7 +3759,7 @@ msgstr "" #. TRANSLATORS: The second %s is the reason and is untranslated for repository owners. #: methods/gpgv.cc #, c-format -msgid "Signature by key %s uses weak digest algorithm (%s)" +msgid "Signature by key %s uses weak algorithm (%s)" msgstr "" #: methods/gpgv.cc diff --git a/po/pl.po b/po/pl.po index 8ee5807..13cbd1e 100644 --- a/po/pl.po +++ b/po/pl.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.7.3\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2024-02-13 16:31+0100\n" +"POT-Creation-Date: 2024-02-28 18:50+0000\n" "PO-Revision-Date: 2012-07-28 21:53+0200\n" "Last-Translator: Michał Kułach \n" "Language-Team: Polish \n" @@ -3889,7 +3889,7 @@ msgstr "" #. TRANSLATORS: The second %s is the reason and is untranslated for repository owners. #: methods/gpgv.cc #, c-format -msgid "Signature by key %s uses weak digest algorithm (%s)" +msgid "Signature by key %s uses weak algorithm (%s)" msgstr "" #: methods/gpgv.cc diff --git a/po/pt.po b/po/pt.po index 4b9d92b..c4a689f 100644 --- a/po/pt.po +++ b/po/pt.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2024-02-13 16:31+0100\n" +"POT-Creation-Date: 2024-02-28 18:50+0000\n" "PO-Revision-Date: 2012-06-29 15:45+0100\n" "Last-Translator: Miguel Figueiredo \n" "Language-Team: Portuguese \n" @@ -3866,7 +3866,7 @@ msgstr "" #. TRANSLATORS: The second %s is the reason and is untranslated for repository owners. #: methods/gpgv.cc #, c-format -msgid "Signature by key %s uses weak digest algorithm (%s)" +msgid "Signature by key %s uses weak algorithm (%s)" msgstr "" #: methods/gpgv.cc diff --git a/po/pt_BR.po b/po/pt_BR.po index 5ea6cd2..53910f1 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2024-02-13 16:31+0100\n" +"POT-Creation-Date: 2024-02-28 18:50+0000\n" "PO-Revision-Date: 2008-11-17 02:33-0200\n" "Last-Translator: Felipe Augusto van de Wiel (faw) \n" "Language-Team: Brazilian Portuguese \n" -"POT-Creation-Date: 2024-02-13 16:31+0100\n" +"POT-Creation-Date: 2024-02-28 18:50+0000\n" "PO-Revision-Date: 2023-07-13 19:58+0200\n" "Last-Translator: Remus-Gabriel Chelu \n" "Language-Team: Romanian \n" @@ -4052,8 +4052,9 @@ msgstr "" #. TRANSLATORS: The second %s is the reason and is untranslated for repository owners. #: methods/gpgv.cc -#, c-format -msgid "Signature by key %s uses weak digest algorithm (%s)" +#, fuzzy, c-format +#| msgid "Signature by key %s uses weak digest algorithm (%s)" +msgid "Signature by key %s uses weak algorithm (%s)" msgstr "" "Semnătura cu cheia %s utilizează un algoritm de sumă de control slab (%s)" diff --git a/po/ru.po b/po/ru.po index ccaed1f..279061e 100644 --- a/po/ru.po +++ b/po/ru.po @@ -18,7 +18,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 2.2.0\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2024-02-13 16:31+0100\n" +"POT-Creation-Date: 2024-02-28 18:50+0000\n" "PO-Revision-Date: 2021-02-22 20:02+0300\n" "Last-Translator: Алексей Шилин \n" "Language-Team: русский \n" @@ -3950,8 +3950,9 @@ msgstr "" #. TRANSLATORS: The second %s is the reason and is untranslated for repository owners. #: methods/gpgv.cc -#, c-format -msgid "Signature by key %s uses weak digest algorithm (%s)" +#, fuzzy, c-format +#| msgid "Signature by key %s uses weak digest algorithm (%s)" +msgid "Signature by key %s uses weak algorithm (%s)" msgstr "При подписи ключом %s используется нестойкий алгоритм свёртки (%s)" #: methods/gpgv.cc diff --git a/po/sk.po b/po/sk.po index 213639b..cf7030f 100644 --- a/po/sk.po +++ b/po/sk.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2024-02-13 16:31+0100\n" +"POT-Creation-Date: 2024-02-28 18:50+0000\n" "PO-Revision-Date: 2012-06-28 20:49+0100\n" "Last-Translator: Ivan Masár \n" "Language-Team: Slovak \n" @@ -3825,7 +3825,7 @@ msgstr "" #. TRANSLATORS: The second %s is the reason and is untranslated for repository owners. #: methods/gpgv.cc #, c-format -msgid "Signature by key %s uses weak digest algorithm (%s)" +msgid "Signature by key %s uses weak algorithm (%s)" msgstr "" #: methods/gpgv.cc diff --git a/po/sl.po b/po/sl.po index 173ce50..ed5484e 100644 --- a/po/sl.po +++ b/po/sl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2024-02-13 16:31+0100\n" +"POT-Creation-Date: 2024-02-28 18:50+0000\n" "PO-Revision-Date: 2012-06-27 21:29+0000\n" "Last-Translator: Andrej Znidarsic \n" "Language-Team: Slovenian \n" @@ -3832,7 +3832,7 @@ msgstr "" #. TRANSLATORS: The second %s is the reason and is untranslated for repository owners. #: methods/gpgv.cc #, c-format -msgid "Signature by key %s uses weak digest algorithm (%s)" +msgid "Signature by key %s uses weak algorithm (%s)" msgstr "" #: methods/gpgv.cc diff --git a/po/sv.po b/po/sv.po index 648db96..42650fa 100644 --- a/po/sv.po +++ b/po/sv.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2024-02-13 16:31+0100\n" +"POT-Creation-Date: 2024-02-28 18:50+0000\n" "PO-Revision-Date: 2015-08-19 21:33+0200\n" "Last-Translator: Anders Jonsson \n" "Language-Team: Swedish \n" @@ -3868,7 +3868,7 @@ msgstr "" #. TRANSLATORS: The second %s is the reason and is untranslated for repository owners. #: methods/gpgv.cc #, c-format -msgid "Signature by key %s uses weak digest algorithm (%s)" +msgid "Signature by key %s uses weak algorithm (%s)" msgstr "" #: methods/gpgv.cc diff --git a/po/th.po b/po/th.po index 8da687f..55c6b22 100644 --- a/po/th.po +++ b/po/th.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2024-02-13 16:31+0100\n" +"POT-Creation-Date: 2024-02-28 18:50+0000\n" "PO-Revision-Date: 2014-12-12 13:00+0700\n" "Last-Translator: Theppitak Karoonboonyanan \n" "Language-Team: Thai \n" @@ -3751,7 +3751,7 @@ msgstr "" #. TRANSLATORS: The second %s is the reason and is untranslated for repository owners. #: methods/gpgv.cc #, c-format -msgid "Signature by key %s uses weak digest algorithm (%s)" +msgid "Signature by key %s uses weak algorithm (%s)" msgstr "" #: methods/gpgv.cc diff --git a/po/tl.po b/po/tl.po index f2927c3..cb6eb16 100644 --- a/po/tl.po +++ b/po/tl.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2024-02-13 16:31+0100\n" +"POT-Creation-Date: 2024-02-28 18:50+0000\n" "PO-Revision-Date: 2007-03-29 21:36+0800\n" "Last-Translator: Eric Pareja \n" "Language-Team: Tagalog \n" @@ -3779,7 +3779,7 @@ msgstr "" #. TRANSLATORS: The second %s is the reason and is untranslated for repository owners. #: methods/gpgv.cc #, c-format -msgid "Signature by key %s uses weak digest algorithm (%s)" +msgid "Signature by key %s uses weak algorithm (%s)" msgstr "" #: methods/gpgv.cc diff --git a/po/tr.po b/po/tr.po index 2507b6d..b9eac4c 100644 --- a/po/tr.po +++ b/po/tr.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 2.6.0\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2024-02-13 16:31+0100\n" +"POT-Creation-Date: 2024-02-28 18:50+0000\n" "PO-Revision-Date: 2023-04-19 15:15+0300\n" "Last-Translator: Mert Dirik \n" "Language-Team: Debian l10n Turkish \n" @@ -3894,8 +3894,9 @@ msgstr "" #. TRANSLATORS: The second %s is the reason and is untranslated for repository owners. #: methods/gpgv.cc -#, c-format -msgid "Signature by key %s uses weak digest algorithm (%s)" +#, fuzzy, c-format +#| msgid "Signature by key %s uses weak digest algorithm (%s)" +msgid "Signature by key %s uses weak algorithm (%s)" msgstr "%s anahtarının imzası zayıf bir özet algoritması kullanıyor (%s)" #: methods/gpgv.cc diff --git a/po/uk.po b/po/uk.po index 5225a79..cf07f40 100644 --- a/po/uk.po +++ b/po/uk.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2024-02-13 16:31+0100\n" +"POT-Creation-Date: 2024-02-28 18:50+0000\n" "PO-Revision-Date: 2012-09-25 20:19+0300\n" "Last-Translator: A. Bondarenko \n" "Language-Team: Українська \n" @@ -3888,7 +3888,7 @@ msgstr "" #. TRANSLATORS: The second %s is the reason and is untranslated for repository owners. #: methods/gpgv.cc #, c-format -msgid "Signature by key %s uses weak digest algorithm (%s)" +msgid "Signature by key %s uses weak algorithm (%s)" msgstr "" #: methods/gpgv.cc diff --git a/po/vi.po b/po/vi.po index 47190de..38eaa57 100644 --- a/po/vi.po +++ b/po/vi.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.8\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2024-02-13 16:31+0100\n" +"POT-Creation-Date: 2024-02-28 18:50+0000\n" "PO-Revision-Date: 2014-09-12 13:48+0700\n" "Last-Translator: Trần Ngọc Quân \n" "Language-Team: Vietnamese \n" @@ -3862,7 +3862,7 @@ msgstr "" #. TRANSLATORS: The second %s is the reason and is untranslated for repository owners. #: methods/gpgv.cc #, c-format -msgid "Signature by key %s uses weak digest algorithm (%s)" +msgid "Signature by key %s uses weak algorithm (%s)" msgstr "" #: methods/gpgv.cc diff --git a/po/zh_CN.po b/po/zh_CN.po index 9353ae5..e481a08 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 2.5.3\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2024-02-13 16:31+0100\n" +"POT-Creation-Date: 2024-02-28 18:50+0000\n" "PO-Revision-Date: 2022-10-05 17:20-0400\n" "Last-Translator: Boyuan Yang <073plan@gmail.com>\n" "Language-Team: Chinese (simplified) \n" @@ -3458,7 +3458,7 @@ msgid "" "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " "cannot be used to add new CD-ROMs" msgstr "" -"请使用 apt-cdrom，通过它可以让 APT 识别该盘片。apt-get upgdate 不能被用来加入" +"请使用 apt-cdrom，通过它可以让 APT 识别该盘片。apt-get update 不能被用来加入" "新的盘片。" #: methods/cdrom.cc @@ -3736,8 +3736,9 @@ msgstr "" #. TRANSLATORS: The second %s is the reason and is untranslated for repository owners. #: methods/gpgv.cc -#, c-format -msgid "Signature by key %s uses weak digest algorithm (%s)" +#, fuzzy, c-format +#| msgid "Signature by key %s uses weak digest algorithm (%s)" +msgid "Signature by key %s uses weak algorithm (%s)" msgstr "密钥 %s 生成的数字签名使用了弱安全性摘要算法(%s)" #: methods/gpgv.cc diff --git a/po/zh_TW.po b/po/zh_TW.po index a1ac730..fa18ee8 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.2.X\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2024-02-13 16:31+0100\n" +"POT-Creation-Date: 2024-02-28 18:50+0000\n" "PO-Revision-Date: 2009-01-28 10:41+0800\n" "Last-Translator: Tetralet \n" "Language-Team: Debian-user in Chinese [Big5] &2 "Library ${LIBRARY} in version ${VERSION} has no symbols file! (maybe forgot to rename?)" exit 1 fi - if [ "$(head -n1 "debian/${LIBRARY}${VERSION}.symbols")" != "${LIBRARY}.so.${VERSION} ${LIBRARY}${VERSION} #MINVER#" ]; then - echo >&2 "Library ${LIBRARY}${VERSION} has incorrect version in symbol header! (»$(head -n1 "debian/${LIBRARY}${VERSION}.symbols")«)" + if [ "$(head -n1 "debian/${LIBRARY}${VERSION}${LIBSUFFIX}.symbols")" != "${LIBRARY}.so.${VERSION} ${LIBRARY}${VERSION}${LIBSUFFIX} #MINVER#" ]; then + echo >&2 "Library ${LIBRARY}${VERSION} has incorrect version in symbol header! (»$(head -n1 "debian/${LIBRARY}${VERSION}${LIBSUFFIX}.symbols")«)" exit 2 fi } @@ -166,7 +167,7 @@ elif [ "$1" = 'library' ]; then fi echo "Checking $1 in version $2 build at $(stat -L -c '%y' "$buildlib")" local tmpfile=$(mktemp) - dpkg-gensymbols -p${1}${2} -e${buildlib} -Idebian/${1}${2}.symbols -O/dev/null 2> /dev/null > $tmpfile || true + dpkg-gensymbols -p${1}${2} -e${buildlib} -Idebian/${1}${2}${LIBSUFFIX}.symbols -O/dev/null 2> /dev/null > $tmpfile || true librarysymbolsfromfile "$tmpfile" "$(echo "${1}" | cut -c 4- | tr -d '-' | tr 'a-z' 'A-Z')_${2}" rm -f $tmpfile } @@ -178,7 +179,7 @@ elif [ "$1" = 'buildlog' ]; then shift done elif [ "$1" = 'travis-ci' ]; then - apt-get build-dep -qy . + apt-get build-dep -P pkg.apt.ci -qy . apt-get install -qy --no-install-recommends dctrl-tools for t in $(grep '^Tests: ' debian/tests/control | cut -d':' -f 2- | tr ',' '\n'); do apt-get satisfy -qy --no-install-recommends "base-files,$(grep-dctrl -ns Depends -F Tests $t ./debian/tests/control | sed -e 's#@[^,<>()@]*@\s*,\s*##g' -e 's#@\s*,\s*##g')" diff --git a/test/integration/test-apt-cdrom b/test/integration/test-apt-cdrom index 01680c4..e8ccb10 100755 --- a/test/integration/test-apt-cdrom +++ b/test/integration/test-apt-cdrom @@ -40,6 +40,24 @@ aptcdromlog() { } aptautotest_aptcdromlog_add() { aptautotest_aptget_update "$@"; } + +msgtest "Checking --assert-pubkey-algo support" +gpgv_msg="" +test="$(LC_ALL=C.UTF-8 gpgv --assert-pubkey-algo 2>&1 || :)" +case "$test" in + *"missing argument"*) + gpgv_msg=" +gpgv: asserted signer '34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE' with algo rsa2048" + msgpass + ;; + *[Ii]"nvalid option"*"assert-pubkey-algo"*) + msgskip + ;; + *) + msgfail "Unknown response from gpgv to --assert-pubkey-algo check: $test" + ;; +esac + CDROM_PRE="Using CD-ROM mount point $(readlink -f ./rootdir/media)/cdrom/ Unmounting CD-ROM... Waiting for disc... @@ -47,7 +65,7 @@ Please insert a Disc in the drive and press [Enter] Mounting CD-ROM... Scanning disc for index files..." CDROM_POST="This disc is called: -'Debian APT Testdisk 0.8.15' +'Debian APT Testdisk 0.8.15'$gpgv_msg Writing new source list Source list entries for this disc are: deb cdrom:[Debian APT Testdisk 0.8.15]/ stable main diff --git a/test/integration/test-method-gpgv b/test/integration/test-method-gpgv index bfa5af4..4793b01 100755 --- a/test/integration/test-method-gpgv +++ b/test/integration/test-method-gpgv @@ -41,33 +41,49 @@ testrun() { testgpgv 'Good signed with fingerprint' 'Good: GOODSIG 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE' '34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE!' '[GNUPG:] GOODSIG 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE Joe Sixpack (APT Testcases Dummy) [GNUPG:] VALIDSIG 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE 2016-09-01 1472742625 0 4 0 1 11 00 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE' + testgpgv 'Good signed with long keyid and asserted' 'Good: GOODSIG 5A90D141DBAC8DAE' '34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE!' '[GNUPG:] GOODSIG 5A90D141DBAC8DAE Joe Sixpack (APT Testcases Dummy) +[GNUPG:] VALIDSIG 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE 2016-09-01 1472742625 0 4 0 1 11 00 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE +[GNUPG:] ASSERT_PUBKEY_ALGO 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE 1 rsa1024' + testgpgv 'Good signed with fingerprint and asserted' 'Good: GOODSIG 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE' '34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE!' '[GNUPG:] GOODSIG 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE Joe Sixpack (APT Testcases Dummy) +[GNUPG:] VALIDSIG 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE 2016-09-01 1472742625 0 4 0 1 11 00 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE +[GNUPG:] ASSERT_PUBKEY_ALGO 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE 1 rsa1024' + testgpgv 'Good subkey signed with long keyid' 'Good: GOODSIG 5B6896415D44C43E' '34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE, 4281DEDBD466EAE8C1F4157E5B6896415D44C43E!' '[GNUPG:] GOODSIG 5B6896415D44C43E Sebastian Subkey [GNUPG:] VALIDSIG 4281DEDBD466EAE8C1F4157E5B6896415D44C43E 2018-08-16 1534459673 0 4 0 1 11 00 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE' testgpgv 'Good subkey signed with fingerprint' 'Good: GOODSIG 4281DEDBD466EAE8C1F4157E5B6896415D44C43E' '34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE, 4281DEDBD466EAE8C1F4157E5B6896415D44C43E!' '[GNUPG:] GOODSIG 4281DEDBD466EAE8C1F4157E5B6896415D44C43E Sebastian Subkey [GNUPG:] VALIDSIG 4281DEDBD466EAE8C1F4157E5B6896415D44C43E 2018-08-16 1534459673 0 4 0 1 11 00 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE' - testgpgv 'Untrusted signed with long keyid' 'Worthless: 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE' '' '[GNUPG:] GOODSIG 5A90D141DBAC8DAE Joe Sixpack (APT Testcases Dummy) + testgpgv 'Untrusted signed with long keyid' 'Worthless: 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE, ' '' '[GNUPG:] GOODSIG 5A90D141DBAC8DAE Joe Sixpack (APT Testcases Dummy) [GNUPG:] VALIDSIG 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE 2016-09-01 1472742625 0 4 0 1 1 00 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE' testsuccess grep '^\s\+Good:\s\+$' method.output - testgpgv 'Untrusted signed with fingerprint' 'Worthless: 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE' '' '[GNUPG:] GOODSIG 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE Joe Sixpack (APT Testcases Dummy) + testgpgv 'Untrusted signed with fingerprint' 'Worthless: 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE, ' '' '[GNUPG:] GOODSIG 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE Joe Sixpack (APT Testcases Dummy) [GNUPG:] VALIDSIG 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE 2016-09-01 1472742625 0 4 0 1 1 00 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE' testsuccess grep '^\s\+Good:\s\+$' method.output + testgpgv 'Unasserted signed with long keyid' 'Good: GOODSIG 5A90D141DBAC8DAE' '34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE!' '[GNUPG:] GOODSIG 5A90D141DBAC8DAE Joe Sixpack (APT Testcases Dummy) +[GNUPG:] VALIDSIG 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE 2016-09-01 1472742625 0 4 0 1 11 00 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE +[GNUPG:] ASSERT_PUBKEY_ALGO 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE 0 rsa1024' + testsuccess grep '^Message: Signature by key 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE uses weak algorithm (rsa1024)$' method.output + testgpgv 'Unaserted signed with fingerprint' 'Good: GOODSIG 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE' '34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE!' '[GNUPG:] GOODSIG 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE Joe Sixpack (APT Testcases Dummy) +[GNUPG:] VALIDSIG 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE 2016-09-01 1472742625 0 4 0 1 11 00 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE +[GNUPG:] ASSERT_PUBKEY_ALGO 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE 0 rsa1024' + testsuccess grep '^Message: Signature by key 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE uses weak algorithm (rsa1024)$' method.output + testgpgv 'Weak signed with long keyid' 'Good: GOODSIG 5A90D141DBAC8DAE' '34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE!' '[GNUPG:] GOODSIG 5A90D141DBAC8DAE Joe Sixpack (APT Testcases Dummy) [GNUPG:] VALIDSIG 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE 2016-09-01 1472742625 0 4 0 1 2 00 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE' - testsuccess grep '^Message: Signature by key 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE uses weak digest algorithm (SHA1)$' method.output + testsuccess grep '^Message: Signature by key 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE uses weak algorithm (SHA1)$' method.output testgpgv 'Weak signed with fingerprint' 'Good: GOODSIG 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE' '34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE!' '[GNUPG:] GOODSIG 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE Joe Sixpack (APT Testcases Dummy) [GNUPG:] VALIDSIG 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE 2016-09-01 1472742625 0 4 0 1 2 00 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE' - testsuccess grep '^Message: Signature by key 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE uses weak digest algorithm (SHA1)$' method.output + testsuccess grep '^Message: Signature by key 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE uses weak algorithm (SHA1)$' method.output testgpgv 'No Pubkey with long keyid' 'NoPubKey: NO_PUBKEY E8525D47528144E2' '' '[GNUPG:] ERRSIG E8525D47528144E2 1 11 00 1472744666 9 [GNUPG:] NO_PUBKEY E8525D47528144E2' testgpgv 'No Pubkey with fingerprint' 'NoPubKey: NO_PUBKEY DE66AECA9151AFA1877EC31DE8525D47528144E2' '' '[GNUPG:] ERRSIG DE66AECA9151AFA1877EC31DE8525D47528144E2 1 11 00 1472744666 9 [GNUPG:] NO_PUBKEY DE66AECA9151AFA1877EC31DE8525D47528144E2' - testgpgv 'Expired key with long keyid' 'Worthless: EXPKEYSIG 4BC0A39C27CE74F9 Rex Expired ' '' '[GNUPG:] EXPKEYSIG 4BC0A39C27CE74F9 Rex Expired + testgpgv 'Expired key with long keyid' 'Worthless: EXPKEYSIG 4BC0A39C27CE74F9 Rex Expired , ' '' '[GNUPG:] EXPKEYSIG 4BC0A39C27CE74F9 Rex Expired [GNUPG:] VALIDSIG 891CC50E605796A0C6E733F74BC0A39C27CE74F9 2016-09-01 1472742629 0 4 0 1 11 00 891CC50E605796A0C6E733F74BC0A39C27CE74F9' - testgpgv 'Expired key with fingerprint' 'Worthless: EXPKEYSIG 891CC50E605796A0C6E733F74BC0A39C27CE74F9 Rex Expired ' '' '[GNUPG:] EXPKEYSIG 891CC50E605796A0C6E733F74BC0A39C27CE74F9 Rex Expired + testgpgv 'Expired key with fingerprint' 'Worthless: EXPKEYSIG 891CC50E605796A0C6E733F74BC0A39C27CE74F9 Rex Expired , ' '' '[GNUPG:] EXPKEYSIG 891CC50E605796A0C6E733F74BC0A39C27CE74F9 Rex Expired [GNUPG:] VALIDSIG 891CC50E605796A0C6E733F74BC0A39C27CE74F9 2016-09-01 1472742629 0 4 0 1 11 00 891CC50E605796A0C6E733F74BC0A39C27CE74F9' } diff --git a/test/integration/test-releasefile-verification b/test/integration/test-releasefile-verification index 5f873b8..8104276 100755 --- a/test/integration/test-releasefile-verification +++ b/test/integration/test-releasefile-verification @@ -465,7 +465,7 @@ successfulaptgetupdate() { if [ -n "$1" ]; then testsuccess grep "$1" rootdir/tmp/testwarning.output fi - testsuccess grep 'uses weak digest algorithm' rootdir/tmp/testwarning.output + testsuccess grep 'uses weak algorithm' rootdir/tmp/testwarning.output } runtest3 'Weak' -- cgit v1.2.3