diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | doc/apt-verbatim.ent | 2 | ||||
| -rw-r--r-- | doc/po/apt-doc.pot | 4 | ||||
| -rw-r--r-- | methods/sqv.cc | 15 | ||||
| -rw-r--r-- | po/apt-all.pot | 4 |
6 files changed, 28 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b7e3017b1..156f3238b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -204,7 +204,7 @@ endif() # Configure some variables like package, version and architecture. set(PACKAGE ${PROJECT_NAME}) set(PACKAGE_MAIL "APT Development Team <deity@lists.debian.org>") -set(PACKAGE_VERSION "3.1.3") +set(PACKAGE_VERSION "3.1.4") string(REGEX MATCH "^[0-9.]+" PROJECT_VERSION ${PACKAGE_VERSION}) if (NOT DEFINED DPKG_DATADIR) diff --git a/debian/changelog b/debian/changelog index 67c00b7ee..f9b62a9cf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +apt (3.1.4) unstable; urgency=medium + + * Upload to unstable + + -- Julian Andres Klode <juliank@ubuntu.com> Mon, 11 Aug 2025 17:27:45 +0200 + apt (3.1.3) experimental; urgency=medium [ Biswapriyo Nath ] @@ -21,7 +27,7 @@ apt (3.1.3) experimental; urgency=medium [ Miroslav Kure ] * Czech program translation update (Closes: #1106155) - -- Julian Andres Klode <jak@debian.org> Tue, 24 Jun 2025 19:31:28 +0200 + -- Julian Andres Klode <juliank@ubuntu.com> Mon, 11 Aug 2025 17:27:43 +0200 apt (3.1.2) experimental; urgency=medium diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index 2ef364583..f1d212cb4 100644 --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@ -268,7 +268,7 @@ "> <!-- this will be updated by 'prepare-release' --> -<!ENTITY apt-product-version "3.1.3"> +<!ENTITY apt-product-version "3.1.4"> <!-- (Code)names for various things used all over the place --> <!ENTITY debian-oldstable-codename "bookworm"> diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 331db2932..54d0eaa1f 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 3.1.3\n" +"Project-Id-Version: apt-doc 3.1.4\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2025-06-24 17:31+0000\n" +"POT-Creation-Date: 2025-08-11 15:28+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/methods/sqv.cc b/methods/sqv.cc index 6c154401d..ac736731d 100644 --- a/methods/sqv.cc +++ b/methods/sqv.cc @@ -164,6 +164,21 @@ bool SQVMethod::VerifyGetSigners(const char *file, const char *outfile, keyFiles.push_back(Part); } } + else + { + std::string buf; + for (auto k : keyFiles) + { + _error->PushToStack(); + FileFd keyFd(k, FileFd::ReadOnly); + _error->RevertToStack(); + if (keyFd.IsOpen()) + continue; + + strprintf(buf, "The key(s) in the keyring %s are ignored as the file is not readable by user executing gpgv.\n", k.c_str()); + Warning(std::move(buf)); + } + } if (keyFiles.empty()) return _error->Error("The signatures couldn't be verified because no keyring is specified"); diff --git a/po/apt-all.pot b/po/apt-all.pot index aefda3a6e..008fc8e96 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -5,9 +5,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apt 3.1.3\n" +"Project-Id-Version: apt 3.1.4\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2025-06-24 17:31+0000\n" +"POT-Creation-Date: 2025-08-11 15:28+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" |