From c0c6fe4fbef0559671f72a0aeee973fda1a84d79 Mon Sep 17 00:00:00 2001 From: Sam James Date: Sat, 16 Sep 2023 23:32:16 +0100 Subject: [PATCH 1/2] dev-libs/libsodium: fix key path I had a local stale copy of the keyring package. Bug: https://bugs.gentoo.org/914295 Signed-off-by: Sam James --- dev-libs/libsodium/libsodium-1.0.18_p20220618.ebuild | 2 +- dev-libs/libsodium/libsodium-1.0.19-r1.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-libs/libsodium/libsodium-1.0.18_p20220618.ebuild b/dev-libs/libsodium/libsodium-1.0.18_p20220618.ebuild index d54147eedb310..a37722ce3c99e 100644 --- a/dev-libs/libsodium/libsodium-1.0.18_p20220618.ebuild +++ b/dev-libs/libsodium/libsodium-1.0.18_p20220618.ebuild @@ -3,7 +3,7 @@ EAPI=8 -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/libsodium.key +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/libsodium.minisig VERIFY_SIG_METHOD=minisig inherit autotools multilib-minimal verify-sig diff --git a/dev-libs/libsodium/libsodium-1.0.19-r1.ebuild b/dev-libs/libsodium/libsodium-1.0.19-r1.ebuild index af4e604b01e71..b07f22e574aab 100644 --- a/dev-libs/libsodium/libsodium-1.0.19-r1.ebuild +++ b/dev-libs/libsodium/libsodium-1.0.19-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/libsodium.key +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/libsodium.minisig VERIFY_SIG_METHOD=minisig inherit autotools multilib-minimal verify-sig From 1816ced70b197344f141f3c8591ae9262d4f7e29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= Date: Fri, 15 Sep 2023 21:29:50 +0200 Subject: [PATCH 2/2] package.mask: update opentmpfiles mask message MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas K. Hüttel --- profiles/package.mask | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index 2c9cb14ef6d6d..45255fae9f52e 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -33,9 +33,14 @@ #--- END OF EXAMPLES --- -# Andreas K. Hüttel (2021-07-06) -# No longer maintained upstream; please see the 2021-07-15-opentmpfiles-deprecation -# news item. +# Andreas K. Hüttel (2021-07-06, 2023-09-15) +# No longer maintained upstream; masked everywhere for two years now. +# Please see also the 2021-07-15-opentmpfiles-deprecation news item. +# https://www.gentoo.org/support/news-items/2021-07-15-opentmpfiles-deprecation.html +# +# The replacement is sys-apps/systemd-utils[tmpfiles]; new name +# but otherwise identical to the solution described in the news item. +# Removal on 2023-10-15. sys-apps/opentmpfiles # Hans de Graaff (2023-09-15)